Merge remote-tracking branch 'origin/dev-1.2' into dev

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

@@ -63,6 +63,8 @@ public class BEH0011 extends QCCatalogue {
                         if (presentText.indexOf(presentDiag.getHospitalDiagName()) > lastGeneralIndex) {
                             if (presentDiag.getHospitalDiagName().contains("心")
                                     || presentDiag.getHospitalDiagName().contains("糖")
+                                    || presentDiag.getHospitalDiagName().contains("脑萎缩")
+                                    || presentDiag.getHospitalDiagName().contains("慢性")
                                     || presentDiag.getHospitalDiagName().contains("血")) {
                                 presentPastDiags.add(presentDiag.getHospitalDiagName());
                             }
@@ -79,7 +81,7 @@ public class BEH0011 extends QCCatalogue {
         /* 取初步诊断中疾病名称 */
         List<String> initDiags = new ArrayList<>();
         List<Diag> initialDiagDiags = initialDiagLabel.getDiags();
-        addDiagHospitalName(initDiags, initialDiagDiags);
+        addInitDiagHospitalName(initDiags, initialDiagDiags);
 
         String infoStr = "";
         int matchSum = 0;
@@ -130,11 +132,22 @@ public class BEH0011 extends QCCatalogue {
             }
             if (pastDiag.getHospitalDiagName().contains("心")
                     || pastDiag.getHospitalDiagName().contains("糖")
+                    || pastDiag.getHospitalDiagName().contains("脑萎缩")
+                    || pastDiag.getHospitalDiagName().contains("慢性")
                     || pastDiag.getHospitalDiagName().contains("血")) {
                 presentPastDiag.add(pastDiag.getHospitalDiagName());
             }
         }
     }
+
+    private void addInitDiagHospitalName(List<String> presentPastDiag, List<Diag> pastDiags) {
+        for (Diag pastDiag : pastDiags) {
+            if (pastDiag.getNegative() != null) {
+                continue;
+            }
+            presentPastDiag.add(pastDiag.getHospitalDiagName());
+        }
+    }
     /* 原逻辑
     Map<String, Map<String, Object>> diagMap = specialStorageUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
     String initDiagText = CatalogueUtil.removeSpecialChar(initialDiagLabel.getText());

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0095.java

@@ -60,6 +60,8 @@ public class FIRC0095 extends QCCatalogue {
                         if (presentText.indexOf(presentDiag.getHospitalDiagName()) > lastGeneralIndex) {
                             if (presentDiag.getHospitalDiagName().contains("心")
                                     || presentDiag.getHospitalDiagName().contains("糖")
+                                    || presentDiag.getHospitalDiagName().contains("脑萎缩")
+                                    || presentDiag.getHospitalDiagName().contains("慢性")
                                     || presentDiag.getHospitalDiagName().contains("血")) {
                                 presentPastDiags.add(presentDiag.getHospitalDiagName());
                             }
@@ -76,7 +78,7 @@ public class FIRC0095 extends QCCatalogue {
         /* 取初步诊断中疾病名称 */
         List<String> initDiags = new ArrayList<>();
         List<Diag> initialDiagDiags = initialDiagLabel.getDiags();
-        addDiagHospitalName(initDiags, initialDiagDiags);
+        addInitDiagHospitalName(initDiags, initialDiagDiags);
 
         String infoStr = "";
         int matchSum = 0;
@@ -127,9 +129,20 @@ public class FIRC0095 extends QCCatalogue {
             }
             if (pastDiag.getHospitalDiagName().contains("心")
                     || pastDiag.getHospitalDiagName().contains("糖")
+                    || pastDiag.getHospitalDiagName().contains("脑萎缩")
+                    || pastDiag.getHospitalDiagName().contains("慢性")
                     || pastDiag.getHospitalDiagName().contains("血")) {
                 presentPastDiag.add(pastDiag.getHospitalDiagName());
             }
         }
     }
+
+    private void addInitDiagHospitalName(List<String> presentPastDiag, List<Diag> pastDiags) {
+        for (Diag pastDiag : pastDiags) {
+            if (pastDiag.getNegative() != null) {
+                continue;
+            }
+            presentPastDiag.add(pastDiag.getHospitalDiagName());
+        }
+    }
 }