三级查房修改入参及处理方式

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0428.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -25,17 +26,17 @@ public class THR0428 extends QCCatalogue {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
-            List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-            for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+            List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
+            for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
                 List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
                 for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
                     if (threeLevelWardLabel.getSerious() != 1) {
                         continue;
                     }
-                    if (threeLevelWardLabel.getDiags().size() == 0
-                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
-                            || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
-                            || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                    if (!(threeLevelWardLabel.getDiags().size() > 0
+                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText())
+                            || (threeLevelWardLabel.getDiffDiag().size() > 0 || StringUtils.isNotEmpty(threeLevelWardLabel.getDiffDiagText()))
+                            || threeLevelWardLabel.getTreatmentPlans().size() > 0)) {
                         status.set("-1");
                         return;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0429.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -25,17 +26,17 @@ public class THR0429 extends QCCatalogue {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
-            List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-            for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+            List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
+            for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
                 List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
                 for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
                     if (threeLevelWardLabel.getSerious() != 2) {
                         continue;
                     }
-                    if (threeLevelWardLabel.getDiags().size() == 0
-                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
-                            || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
-                            || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                    if (!(threeLevelWardLabel.getDiags().size() > 0
+                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText())
+                            || (threeLevelWardLabel.getDiffDiag().size() > 0 || StringUtils.isNotEmpty(threeLevelWardLabel.getDiffDiagText()))
+                            || threeLevelWardLabel.getTreatmentPlans().size() > 0)) {
                         status.set("-1");
                         return;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0430.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.label.ThreeLevelWardLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -25,17 +26,17 @@ public class THR0430 extends QCCatalogue {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
-            List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-            for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+            List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
+            for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
                 List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
                 for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
                     if (threeLevelWardLabel.getSerious() != 3) {
                         continue;
                     }
-                    if (threeLevelWardLabel.getDiags().size() == 0
-                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText()) && threeLevelWardLabel.getDiagBasisText().length() < 30
-                            || threeLevelWardLabel.getDiffDiag().size() == 0 && StringUtil.isBlank(threeLevelWardLabel.getDiffDiagText())
-                            || threeLevelWardLabel.getTreatmentPlans().size() == 0) {
+                    if (!(threeLevelWardLabel.getDiags().size() > 0
+                            || StringUtil.isNotBlank(threeLevelWardLabel.getDiagBasisText())
+                            || (threeLevelWardLabel.getDiffDiag().size() > 0 || StringUtils.isNotEmpty(threeLevelWardLabel.getDiffDiagText()))
+                            || threeLevelWardLabel.getTreatmentPlans().size() > 0)) {
                         status.set("-1");
                         return;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0431.java

@@ -24,8 +24,8 @@ public class THR0431 extends QCCatalogue {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
-            List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-            for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+            List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
+            for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
                 List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
                 for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
                     if (threeLevelWardLabel.getSerious() != 1) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0432.java

@@ -24,8 +24,8 @@ public class THR0432 extends QCCatalogue {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
-            List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-            for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+            List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
+            for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
                 List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
                 for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
                     if (threeLevelWardLabel.getSerious() != 2) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0433.java

@@ -24,8 +24,8 @@ public class THR0433 extends QCCatalogue {
             return;
         }
         if (inputInfo.getThreeLevelWardDocs().size() > 0) {
-            List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
-            for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+            List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();
+            for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
                 List<ThreeLevelWardLabel> threeLevelWardLabels = threeLevelWardDoc.getThreeLevelWardLabel();
                 for (ThreeLevelWardLabel threeLevelWardLabel : threeLevelWardLabels) {
                     if (threeLevelWardLabel.getSerious() != 3) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0434.java

@@ -84,8 +84,8 @@ public class THR0434 extends QCCatalogue {
             dateRecord.put(recordDate, seriouslyIllNoticeDocMap);
         }
         dateRecord = extractSeriouslyIll(dateRecord);//24小时内记录只取第一条
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();//查房记录
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();//查房记录
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             recordTime = rescueStructureMap.get("查房日期");
             title = CatalogueUtil.subTitle(rescueStructureMap.get("查房标题"));

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0435.java

@@ -84,8 +84,8 @@ public class THR0435 extends QCCatalogue {
             dateRecord.put(recordDate, difficultCaseDiscussStructureMap);
         }
         dateRecord = extractDifficult(dateRecord);//24小时内记录只取第一条
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();//查房记录
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();//查房记录
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             recordTime = rescueStructureMap.get("查房日期");
             title = CatalogueUtil.subTitle(rescueStructureMap.get("查房标题"));

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0436.java

@@ -84,8 +84,8 @@ public class THR0436 extends QCCatalogue {
             dateRecord.put(recordDate, rescueStructureMap);
         }
         dateRecord = extractRescue(dateRecord);//24小时内记录只取第一条
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();//查房记录
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();//查房记录
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             recordTime = rescueStructureMap.get("查房日期");
             title = CatalogueUtil.subTitle(rescueStructureMap.get("查房标题"));

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0587.java

@@ -35,7 +35,8 @@ public class THR0587 extends QCCatalogue {
             return;
         }
         //所有查房记录的日期天
-        List<Integer> wardRecordDayList = getWardRecordDay(threeLevelWardDocs);
+        List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
+        List<Integer> wardRecordDayList = getWardRecordDay(allDoctorWradDocs);
         String OperationEndDateStr = "";
         //转入日期后应该有的查房记录的日期天
         List<Integer> rollInDay = null;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0595.java

@@ -33,8 +33,8 @@ public class THR0595 extends QCCatalogue {
         List<Integer> criticallyDay = new ArrayList<>();
         Date criticallyStartDate = null, criticallyEndDate = null;
         String recordTime = "", content = "";
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();//查房记录
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();//查房记录
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             recordTime = rescueStructureMap.get("查房日期");
             content = CatalogueUtil.subTitle(rescueStructureMap.get("病情记录"));

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0596.java

@@ -33,8 +33,8 @@ public class THR0596 extends QCCatalogue {
         List<Integer> criticallyDay = new ArrayList<>();
         Date criticallyStartDate = null, criticallyEndDate = null;
         String recordTime = "", content = "";
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();//查房记录
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();//查房记录
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             recordTime = rescueStructureMap.get("查房日期");
             content = CatalogueUtil.subTitle(rescueStructureMap.get("病情记录"));

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0601.java

@@ -24,10 +24,10 @@ public class THR0601 extends QCCatalogue {
         if (inputInfo.getThreeLevelWardDocs().size() == 0) {
             return;
         }
-        List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();//查房记录
+        List<ThreeLevelWardDoc> allDoctorWradDocs = inputInfo.getThreeLevelWardDocs().get(0).getAllDoctorWradDocs();//查房记录
         String title;
         boolean findIndications = false;
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             title = CatalogueUtil.subTitle(rescueStructureMap.get("查房标题"));
             if (!CatalogueUtil.isEmpty(title) && title.contains(Content.attend)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0602.java

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
+import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
@@ -33,6 +34,8 @@ public class THR0602 extends QCCatalogue {
         if (ListUtil.isEmpty(operationDocs) || ListUtil.isEmpty(threeLevelWardDocs)) {
             return;
         }
+        //所有主治医师查房记录
+        List<AttendingDoctorWardDoc> attendingDoctorWardDocs = threeLevelWardDocs.get(0).getAttendingDoctorWardDocs();
         for (OperationDoc operationDoc : operationDocs) {
             OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
             if (operationRecordDoc == null) {
@@ -44,7 +47,7 @@ public class THR0602 extends QCCatalogue {
                 continue;
             }
             Map<String, String> doctorRecord = extractWardRecord(
-                    threeLevelWardDocs,
+                    attendingDoctorWardDocs,
                     operationEndDateStr,
                     48 * 60);
             if (!doctorRecord.containsKey(Content.attend)) {
@@ -59,12 +62,12 @@ public class THR0602 extends QCCatalogue {
     /**
      * 抽取住院duration分钟内查房记录并取第一条主治医师查房记录以及第一条主任/副主任医师查房记录
      *
-     * @param threeLevelWardDocs
+     * @param attendingDoctorWardDocs
      * @param admisTime
      * @param duration
      * @return
      */
-    private static Map<String, String> extractWardRecord(List<ThreeLevelWardDoc> threeLevelWardDocs, String admisTime, int duration) {
+    private static Map<String, String> extractWardRecord(List<AttendingDoctorWardDoc> attendingDoctorWardDocs, String admisTime, int duration) {
         Map<Date, String> dateRecord = new HashMap<>();
         List<String> sortRecord = new ArrayList<>();
         Map<String, String> doctorRecord = new HashMap<>();
@@ -73,8 +76,8 @@ public class THR0602 extends QCCatalogue {
         if (admisDate == null) {
             return doctorRecord;
         }
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
-            Map<String, String> threeLevelWardStructureMap = threeLevelWardDoc.getStructureMap();
+        for (AttendingDoctorWardDoc attendingDoctorWardDoc : attendingDoctorWardDocs) {
+            Map<String, String> threeLevelWardStructureMap = attendingDoctorWardDoc.getStructureMap();
             recordTime = threeLevelWardStructureMap.get("查房日期");
             Date recordDate = StringUtil.parseDateTime(recordTime);
             if (recordDate == null) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0603.java

@@ -32,11 +32,12 @@ public class THR0603 extends QCCatalogue {
         if (ListUtil.isEmpty(criticallyIllNoticeDocs) && ListUtil.isEmpty(difficultCaseDiscussDocs) || ListUtil.isEmpty(threeLevelWardDocs)) {
             return;
         }
+        List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
         String wardRecordDateStr;
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             wardRecordDateStr = rescueStructureMap.get("查房日期");
-            Date wardRecordDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(wardRecordDateStr)
+            Date wardRecordDate = StringUtil.parseDateTime(wardRecordDateStr
                     , CatalogueUtil.processDateFormat(Content.dateFormats));
             if (null == wardRecordDate) {
                 status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0606.java

@@ -30,11 +30,12 @@ public class THR0606 extends QCCatalogue {
         if (ListUtil.isEmpty(rescueDocs) || ListUtil.isEmpty(threeLevelWardDocs)) {
             return;
         }
+        List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDocs.get(0).getAllDoctorWradDocs();
         String wardRecordDateStr;
-        for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
+        for (ThreeLevelWardDoc threeLevelWardDoc : allDoctorWradDocs) {
             Map<String, String> rescueStructureMap = threeLevelWardDoc.getStructureMap();
             wardRecordDateStr = rescueStructureMap.get("查房日期");
-            Date wardRecordDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(wardRecordDateStr)
+            Date wardRecordDate = StringUtil.parseDateTime(wardRecordDateStr
                     , CatalogueUtil.processDateFormat(Content.dateFormats));
             if (null == wardRecordDate) {
                 status.set("-1");