ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -89,6 +89,7 @@ String dsqkssj = configService.selectConfigByKey("dsqkssj"); String dsqjssj = configService.selectConfigByKey("dsqjssj"); String yqbm = configService.selectConfigByKey("common_api_service_hospbm"); String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm"); boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj); log.info("定时器自动同步检验检查结果"); log.info("当前时间是否在 " + dsqkssj + " 点到 " + dsqjssj + " 点之间: " + panduandangqianshijian); @@ -109,7 +110,7 @@ if (null != jy && !jy.isEmpty()) { log.info("同步检验人员 执行数量->{}", jy.size()); for (String s : jy) { extractedjianyan(s); extractedjianyan(s,dqyyyqbm); } } @@ -117,7 +118,7 @@ if (null != jc && !jc.isEmpty()) { log.info("同步检查人员 执行数量->{}", jc.size()); for (String s : jc) { extractedjiancha(s); extractedjiancha(s,dqyyyqbm); } } Map<String, Object> map = new HashMap<>(); @@ -188,7 +189,7 @@ return time.isAfter(LocalTime.of(Integer.parseInt(kssj), 0)) && time.isBefore(LocalTime.of(Integer.parseInt(jssj), 0)); } private void extractedjianyan(String s) { private void extractedjianyan(String s,String dqyyyqbm) { try { List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s); if(null !=awsList && !awsList.isEmpty()){ @@ -213,7 +214,7 @@ } } List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s); List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm); if (null != hysqdList && !hysqdList.isEmpty()) { for (LtkjHysqd hysqd : hysqdList) { LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh()); @@ -239,10 +240,10 @@ } private void extractedjiancha(String s) { private void extractedjiancha(String s,String dqyyyqbm) { try { List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s); List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,dqyyyqbm); if (null != jcsqdList && !jcsqdList.isEmpty()) { DynamicDataSourceContextHolder.clearDataSourceType(); jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s); ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -193,22 +193,22 @@ @ApiOperation(value = "手动同步检验检查外送项目结果接口") public AjaxResult shoudongtbjyjcwsxmjg(@RequestParam @ApiParam(value = "jy检验 jc检查 jyjc检验和检查") String tblx, @ApiParam(value = "体检号")@RequestParam String tjh) { String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm"); log.info("手动同步检验或检查结果开始->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); try { switch (tblx){ case "jy": tbjianyan(tjh); tbjianyan(tjh,dqyyyqbm); log.info("当前同步的是->{} 结果","检验"); break; case "jc": tbjiancha(tjh); tbjiancha(tjh,dqyyyqbm); log.info("当前同步的是->{} 结果","检查"); break; case "jyjc": tbjianyan(tjh); tbjiancha(tjh); tbjianyan(tjh,dqyyyqbm); tbjiancha(tjh,dqyyyqbm); log.info("当前同步的是->{} 结果","检验检查"); break; default: @@ -228,7 +228,7 @@ return AjaxResult.success(); } private void tbjianyan(String s) { private void tbjianyan(String s,String dqyyyqbm) { try { List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s); if(null !=awsList && !awsList.isEmpty()){ @@ -239,7 +239,7 @@ awsService.saveBatch(awsList); log.info("保存外送项目成功"); } List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s); List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,dqyyyqbm); log.info("原hysqdList->{} 结果", JSONUtil.parseObj(hysqdList)); List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s); if(null !=wssq && !wssq.isEmpty()){ @@ -272,10 +272,10 @@ } private void tbjiancha(String s) { private void tbjiancha(String s,String dqyyyqbm) { try { List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s); List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,dqyyyqbm); if (null != jcsqdList && !jcsqdList.isEmpty()) { DynamicDataSourceContextHolder.clearDataSourceType(); jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -403,7 +403,7 @@ @RepeatSubmit // @Transactional public AjaxResult dataSynchronization(@RequestParam String tjNumber) { String dqyyyqbm = configService.selectConfigByKey("dqyyyqbm"); RLock lock = redissonClient.getLock("lock:check:dataSynchronization:" + tjNumber); try { boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS); @@ -668,7 +668,7 @@ return AjaxResult.success("同步成功"); } else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber()); List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(),dqyyyqbm); if(null != hysqdList && !hysqdList.isEmpty()){ for (LtkjHysqd hysqd : hysqdList) { LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh()); @@ -683,7 +683,7 @@ } DynamicDataSourceContextHolder.clearDataSourceType(); } List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber()); List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber(),dqyyyqbm); if(null !=jcsqdList && !jcsqdList.isEmpty()){ jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId()); jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId()); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1098,8 +1098,11 @@ public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) { //获取拼接前缀 // String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix"); String sfkqtjhqz = configService.selectConfigByKey("sfkqtjhqz"); String makeLisTmhPrefix = ""; if(sfkqtjhqz.equalsIgnoreCase("Y")){ makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix"); } //生成体检号 // String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date())); ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -260,8 +260,8 @@ " \n" + "FROM\n" + " vi_his_patientinfo a\n" + "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum}") List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(String tjNum); "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum} AND a.HOSPITALID =#{dqyyyqbm}") List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(@Param("tjNum") String tjNum,@Param("dqyyyqbm") String dqyyyqbm); @@ -365,8 +365,8 @@ " SYSDATE create_time\n" + " \n" + "FROM\n" + " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}") List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(String tjNum); " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID =#{dqyyyqbm} ") List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("dqyyyqbm") String dqyyyqbm); @DataSource(value = DataSourceType.SLAVE_PACS)
