初步诊断不完整

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

@@ -98,6 +98,17 @@ public class BEH0011 extends QCCatalogue {
                 }
             }
         }
+
+        List<String> markStr = Arrays.asList("病以来", "病来");
+        String text = presentLabel.getText();
+        for (String str : markStr) {
+            if(text.contains(str)){
+                String textStr = text.substring(text.lastIndexOf(str));
+                presentPastDiags = presentPastDiags.stream().filter(obj->textStr.contains(obj)).collect(Collectors.toSet());
+                break;
+            }
+        }
+
         /* 取既往史中疾病名称 */
         if (pastLabel != null && StringUtils.isNotEmpty(pastLabel.getText())) {
             List<Diag> pastDiags = pastLabel.getDiags();

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

@@ -78,7 +78,7 @@ public class FIRC0095 extends QCCatalogue {
                 /* 取现病史中一般情况之后的疾病名称 */
                 if (StringUtil.isNotBlank(presentText) && presentDiags.size() > 0) {
                     String lastGeneral = generals.get(generals.size() - 1).getName();
-                    int lastGeneralIndex = presentText.indexOf(lastGeneral);
+                    int lastGeneralIndex = presentText.lastIndexOf(lastGeneral);
                     for (Diag presentDiag : presentDiags) {
                         if (presentDiag.getNegative() != null || presentDiag.getHospitalDiagName().contains("否认")) {
                             continue;
@@ -93,6 +93,16 @@ public class FIRC0095 extends QCCatalogue {
                 }
             }
         }
+        List<String> markStr = Arrays.asList("病以来", "病来");
+        String text = initialDiagLabel.getText();
+        for (String str : markStr) {
+           if(text.contains(str)){
+               String textStr = text.substring(text.lastIndexOf(str));
+               presentPastDiags = presentPastDiags.stream().filter(obj->textStr.contains(obj)).collect(Collectors.toSet());
+               break;
+           }
+        }
+
         /* 取既往史中疾病名称 */
         if (pastLabel != null && StringUtils.isNotEmpty(pastLabel.getText())) {
             List<Diag> pastDiags = pastLabel.getDiags();