Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/example/duplicate/service/impl/MedicalAdviceServiceImpl.java
#	src/main/java/com/example/duplicate/service/impl/TaskServiceImpl.java
#	src/main/java/com/example/quartz/CollectorConfig.java

src/main/java/com/example/duplicate/service/impl/MedicalAdviceServiceImpl.java

@@ -82,6 +82,15 @@ public class MedicalAdviceServiceImpl implements MedicalAdviceService {
                         dto.setZyh(tasks.getInpNo());
                         dto.setStatusFlag(0);
                         dto.setMID(tasks.getId());
+                        if (collectId.equals("8")){
+                            dto.setC1("长临医嘱");
+                        }
+                        if (collectId.equals("1")){
+                            dto.setC1("护理记录");
+                        }
+                        if (collectId.equals("2")){
+                            dto.setC1("电子病例");
+                        }
                         //任务表新增任务
                         if (archiveOtherExtMapper.addOther(dto)) {
                             //存放队列消息

src/main/java/com/example/duplicate/service/impl/TaskServiceImpl.java

@@ -98,16 +98,7 @@ public class TaskServiceImpl implements TaskService {
                 List<ArchiveOtherExtVo> others = archiveOtherExtMapper.getOtherByMidAndFlag(archiveMasters.get(0).getId(), Integer.parseInt(collectId));
                 if (CollectionUtils.isEmpty(others)) {
                     //任务表新增
-                    dto.setId(SnowflakeIdWorker.idWorker.nextId());
+                    addOther(collectId, dto, date, SycTime, archiveMasters);
-                    dto.setSycTime(SycTime.format(date));
-                    dto.setOtherID("0");
-                    dto.setSysFlag(Integer.parseInt(collectId));
-                    dto.setSysUpdateTime(SycTime.format(date));
-                    dto.setJzh(archiveMasters.get(0).getPatientId());
-                    dto.setZyh(archiveMasters.get(0).getInpNo());
-                    dto.setStatusFlag(0);
-                    dto.setMID(archiveMasters.get(0).getId());
-                    archiveOtherExtMapper.addOther(dto);
                 }
                 archiveOtherExtMapper.updateStatic(masterId, collectId);
                 GenerateQueue(archiveMasters.get(0), printParam, 10, collectId);
@@ -136,23 +127,7 @@ public class TaskServiceImpl implements TaskService {
         //查询任务表数据，是否存在，不存在时任务表新增，存在时将任务状态改为0
         List<ArchiveOtherExtVo> others = archiveOtherExtMapper.getOtherByMidAndFlag(masterId, Integer.parseInt(collectId));
         if (CollectionUtils.isEmpty(others)) {
-            //任务表新增
+            addOther(collectId, dto, date, SycTime, archiveMasters);
-            dto.setId(SnowflakeIdWorker.idWorker.nextId());
-            dto.setSycTime(SycTime.format(date));
-            dto.setOtherID("0");
-            dto.setSysFlag(Integer.parseInt(collectId));
-            dto.setSysUpdateTime(SycTime.format(date));
-            dto.setJzh(archiveMasters.get(0).getPatientId());
-            dto.setZyh(archiveMasters.get(0).getInpNo());
-            dto.setStatusFlag(0);
-            dto.setMID(archiveMasters.get(0).getId());
-            if (collectId.equals("8")) {
-                dto.setC1("长临医嘱");
-            }
-            if (collectId.equals("1")) {
-                dto.setC1("护理记录");
-            }
-            archiveOtherExtMapper.addOther(dto);
         } else {
             archiveOtherExtMapper.updateStatic(masterId, collectId);
         }
@@ -309,6 +284,20 @@ public class TaskServiceImpl implements TaskService {
                 //查询当前患者要补偿采集器是否存在任务，不存在时新增任务
                 List<ArchiveOtherExtVo> others = archiveOtherExtMapper.getOtherByMidAndFlag(archiveMasters.get(0).getId(), Integer.parseInt(collectId));
                 if (CollectionUtils.isEmpty(others)) {
+                    addOther(collectId, dto, date, SycTime, archiveMasters);
+                }
+                //存在任务表中修改任务表状态
+                archiveOtherExtMapper.updateStatic(masterId, collectId);
+                GenerateQueue(archiveMasters.get(0), printParam, 10, collectId);
+            } catch (Exception e) {
+                log.error("masterId为:" + masterId + "的患者补偿采集器id为:"+collectId+"失败", e.getMessage(), e);
+            }
+            log.info("masterId为:" + masterId + "的患者补偿采集器id为:"+collectId+"成功");
+        }
+        return CommonResult.success("补偿完成");
+    }
+
+    private void addOther(String collectId, ArchiveOtherExtDto dto, Date date, SimpleDateFormat SycTime, List<ArchiveMasterVo> archiveMasters) {
         //任务表新增
         dto.setId(SnowflakeIdWorker.idWorker.nextId());
         dto.setSycTime(SycTime.format(date));
@@ -325,17 +314,10 @@ public class TaskServiceImpl implements TaskService {
         if (collectId.equals("1")) {
             dto.setC1("护理记录");
         }
-                    archiveOtherExtMapper.addOther(dto);
+        if (collectId.equals("2")){
-                }
+            dto.setC1("电子病例");
-                //存在任务表中修改任务表状态
-                archiveOtherExtMapper.updateStatic(masterId, collectId);
-                GenerateQueue(archiveMasters.get(0), printParam, 10, collectId);
-            } catch (Exception e) {
-                log.error("masterId为:" + masterId + "的患者补偿采集器id为:"+collectId+"失败", e.getMessage(), e);
-            }
-            log.info("masterId为:" + masterId + "的患者补偿采集器id为:"+collectId+"成功");
         }
-        return CommonResult.success("补偿完成");
+        archiveOtherExtMapper.addOther(dto);
     }
 
 

src/main/java/com/example/quartz/CollectorConfig.java

@@ -20,13 +20,17 @@ public class CollectorConfig {
 
     @Bean
     public JobDetail MedicalAdvice() {
-        return JobBuilder.newJob(MedicalAdviceQuartz.class).withIdentity("MedicalAdviceQuartz").storeDurably().build();
+        return JobBuilder.newJob(MedicalAdviceQuartz.class)
+                .withIdentity("MedicalAdviceQuartz").storeDurably()
+                .build();
     }
 
 
     @Bean
     public Trigger pacsPushTrigger() {
         return TriggerBuilder.newTrigger().forJob(MedicalAdvice())
+        return TriggerBuilder.newTrigger()
+                .forJob(MedicalAdvice())
                 .withIdentity("MedicalAdviceQuartz")
                 .withSchedule(CronScheduleBuilder.cronSchedule(medicalAdviceTime))
                 .build();

src/main/resources/application.yml

@@ -58,9 +58,9 @@ logging:
 medicalAdviceTime: 0 0/30 * * * ?
 #medicalAdviceTime: 0/1 * * * * ?
 #定时轮询时需要新增的采集标识
-collectIdList: 1,8
+collectIdList: 1, 2,8
 #补偿时,需要补偿的采集器标识,可以支持多个使用逗号','隔开
-repairCollectIds: 1,8
+repairCollectIds: 1,2,8
 #文件保存地址
 savePath: D:\reload
 #首页补偿v