出院小结的主要诊断从出院小结的出院诊断结构化中取

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

@@ -26,7 +26,7 @@ public class BEH03005 extends QCCatalogue {
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if (structureMap != null) {
-            String[] strs = {"高血压","心脏病","糖尿病","脑血管疾病","呼吸系统疾病","肾脏疾病","肝脏疾病","内科疾病史其它"};
+            String[] strs = {"高血压","心脏病","糖尿病","脑血管疾病","呼吸系统疾病","肾脏疾病","肝脏疾病"};
             for(String s :strs){
                 String s1 = structureMap.get(s).trim();
                 if(s1!=null&&StringUtil.isEmpty(s1)){

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0175.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -37,14 +38,15 @@ public class FIRP0175 extends QCCatalogue {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             //病案首页出院诊断
             List<Map<String, String>> dischargeDiag = (List) firstpageStructureMap.get(Content.dischargeDiag);
-            //出院小结诊断
+            /*//出院小结诊断
             List<Diag> leaveDiags = null;
             if (inputInfo.getLeaveHospitalDoc().getLeaveDiagLabel() != null) {
                 leaveDiags = inputInfo.getLeaveHospitalDoc().getLeaveDiagLabel().getDiags();
             }
+
             if (ListUtil.isEmpty(dischargeDiag) || ListUtil.isEmpty(leaveDiags)) {
                 return;
-            }
+            }*/
             String firstpageleaveDiag = "";
             for (Map<String, String> diag : dischargeDiag) {
                 String diagCategory = diag.get("诊断类别");
@@ -53,7 +55,8 @@ public class FIRP0175 extends QCCatalogue {
                     break;
                 }
             }
-            String leaveDiag = leaveDiags.get(0).getHospitalDiagName();
+//            String leaveDiag = leaveDiags.get(0).getHospitalDiagName();
+            String  leaveDiag = inputInfo.getLeaveHospitalDoc().getStructureMap().get("出院诊断").split("\n")[0].trim();
             //判断是否有2型糖尿病这种病如果没有，把疾病前的数字去掉
             if (!diags.contains(leaveDiag)) {
                 leaveDiag = leaveDiag.replaceAll("^[0-9]", "");