初步诊断不完整,查找修正诊断和补充诊断内容进入

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java

@@ -54,8 +54,14 @@ public class BEH0011 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //现病史
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
+        //初步诊断
         DiagLabel initialDiagLabel = inputInfo.getBeHospitalizedDoc().getInitialDiagLabel();
+        //修正诊断
+        DiagLabel revisedDiagLabel = inputInfo.getBeHospitalizedDoc().getRevisedDiagLabel();
+        //补充诊断
+        DiagLabel suppleDiagLabel = inputInfo.getBeHospitalizedDoc().getSuppleDiagLabel();
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
         PacsLabel pacsLabel = inputInfo.getBeHospitalizedDoc().getPacsLabel();
         if (initialDiagLabel == null) {
@@ -129,12 +135,23 @@ public class BEH0011 extends QCCatalogue {
             }
         }
 
-
         /* 取初步诊断中疾病名称 */
         List<String> initDiags = new ArrayList<>();
         List<Diag> initialDiagDiags = initialDiagLabel.getDiags();
         addInitDiagHospitalName(initDiags, initialDiagDiags);
 
+        /* 取修正诊断中疾病名称 */
+        List<Diag> revisedDiagDiags = revisedDiagLabel.getDiags();
+        addInitDiagHospitalName(initDiags, revisedDiagDiags);
+
+        /* 取补充诊断中疾病名称 */
+        List<Diag> suppleDiagDiags = suppleDiagLabel.getDiags();
+        addInitDiagHospitalName(initDiags, suppleDiagDiags);
+
+        if (initDiags.size() > 0) {
+            initDiags = initDiags.stream().distinct().collect(Collectors.toList());
+        }
+
         String infoStr = "";
         /*先两两对比，能对上就删除，对不上的再走相似度模型*/
         Iterator<String> iterator = presentPastDiags.iterator();
@@ -143,6 +160,7 @@ public class BEH0011 extends QCCatalogue {
             for (String initDiag : initDiags) {
                 if (presentPastDiag.equals(initDiag) || presentPastDiag.contains(initDiag) || initDiag.contains(presentPastDiag)) {
                     iterator.remove();
+                    break;
                 }
             }
         }