婴儿的护理任务，不校验完整性，文件传给母亲，来源加_B后缀

src/main/java/com/docus/server/report/config/SdRyReportQueryConfig.java

@@ -14,6 +14,12 @@ import org.springframework.stereotype.Component;
 @Getter
 @Setter
 public class SdRyReportQueryConfig {
+    /**
+     * 同一个来源采集，区分婴儿来源的后缀
+     */
+    public static String BABY_COLLECTOR_ID_SUFFIX = "_B";
+
+
     @Value("${sdry.report-index-query.wsdl-addr:}")
     private String queryReportIndexWsdlAddr;
     @Value("${sdry.report-index-query.namespace-uri:}")
@@ -59,6 +65,8 @@ public class SdRyReportQueryConfig {
     private int reportQueryNurseInsertSugarInterval;
     @Value("${sdry.report-query-url.nurseInsertSugar.collectorId}")
     private String reportQueryNurseInsertSugarCollectorId;
+
+
     @Value("${sdry.report-query-url.nurseInsertSugar.defaultAssortType:other}")
     private String reportQueryNurseInsertSugarDefaultAssortType;
     @Value("${sdry.report-query-url.nurseInsertSugar.pushErr.url:}")
@@ -67,8 +75,6 @@ public class SdRyReportQueryConfig {
     private int reportQueryNurseInsertSugarErrPushInterval;
 
 
-
-
     @Value("${sdry.report-query-url.blood.collectorId}")
     private String bloodCollectorId;
     @Value("${sdry.report-query-url.blood.url}")

src/main/java/com/docus/server/report/job/ReportJob.java

@@ -215,6 +215,7 @@ public class ReportJob {
             taskDistributeService.cancel(reportDownTwoDto.getTasks().get(0).getTaskId());
             return;
         }
+        boolean babyTask = isBabyTask(reportDownTwoDto);
         String patientId = reportDownTwoDto.getPatient().getPatientId();
         String inpatientNo = reportDownTwoDto.getPatient().getInpatientNo();
         Integer admissTimes = reportDownTwoDto.getHospitals().get(0).getAdmissTimes();
@@ -269,13 +270,24 @@ public class ReportJob {
                 reportDto.setDowntype(1);
                 reportDto.setFileSource("1");
                 reportDto.setFilestoragetype("1");
+                if (babyTask) {
+                    // 婴儿任务，文件传到母亲病案,来源加后缀
+                    PatientInfoDTO parent = reportDownTwoDto.getParent();
+                    reportDto.setAdmisstimes(parent.getAdmissTimes());
+                    reportDto.setInpatientNo(parent.getInpatientNo());
+                    reportDto.setPatientId(parent.getPatientId());
+                    reportDto.setSysFlag(reportQueryNurseInsertSugarCollectorId+SdRyReportQueryConfig.BABY_COLLECTOR_ID_SUFFIX);
+                }
                 reportService.report(reportDto);
                 collectFileCount++;
             }
             log.info("住院号：{},住院次数{}，护理采集文件：  {} 条", inpatientNo, admissTimes, collectFileCount);
+            if (babyTask) {
+                return;
+            }
             // 设置一个redisKey,过期被监听处理
             String redisKey = String.format(ReportDownloadWait.REPORT_DOWNLOAD_WAIT_KEY, reportQueryNurseInsertSugarCollectorId, patientId);
-            redisOps.setEx(redisKey, "0", waittime*60);
+            redisOps.setEx(redisKey, "0", waittime * 60);
         }
     }