hujing пре 5 година
родитељ
комит
bc432fc3eb

+ 4 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0174.java

@@ -19,11 +19,12 @@ import java.util.Map;
 @Component
 public class FIRP0174 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+        status.set("0");
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureExtMap() != null) {
             Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> outpatientEmergencyDiag = (List) firstpageStructureMap.get(Content.dischargeDiag);
-            if (ListUtil.isNotEmpty(outpatientEmergencyDiag)) {
-                status.set("0");
+            if (ListUtil.isEmpty(outpatientEmergencyDiag)) {
+                status.set("-1");
             }
         }
     }

+ 3 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0257.java

@@ -19,10 +19,9 @@ import java.util.Map;
 public class FIRP0257 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureExtMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.o_i))){
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.o_i))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0258.java

@@ -20,9 +20,8 @@ public class FIRP0258 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.o_i))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.o_i))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0259.java

@@ -20,9 +20,8 @@ public class FIRP0259 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.i_o))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.i_o))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0260.java

@@ -20,9 +20,8 @@ public class FIRP0260 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.i_o))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.i_o))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0261.java

@@ -20,9 +20,8 @@ public class FIRP0261 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.ob_oa))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.ob_oa))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0262.java

@@ -20,9 +20,8 @@ public class FIRP0262 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.ob_oa))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.ob_oa))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0263.java

@@ -20,9 +20,8 @@ public class FIRP0263 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.clinical_pathology))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.clinical_pathology))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0264.java

@@ -20,9 +20,8 @@ public class FIRP0264 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.clinical_pathology))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.clinical_pathology))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0265.java

@@ -20,9 +20,8 @@ public class FIRP0265 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.radiation_pathology))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.radiation_pathology))){
                 status.set("-1");
             }
         }

+ 2 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0266.java

@@ -20,9 +20,8 @@ public class FIRP0266 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();
-            Map<String,String> map = (Map) firstpageStructureMap.get(Content.diagnose_cts);
-            if (CatalogueUtil.isEmpty(map.get(Content.radiation_pathology))){
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            if (CatalogueUtil.isEmpty(firstpageStructureMap.get(Content.radiation_pathology))){
                 status.set("-1");
             }
         }