ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -153,17 +153,19 @@ if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，"); for (String jg : split) { boolean b = configController.apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(dqyyyqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(StringUtil.isNotBlank(jg)){ boolean b = configController.apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(dqyyyqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见") ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1446,8 +1446,8 @@ PdfPCell cell; String pdfQzgzpailie = sysConfigService.selectConfigByKey("pdf_qzgzpailie"); if (StrUtil.isNotBlank(pdfQzgzpailie) && pdfQzgzpailie.equalsIgnoreCase("h")){ zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 2); zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 2); zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 6); zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE -4); zongJianTitleFont.setStyle(Font.BOLD); PdfPTable tableQz = new PdfPTable(new float[]{90f, 90f, 60f, 60f, 60f, 60f}); tableQz.setTotalWidth(PageSize.A4.getWidth() - 100); @@ -2554,9 +2554,9 @@ List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh()); if(null !=hybgds && !hybgds.isEmpty()){ hybgds = new ArrayList<>(hybgds.stream() .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing)) .values()); // hybgds = new ArrayList<>(hybgds.stream() // .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing)) // .values()); Map<String, List<LtkjHybgd>> listMap = hybgds.stream().collect(Collectors.groupingBy(LtkjHybgd::getJyjg)); @@ -2567,7 +2567,7 @@ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictData::getDictType,"qj_type"); wrapper.eq(SysDictData::getDictLabel,firstKey); List<SysDictData> dictList = sysDictDataService.list(); List<SysDictData> dictList = sysDictDataService.list(wrapper); if (!dictList.isEmpty()) { isGroupOnce = true; groupOnceProResult = firstKey; ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -292,18 +292,21 @@ if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，"); for (String jg : split) { boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(dqyyyqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(StringUtil.isNotBlank(jg)){ boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(dqyyyqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){ @@ -462,19 +465,20 @@ if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，"); for (String jg : split) { boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(StringUtil.isNotBlank(jg)){ boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("无异常") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")&& !jg.contains("无殊")){ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1644,7 +1644,7 @@ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysDictData::getDictType,"qj_type"); wrapper.eq(SysDictData::getDictLabel,firstKey); List<SysDictData> dictList = sysDictDataService.list(); List<SysDictData> dictList = sysDictDataService.list(wrapper); if (!dictList.isEmpty()) { isGroupOnce = true; groupOnceProResult = firstKey; ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -456,7 +456,7 @@ @PostMapping @ApiOperation(value = "新增客户") @Transactional @RepeatSubmit // @RepeatSubmit @Log(title = "新增客户信息", businessType = BusinessType.INSERT) public AjaxResult add(@RequestBody @ApiParam(value = "客户对象信息") TjCustomer tjCustomer) { if (null == tjCustomer.getCusIdcard() || null == tjCustomer.getCusPhone()) { ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -443,16 +443,18 @@ String s = "。|；|;|,|，"; String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "。").split(s); for (String jg : split) { boolean b = configController.apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(xdtgmdjg.getTjh()); jcycxm.setYqid(""); jcycxm.setProId(xdtgmdjg.getProId()); jcycxm.setProName(xdtgmdjg.getProName()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(StringUtil.isNotBlank(jg)){ boolean b = configController.apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(xdtgmdjg.getTjh()); jcycxm.setYqid(""); jcycxm.setProId(xdtgmdjg.getProId()); jcycxm.setProName(xdtgmdjg.getProName()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
