病例特点判断修改

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

@@ -42,7 +42,8 @@ public class FIRC0085 extends QCCatalogue {
         }
         List<String> physicalCheckList = Content.physicalCheckList;
         List<String> auxiliaryExaminationList = Content.auxiliaryExaminationList;
-        String characteristics  = firstCourseRecordDoc.getStructureMap().get("病例特点");
+        Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+        String characteristics  = structureMap.get("病例特点");
         String docText = firstCourseRecordDoc.getText();
         CaseCharacteristicLabel caseCharacteristicLabel = firstCourseRecordDoc.getCaseCharacteristicLabel();
         if(caseCharacteristicLabel!=null){
@@ -78,6 +79,15 @@ public class FIRC0085 extends QCCatalogue {
                     auxiliaryExamination=true;
                 }
             }
+            if(structureMap.get("现病史")!=null){
+                medicalHistory=true;
+            }
+            if(structureMap.get("体格检查")!=null||structureMap.get("查体")!=null||structureMap.get("体温")!=null||structureMap.get("脉搏")!=null||structureMap.get("呼吸")!=null||structureMap.get("血压")!=null){
+                medicalHistory=true;
+            }
+            if(structureMap.get("辅助检查结果")!=null){
+                auxiliaryExamination=true;
+            }
         }
         if(StringUtil.isNotBlank(docText)){
             if(docText.contains("病史")||docText.contains("既往")){

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

@@ -10,6 +10,7 @@ import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName : FIRC0085
@@ -36,7 +37,8 @@ public class FIRC03152 extends QCCatalogue {
         }
         List<String> physicalCheckList = Content.physicalCheckList;
         List<String> auxiliaryExaminationList = Content.auxiliaryExaminationList;
-        String characteristics  = firstCourseRecordDoc.getStructureMap().get("病例特点");
+        Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
+        String characteristics  = structureMap.get("病例特点");
         String docText = firstCourseRecordDoc.getText();
         CaseCharacteristicLabel caseCharacteristicLabel = firstCourseRecordDoc.getCaseCharacteristicLabel();
         if(caseCharacteristicLabel!=null){
@@ -72,6 +74,15 @@ public class FIRC03152 extends QCCatalogue {
                     auxiliaryExamination=true;
                 }
             }
+            if(structureMap.get("现病史")!=null){
+                medicalHistory=true;
+            }
+            if(structureMap.get("体格检查")!=null||structureMap.get("查体")!=null||structureMap.get("体温")!=null||structureMap.get("脉搏")!=null||structureMap.get("呼吸")!=null||structureMap.get("血压")!=null){
+                medicalHistory=true;
+            }
+            if(structureMap.get("辅助检查结果")!=null){
+                auxiliaryExamination=true;
+            }
         }
         if(StringUtil.isNotBlank(docText)){
             if(docText.contains("病史")||docText.contains("既往")){