ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -131,11 +131,11 @@ List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s); if(null !=list && !list.isEmpty()){ for (LtkjExamJcsqd jcsqd : list) { if(jcsqd.getJgbx().contains("。")){ String[] split = jcsqd.getJgzt().split("。"); if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;"); for (String jg : split) { if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -488,11 +488,15 @@ */ public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) { try { String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team"); log.info("根据体检类型判断是否需要直接从Lis、pacs直接申请 :"+tjOrder.getTjType()+"_"+useLisAndPacsRegisterDictTeam); String[] split = useLisAndPacsRegisterDictTeam.split(",|，|。|：|:"); List<String> list = Arrays.asList(split); log.info("参数配置里面的值为 list :"+list); return list.contains(tjOrder.getTjType()); } catch (Exception e) { log.error("isUseLisAndPacsRegister"+e.getMessage()); return false; } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -356,7 +356,7 @@ List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s); if(null !=list && !list.isEmpty()){ for (LtkjExamJcsqd jcsqd : list) { if(jcsqd.getJgbx().contains("。")){ if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().split("。"); for (String jg : split) { if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1098,7 +1098,8 @@ public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) { //获取拼接前缀 String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix"); // String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix"); String makeLisTmhPrefix = ""; //生成体检号 // String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date())); @@ -1349,9 +1350,9 @@ // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs log.info("签到登记接口该人员的体检类型是:"+tjOrder.getTjType()); log.info("签到登记接口该人员: "+tjOrder.getTjNumber()+" 的体检类型是:"+tjOrder.getTjType()); if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) { log.info("签到登记进入未收费方法"); log.info(tjOrder.getTjNumber()+"签到登记进入未收费方法"); // 这是上面个人方法引入数据 tjFlowingWater.setPayStasus(1L); newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); @@ -1361,10 +1362,11 @@ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); xdPictureService.saveBatch(xdPictureList); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); log.info("签到登记:采样数据查询个数"+detailList.size()); log.info(tjOrder.getTjNumber()+"签到登记:采样数据查询个数"+detailList.size()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); return AjaxResult.success(tjNumber); } else { log.info(tjOrder.getTjNumber()+"else签到登记进入收费方法"); newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater); if (error != null) return error; ltkj-admin/src/test/java/zjhTest.java
@@ -30,6 +30,7 @@ import java.net.URL; import java.time.LocalTime; import java.time.ZonedDateTime; import java.util.Arrays; import java.util.List; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -129,9 +130,12 @@ // BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10)))); // System.out.println(multiply); String a="抗甲状腺球蛋白抗体（TGAb）检测,1111，2222。33333：555555:666666"; String a="1,4"; String[] split = a.split(",|，|。|：|:"); System.out.println(split); List<String> list = Arrays.asList(split); log.info("参数配置里面的值为 list :"+list); System.out.println( list.contains("1")); }
@@ -61,15 +61,15 @@ */ @Override public String selectConfigByKey(String configKey) { String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey))); if (StringUtils.isNotEmpty(configValue)) { return configValue; } // String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey))); // if (StringUtils.isNotEmpty(configValue)) { // return configValue; // } SysConfig config = new SysConfig(); config.setConfigKey(configKey); SysConfig retConfig = configMapper.selectConfig(config); if (StringUtils.isNotNull(retConfig)) { redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); // redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); return retConfig.getConfigValue(); } return StringUtils.EMPTY;
