ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -15,6 +15,7 @@ import com.ltkj.common.core.domain.entity.SysDictData; import com.ltkj.common.core.domain.entity.SysUser; import com.ltkj.common.utils.DateUtils; import com.ltkj.common.utils.SecurityUtils; import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.*; import com.ltkj.hosp.mapper.DictUserInfoMapper; @@ -1382,8 +1383,13 @@ cell.setHorizontalAlignment(Element.ALIGN_CENTER); cell.setPaddingTop(10); cell.setPaddingBottom(10); if (zongJianYiShiQianMing == null) { cell.setPhrase(new Phrase(sysConfigService.selectConfigByKey("pdf_report_zongjianysname"), zongJianFont)); String zongjianysname = sysConfigService.selectConfigByKey("pdf_report_zongjianysname"); if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("无")) { cell.setPhrase(new Phrase(zongjianysname, zongJianFont)); tableQz.addCell(cell); }else if(zongJianYiShiQianMing == null && zongjianysname.equals("无")){ String nickName = SecurityUtils.getLoginUser().getUser().getNickName(); cell.setPhrase(new Phrase(nickName, zongJianFont)); tableQz.addCell(cell); }else { byte[] bytes = Base64.getDecoder().decode(zongJianYiShiQianMing.getTemplate()); @@ -1499,8 +1505,8 @@ tjtype = "个人"; hashMap.put("tjtype", tjtype); } if (StrUtil.isNotBlank(customer.getCompName())){ hashMap.put("work", customer.getCompName()); if (StrUtil.isNotBlank(tjOrder.getFirmName())){ hashMap.put("work", tjOrder.getFirmName()); }else { // LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>(); // wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId()); @@ -1511,6 +1517,11 @@ } else { hashMap.put("work", tjOrder.getFirmName()); } } if (StrUtil.isBlank(tjOrder.getFirmDeptName())) { hashMap.put("bumen", "无"); } else { hashMap.put("bumen",tjOrder.getFirmDeptName()); } hashMap.put("sex", sex); hashMap.put("tjnumber", tjNumber); @@ -2683,7 +2694,10 @@ LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber); wrapper.like(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId())); LtkjExamJcbgd jcbgd = jcbgdService.getOne(wrapper); wrapper.orderByDesc(LtkjExamJcbgd::getZdsj); List<LtkjExamJcbgd> list = jcbgdService.list(wrapper); if(null !=list && !list.isEmpty()){ LtkjExamJcbgd jcbgd = list.get(0); if (jcbgd != null){ tjPdfVO.setTs(jcbgd.getYxbx()); tjPdfVO.setSj(jcbgd.getBgNr()); @@ -2691,6 +2705,7 @@ tjPdfVO.setProName(jcbgd.getXmmc()); ids+="|"+jcbgd.getXmdm(); } } tjPdfVOS.add(tjPdfVO); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
@@ -7,10 +7,16 @@ import com.ltkj.framework.config.MatchUtils; import com.ltkj.hosp.domain.TjCustomer; import com.ltkj.hosp.domain.TjOrder; import com.ltkj.hosp.domain.TjOrderRemark; import com.ltkj.hosp.service.ITjOrderDetailService; import com.ltkj.hosp.service.ITjOrderRemarkService; import com.ltkj.hosp.service.ITjOrderService; import com.sun.javafx.tk.TKClipboard; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import com.ltkj.common.core.controller.BaseController; import com.ltkj.common.core.domain.AjaxResult; @@ -28,6 +34,7 @@ */ @RestController @RequestMapping("/hosp/inspection") @Api(tags = "弃检记录接口") public class TjDiscardInspectionController extends BaseController { @Autowired private ITjDiscardInspectionService tjDiscardInspectionService; @@ -36,6 +43,8 @@ private ITjOrderService tjOrderService; @Resource private ITjOrderDetailService tjOrderDetailService; @Resource private ITjOrderRemarkService remarkService; /** * 查询弃检列表 @@ -99,4 +108,22 @@ } return success("撤回成功"); } @GetMapping("/csqijianhuifujiekou") @ApiOperation(value = "初审页面弃检恢复接口") @Transactional public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) { TjOrder order = tjOrderService.getOrderByTjNum(tjNUm); if(null !=order && null !=order.getReportTime()){ return AjaxResult.error("该人员报告已生成,不可恢复!"); } LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>(); wq.eq(TjOrderRemark::getTjNumber, tjNUm); wq.eq(TjOrderRemark::getProId, proId); TjOrderRemark remark = remarkService.getOne(wq); remark.setType(0); remarkService.updateById(remark); return AjaxResult.success("操作成功!"); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -274,11 +274,11 @@ @Log(title = "体检项目", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody @ApiParam(value = "体检项目对象") TjProject tjProject) { if (null != tjProject.getConsumablesList() && tjProject.getConsumablesList().size() > 0) { if (null != tjProject.getConsumablesList() && !tjProject.getConsumablesList().isEmpty()) { tjProject.setProPrice(BigDecimal.valueOf(0.00)); tjProject.setProStandard(0); } if (null != tjProject.getTjStandardList() && tjProject.getTjStandardList().size() > 0) { if (null != tjProject.getTjStandardList() && !tjProject.getTjStandardList().isEmpty()) { tjProject.setProStandard(1); } tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),"")); @@ -290,7 +290,7 @@ dictProSfxmService.save(proSfxm); } List<TjConsumables> consumablesList = tjProject.getConsumablesList(); if (null != consumablesList && consumablesList.size() > 0) { if (null != consumablesList && !consumablesList.isEmpty()) { for (TjConsumables tjConsumables : consumablesList) { TjProConsumables proConsumables = new TjProConsumables(); proConsumables.setProId(tjProject.getProId()); @@ -299,7 +299,7 @@ } } List<TjStandard> tjStandardList = tjProject.getTjStandardList(); if (null != tjStandardList && tjStandardList.size() > 0) { if (null != tjStandardList && !tjStandardList.isEmpty()) { for (TjStandard tjStandard : tjStandardList) { TjStandard tjStandard1 = new TjStandard(); BeanUtils.copyBeanProp(tjStandard1, tjStandard); @@ -312,23 +312,25 @@ } Long proParentId = tjProject.getProParentId(); if (null != proParentId && proParentId != 0) { LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); wq.eq(TjProject::getProParentId, proParentId); List<TjProject> projectList = tjProjectService.list(wq); if (null != projectList && projectList.size() > 0) { // LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); // wq.eq(TjProject::getProParentId, proParentId); // wq.eq(TjProject::getProStatus,0); // List<TjProject> projectList = tjProjectService.list(wq); List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId)); if (null != projectList && !projectList.isEmpty()) { BigDecimal bigDecimal = new BigDecimal("0.00"); for (TjProject project : projectList) { if (project.getProPrice() != null) { bigDecimal = bigDecimal.add(project.getProPrice()); bigDecimal = bigDecimal.add(project.getProPrice().multiply(new BigDecimal(project.getSl()))); } } if (tjProject.getProPrice() != null) { bigDecimal.add(tjProject.getProPrice()); } // if (tjProject.getProPrice() != null) { // bigDecimal.add(tjProject.getProPrice()); // } TjProject byId = tjProjectService.getById(proParentId); tjProject.setIsSampling(byId.getIsSampling()); tjProjectService.updateById(tjProject); byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN)); byId.setProPrice(bigDecimal); tjProjectService.updateById(byId); } } @@ -445,19 +447,19 @@ } Long proParentId = tjProject.getProParentId(); if (null != proParentId) { LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); wq.eq(TjProject::getProParentId, proParentId); wq.eq(TjProject::getProStatus,0); // LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); // wq.eq(TjProject::getProParentId, proParentId); // wq.eq(TjProject::getProStatus,0); // List<TjProject> projectList = tjProjectService.list(wq); List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId)); if (null != projectList && !projectList.isEmpty()) { BigDecimal bigDecimal = new BigDecimal("0.00"); for (TjProject project : projectList) { bigDecimal = bigDecimal.add(project.getProPrice()); bigDecimal = bigDecimal.add(project.getProPrice().multiply(new BigDecimal(project.getSl()))); } bigDecimal.add(tjProject.getProPrice()); // bigDecimal.add(tjProject.getProPrice()); TjProject byId = tjProjectService.getById(proParentId); byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN)); byId.setProPrice(bigDecimal); tjProjectService.updateById(byId); } } ltkj-admin/src/main/resources/application-linux-mjprod.yml
@@ -189,7 +189,7 @@ # 体检报告模板和报告临时生成存储的文件夹路径 path: filePath: /ltkj/Tjreport filePath: /ltkj/Tjreport/mjprodReort # nginx图片服务器 reportServer: https://ltpeis.xaltjdkj.cn:5516/
@@ -66,7 +66,7 @@ */ public int deleteTjProjectByProIds(Long[] proIds); @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0") @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted= 0 and pro_status=0") public List<TjProject> getTjProjectListBySoneId(@Param("proId") String proId); @Select("SELECT * FROM tj_project WHERE pro_id=#{proId} AND deleted='0'") ltkj-hosp/src/main/resources/mapper/TjPackageMapper.xml
@@ -42,6 +42,8 @@ deleted, pac_status, price, limits, new_price, category_id, keywords, is_on_sale,
