病案首页修改bug

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

@@ -23,7 +23,7 @@ public class FIRP0186 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
 //            String outWay = firstpageStructureMap.get(Content.outWay).toString();
-            String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy).toString();
+            String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy);
             if (StringUtils.isEmpty(deadAutopsy)){
                 status.set("-1");
             }

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

@@ -20,9 +20,9 @@ public class FIRP0187 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
-            String outWay = firstpageStructureMap.get(Content.outWay).toString();
-            String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String outWay = firstpageStructureMap.get(Content.outWay);
+            String deadAutopsy = firstpageStructureMap.get(Content.deadAutopsy);
             if (!CatalogueUtil.isEmpty(outWay) && !outWay.contains("死亡")
                     && !CatalogueUtil.isEmpty(deadAutopsy) && !deadAutopsy.trim().equals("-")){
                 status.set("-1");

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

@@ -20,8 +20,8 @@ public class FIRP0189 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
-            String rhFactor = firstpageStructureMap.get(Content.rhFactor).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String rhFactor = firstpageStructureMap.get(Content.rhFactor);
             if (CatalogueUtil.isEmpty(rhFactor)){
                 status.set("-1");
             }

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

@@ -23,9 +23,9 @@ public class FIRP0190 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getClinicalBloodDocs().size() > 0) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             List<ClinicalBloodDoc> clinicalBloodDocList = inputInfo.getClinicalBloodDocs();
-            String rhFactor = firstpageStructureMap.get(Content.rhFactor).toString();
+            String rhFactor = firstpageStructureMap.get(Content.rhFactor);
             if (CatalogueUtil.isEmpty(rhFactor)) {
                 return;
             }

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

@@ -21,7 +21,11 @@ public class FIRP0200 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornWeightStr = firstpageStructureMap.get(Content.newbornWeight).replace("-","");
+            String newbornWeightStr = firstpageStructureMap.get(Content.newbornWeight);
+            if (CatalogueUtil.isEmpty(newbornWeightStr)){
+                return;
+            }
+            newbornWeightStr = newbornWeightStr.replace("-","");
             if (!CatalogueUtil.isEmpty(newbornWeightStr)) {
                 int newbornWeight = Integer.parseInt(newbornWeightStr);
                 if (newbornWeight <= 1 || newbornWeight >= 10) {

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

@@ -21,7 +21,11 @@ public class FIRP0202 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornAdmisWeightStr = firstpageStructureMap.get(Content.newbornAdmisWeight).replace("-","");
+            String newbornAdmisWeightStr = firstpageStructureMap.get(Content.newbornAdmisWeight);
+            if (CatalogueUtil.isEmpty(newbornAdmisWeightStr)){
+                return;
+            }
+            newbornAdmisWeightStr = newbornAdmisWeightStr.replace("-","");
             if (!CatalogueUtil.isEmpty(newbornAdmisWeightStr)) {
                 int newbornAdmisWeight = Integer.parseInt(newbornAdmisWeightStr);
                 if (newbornAdmisWeight <= 1 || newbornAdmisWeight >= 10) {

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

@@ -20,8 +20,8 @@ public class FIRP0239 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
-            String reHospitalization = firstpageStructureMap.get(Content.reHospitalization).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String reHospitalization = firstpageStructureMap.get(Content.reHospitalization);
             if (CatalogueUtil.isEmpty(reHospitalization)) {
                 status.set("-1");
             }