ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -34,8 +34,10 @@ import com.ltkj.system.service.ISysUserService; import com.ltkj.web.config.pdfutils.PdfUtils; import com.ltkj.web.controller.system.SysDeptController; import jodd.util.StringUtil; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import net.sf.ehcache.search.aggregator.Count; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -1016,8 +1018,14 @@ // String xmmc = details.get(0).getProName(); boolean isXmWrite = false; int index = 1; String szyssy=""; StringBuilder builders = new StringBuilder(); for (TjOrderYcxm detail : details) { // if (!entry.getKey().equals(detail.getProId())) continue; // if(detail.getJcxm().contains("舒张压")||detail.getJcxm().contains("收缩压")){ // builders.append(detail.getJcxm()).append(detail.getJcjg()).append(" "); // szyssy+=builders.toString(); // continue; // } if (!isXmWrite) { paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont); paragraph.setAlignment(Element.ALIGN_LEFT); @@ -1029,6 +1037,7 @@ result = result.replaceAll("本报告仅对本次检查负责，临床医生依据病情如有疑问，请及时复查或进一步检查", ""); StringBuilder builder = new StringBuilder(); if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue; builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n"); index++; @@ -1038,6 +1047,22 @@ paragraph.setAlignment(Element.ALIGN_LEFT); document2.add(paragraph); } // if(StringUtil.isNotBlank(szyssy)){ // if (!isXmWrite) { // paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont); // paragraph.setAlignment(Element.ALIGN_LEFT); // document2.add(paragraph); // isXmWrite = true; // } // StringBuilder builder = new StringBuilder(); // builder.append(" (").append(index).append(")").append(szyssy).append("\n"); // szyssy = builder.toString(); // paragraph = new Paragraph(szyssy, defaultFont); // paragraph.setAlignment(Element.ALIGN_LEFT); // document2.add(paragraph); // } if (isXmWrite) { paragraph = PdfUtils.setParagraph(defaultFont, ""); paragraph.setLeading(0f); ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -8,6 +8,7 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.alibaba.druid.sql.visitor.functions.If; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ltkj.common.core.domain.AjaxResult; @@ -172,7 +173,6 @@ private ITjRulesService rulesService; @Autowired private ITjProAdvicerulesService tjProAdvicerulesService; @Override @@ -600,8 +600,9 @@ deptname=dept.getDeptName(); } String ssyszy=""; for (TjOrderDetail detail : tjOrderDetailList) { detail.setTjStatus(1L); LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>(); wq0.eq(TjStandard::getProId, detail.getProId()); @@ -614,6 +615,7 @@ LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>(); wq.eq(TjOrderYcxm::getTjh,order.getTjNumber()); wq.eq(TjOrderYcxm::getJcxm,detail.getProName()); if (detail.getExceptionDesc() == 1) { TjOrderYcxm ycxm = ycxmService.getOne(wq); if(null !=ycxm){ ycxm.setJcjg(detail.getProResult()); @@ -636,7 +638,8 @@ Object nr = mapss.get("nr"); if(null !=bt || null !=nr){ } mapList.add(mapss); } mapList.add(mapss); } } @@ -646,11 +649,21 @@ if( !mapList.isEmpty()){ ycxm.setJynr(JSONUtil.toJsonStr(mapList)); } if(detail.getProName().contains("舒张压")||detail.getProName().contains("收缩压")){ ssyszy+=ycxm.getJcxm(); } ycxmService.updateById(ycxm); if(detail.getExceptionDesc()==0)ycxmService.remove(wq); } }else { ycxmService.remove(wq); } } catch (Exception e) { e.printStackTrace(); log.error(e.getMessage()); } } } @@ -926,7 +939,6 @@ tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId())); } } //体检对his申请单调用方法 @@ -2619,26 +2631,13 @@ @Override //@Async("async") public void saveNewReservationConfirm(List<TjReservation> rightList) { if (null != rightList && rightList.size() > 0) { if (null != rightList && !rightList.isEmpty()) { //创建线程池 ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size()); // ExecutorService threadPool = Executors.newFixedThreadPool(rightList.size()); for (TjReservation reservation : rightList) { //删除之前的数据 transitionService.deletedTbTransitionByCusId(reservation.getIdCard()); //获取线程 threadPool.execute(new Runnable() { @Override public void run() { try { // transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(), reservation.getGroupingId()); transitionService.ttsaveTemoTransitionByGroupingId(reservation.getIdCard(),"0",reservation.getGroupingId()); threadPool.shutdown(); } catch (Exception e) { e.printStackTrace(); } } }); } } } @@ -2758,7 +2757,6 @@ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser,null); } //首页饼状图登记人数接口 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1815,11 +1815,15 @@ String tjh = ycxms.get(0).getTjh(); if(StringUtils.isNotBlank(tjh)){ ycxmService.delOrderYcXmJyByTjh(tjh); String szyssy=""; StringBuilder builders = new StringBuilder(); for (TjOrderYcxm ycxm : ycxms) { ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap())); if(ycxm.getJcxm().contains("舒张压")||ycxm.getJcxm().contains("收缩压")){ builders.append(ycxm.getJcxm()).append(ycxm.getJcjg()).append(" "); szyssy+=builders.toString(); } // List<TjOrderYcxm> collect = ycxms.stream().distinct().collect(Collectors.toList()); } ycxmService.saveBatch(ycxms); return AjaxResult.success(); } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -923,6 +923,7 @@ TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId()); if(null !=dwGrouping){ TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId()); LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>(); @@ -961,6 +962,7 @@ taskService.addTask(new TjReservationTask(reservation.getId(), DateUtil.between(date, DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(), dto.getYxts())), DateUnit.MS))); } } LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>(); wq0.eq(TjCompPay::getCompId, dto.getDwId());
