修改bug

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

@@ -26,12 +26,18 @@ public class FIRP0161 extends QCCatalogue {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String firstAdmissionAge = firstpageStructureMap.get(Content.age);
             String admissionAge = beHospitalStructureMap.get(Content.age);
-            if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
-                admissionAge = admissionAge.replace("岁", "");
-            }
+            firstAdmissionAge = removalUnit(firstAdmissionAge);
+            admissionAge = removalUnit(admissionAge);
             if (!CatalogueUtil.compareToken(firstAdmissionAge, admissionAge)) {
                 status.set("-1");
             }
         }
     }
+
+    private String removalUnit(String admissionAge) {
+        if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
+            admissionAge = admissionAge.replace("岁", "");
+        }
+        return admissionAge;
+    }
 }

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

@@ -23,7 +23,7 @@ public class FIRP0167 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String name = firstpageStructureMap.get(Content.name);
             String contactName = firstpageStructureMap.get(Content.contactName);
-            if (CatalogueUtil.compareToken(name,contactName)) {
+            if (CatalogueUtil.compareToken(name, contactName)) {
                 status.set("-1");
             }
         }

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

@@ -21,7 +21,8 @@ public class FIRP0184 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String drugAllergy = firstpageStructureMap.get(Content.drugAllergy);
-            if (!CatalogueUtil.isEmpty(drugAllergy)){
+            String allergyDrug = firstpageStructureMap.get(Content.drugAllergy);
+            if (!CatalogueUtil.isEmpty(drugAllergy) && !CatalogueUtil.isEmpty(allergyDrug)) {
                 status.set("0");
             }
         }

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -180,7 +180,7 @@ public class Content {
     public static final String outHouse = "出院病房";
     public static final String actualStay = "实际住院天数";//病案首页用
     public static final String drugAllergy = "药物过敏";
-    public static final String allergy_drug = "过敏药物";
+    public static final String allergyDrug = "过敏药物";
     public static final String deadAutopsy = "死亡患者尸检";
     public static final String bloodType="血型";
     public static final String rhFactor="Rh";