厦门：入院记录规则更新

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/behospitalized/BEH02980.java

@@ -106,8 +106,6 @@ public class BEH02980 extends QCCatalogue {
                     }
                 }
             }
-            //过敏史
-            extract_Allergy(pastLabel.getAllergies(), pos_diags, neg_diags, pastLabel.getText());
         } else {
             //例如邵逸夫 台州这种结构化数据，判断高血压 和 糖尿病是否有冲突
             List<Diag> pastDiags = new ArrayList<>();
@@ -180,7 +178,6 @@ public class BEH02980 extends QCCatalogue {
             status.set("-1");
             info.set(infoStr);
         }
-
     }
 
     //疾病史
@@ -202,43 +199,6 @@ public class BEH02980 extends QCCatalogue {
         return dgs;
     }
 
-    //过敏史
-    private List<String> extract_Allergy(List<Allergy> allergys, List<String> pos_diags, List<String> neg_diags, String text) {
-        List<String> dgs = new ArrayList<>();
-        String content =text;
-        int allergyNum = 0;
-        for (Allergy dg : allergys) {
-            String dgname = dg.getName();
-            if (dg.getNegative() == null) {
-                if (!pos_diags.contains(dgname)) {
-                    pos_diags.add(dgname);
-                }
-                if (dg.getAllergyFood() != null) {
-                    allergyNum = 1;
-                }
-                if (dg.getAllergyMedicine() != null) {
-                    allergyNum = 2;
-                }
-            } else {
-                int index = content.lastIndexOf(dgname);
-                text = content.substring(Math.max(0, index - 10), index);
-                if (allergyNum == 0 && !neg_diags.contains(dgname) && !text.contains("其他") && !text.contains("其它")) {
-                    neg_diags.add(dgname);
-                    dgs.add(dgname);
-                }
-                if (allergyNum == 1 && text.contains("食物") && !neg_diags.contains(dgname) && !text.contains("其他") && !text.contains("其它")) {
-                    neg_diags.add(dgname);
-                    dgs.add(dgname);
-                }
-                if (allergyNum == 2 && text.contains("药物") && !neg_diags.contains(dgname) && !text.contains("其他") && !text.contains("其它")) {
-                    neg_diags.add(dgname);
-                    dgs.add(dgname);
-                }
-            }
-        }
-        return dgs;
-    }
-
     private boolean isContains(String diagName) {
         for (String c : containList) {
             if (diagName.contains(c)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/firstpagerecord/FIRP0161.java

@@ -42,18 +42,16 @@ public class FIRP0161 extends QCCatalogue {
                 status.set("0");
                 return;
             }
-            String admissAge = "";
             if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
-                admissAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
+                admissionAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
             }
-            String firstadmissAge = "";
             if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
-                firstadmissAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
+                firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
             }
             // int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
             // int admissionAgeNum = removalUnit(admissionAge);
             // 只比较年龄前的数值
-            if (!admissAge.equals(firstadmissAge)) {
+            if (!admissionAge.equals(firstAdmissionAge)) {
                 status.set("-1");
                 return;
             }