Kaynağa Gözat

规则更新

rengb 5 yıl önce
ebeveyn
işleme
6b0380b8d6
100 değiştirilmiş dosya ile 303 ekleme ve 173 silme
  1. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0157.java
  2. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0158.java
  3. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0159.java
  4. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0160.java
  5. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0161.java
  6. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0162.java
  7. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0163.java
  8. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0164.java
  9. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0166.java
  10. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0167.java
  11. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0168.java
  12. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0170.java
  13. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0172.java
  14. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0174.java
  15. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0177.java
  16. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0182.java
  17. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0184.java
  18. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0188.java
  19. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0194.java
  20. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0199.java
  21. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0200.java
  22. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0201.java
  23. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0202.java
  24. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0203.java
  25. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0204.java
  26. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0205.java
  27. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0206.java
  28. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0207.java
  29. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0208.java
  30. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0209.java
  31. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0210.java
  32. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0211.java
  33. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0212.java
  34. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0213.java
  35. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0214.java
  36. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0215.java
  37. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0216.java
  38. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0217.java
  39. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0218.java
  40. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0219.java
  41. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0220.java
  42. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0221.java
  43. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0223.java
  44. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0224.java
  45. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0225.java
  46. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0226.java
  47. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0227.java
  48. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0228.java
  49. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0229.java
  50. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0230.java
  51. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0231.java
  52. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0232.java
  53. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0233.java
  54. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0234.java
  55. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0235.java
  56. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0236.java
  57. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0237.java
  58. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0238.java
  59. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0242.java
  60. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0243.java
  61. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0245.java
  62. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0246.java
  63. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0247.java
  64. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0249.java
  65. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0251.java
  66. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0253.java
  67. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0255.java
  68. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0258.java
  69. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0259.java
  70. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0260.java
  71. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0261.java
  72. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0262.java
  73. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0263.java
  74. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0264.java
  75. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0265.java
  76. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0266.java
  77. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0267.java
  78. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0269.java
  79. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0273.java
  80. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0274.java
  81. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0275.java
  82. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0276.java
  83. 4 0
      public/src/main/java/com/lantone/qc/pub/model/doc/FirstPageRecordDoc.java
  84. 2 7
      public/src/main/java/com/lantone/qc/pub/model/doc/LeaveHospitalDoc.java
  85. 2 2
      public/src/main/java/com/lantone/qc/pub/model/doc/ModelDoc.java
  86. 1 6
      public/src/main/java/com/lantone/qc/pub/model/doc/RescueDoc.java
  87. 1 6
      public/src/main/java/com/lantone/qc/pub/model/doc/RoundDoc.java
  88. 5 0
      trans/src/main/java/com/lantone/qc/trans/ModelDocTrans.java
  89. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/BeHospitalizedDocTrans.java
  90. 48 2
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxDocTrans.java
  91. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/ClinicalBloodDocTrans.java
  92. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/ConsultationDocTrans.java
  93. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/DeathCaseDiscussDocTrans.java
  94. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/DeathRecordDocTrans.java
  95. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/DifficultCaseDiscussDocTrans.java
  96. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/DutyShiftSystemDocTrans.java
  97. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/FirstCourseRecordDocTrans.java
  98. 3 2
      trans/src/main/java/com/lantone/qc/trans/changx/FirstPageRecordDocTrans.java
  99. 11 0
      trans/src/main/java/com/lantone/qc/trans/changx/LeaveHospitalDocTrans.java
  100. 0 0
      trans/src/main/java/com/lantone/qc/trans/changx/NursingSystemDocTrans.java

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

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

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

@@ -20,9 +20,9 @@ public class FIRP0158 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            String firstAdmissionName = firstpageStructureMap.get(Content.name).toString();
+            String firstAdmissionName = firstpageStructureMap.get(Content.name);
             String admissionName = beHospitalStructureMap.get(Content.name);
             if (CatalogueUtil.compareToken(firstAdmissionName,admissionName)) {
                 status = "0";

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0159 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String gender = firstpageStructureMap.get(Content.gender).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String gender = firstpageStructureMap.get(Content.gender);
             if (!CatalogueUtil.isEmpty(gender)) {
                 status = "0";
             }

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

@@ -20,9 +20,9 @@ public class FIRP0160 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            String firstAdmissionGender = firstpageStructureMap.get(Content.gender).toString();
+            String firstAdmissionGender = firstpageStructureMap.get(Content.gender);
             String admissionGender = beHospitalStructureMap.get(Content.gender);
             if (CatalogueUtil.compareToken(firstAdmissionGender,admissionGender)) {
                 status = "0";

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

@@ -20,9 +20,9 @@ public class FIRP0161 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            String firstAdmissionAge = firstpageStructureMap.get(Content.age).toString();
+            String firstAdmissionAge = firstpageStructureMap.get(Content.age);
             String admissionAge = beHospitalStructureMap.get(Content.age);
             if (CatalogueUtil.compareToken(firstAdmissionAge,admissionAge)) {
                 status = "0";

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0162 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String idcardInfo = firstpageStructureMap.get(Content.idcardInfo).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String idcardInfo = firstpageStructureMap.get(Content.idcardInfo);
             if (!CatalogueUtil.isEmpty(idcardInfo)) {
                 String regex = "\\d{15}|\\d{17}[\\dxX]";
                 if (idcardInfo.matches(regex)) {

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0163 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String idcardInfo = firstpageStructureMap.get(Content.idcardInfo).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String idcardInfo = firstpageStructureMap.get(Content.idcardInfo);
             if (!CatalogueUtil.isEmpty(idcardInfo)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0164 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String marry = firstpageStructureMap.get(Content.marry).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String marry = firstpageStructureMap.get(Content.marry);
             if (!CatalogueUtil.isEmpty(marry)){
                 status = "0";
             }

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

@@ -20,9 +20,9 @@ public class FIRP0166 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            String firstAdmissionMarry = firstpageStructureMap.get(Content.marry).toString();
+            String firstAdmissionMarry = firstpageStructureMap.get(Content.marry);
             String admissionMarry = beHospitalStructureMap.get(Content.marry);
             if (CatalogueUtil.compareToken(firstAdmissionMarry,admissionMarry)) {
                 status = "0";

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

@@ -19,9 +19,9 @@ import java.util.Map;
 public class FIRP0167 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.name).toString();
-            String contactName = firstpageStructureMap.get(Content.contactName).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.name);
+            String contactName = firstpageStructureMap.get(Content.contactName);
             if (CatalogueUtil.compareToken(name,contactName)) {
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0168 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String admitPath = firstpageStructureMap.get(Content.admitPath).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String admitPath = firstpageStructureMap.get(Content.admitPath);
             if (!CatalogueUtil.isEmpty(admitPath)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0170 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String transferDept = firstpageStructureMap.get(Content.transferDept).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String transferDept = firstpageStructureMap.get(Content.transferDept);
             if (!CatalogueUtil.isEmpty(transferDept)){
                 status = "0";
             }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0172.java

@@ -20,7 +20,7 @@ import java.util.Map;
 public class FIRP0172 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> outpatientEmergencyDiag = (List) firstpageStructureMap.get(Content.outpatientEmergencyDiag);
             if (ListUtil.isNotEmpty(outpatientEmergencyDiag)) {
                 status = "0";

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

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

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0177.java

@@ -21,7 +21,7 @@ import java.util.Map;
 public class FIRP0177 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> diagMapList = (List) firstpageStructureMap.get(Content.dischargeDiag);
             if (ListUtil.isNotEmpty(diagMapList) && !CatalogueUtil.isEmpty(diagMapList.get(0).get(Content.diagCode))) {
                 status = "0";

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0182.java

@@ -20,7 +20,7 @@ import java.util.Map;
 public class FIRP0182 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> pathologyDiagnose = (List) firstpageStructureMap.get(Content.pathologyDiagnose);
             if (ListUtil.isNotEmpty(pathologyDiagnose)) {
                 status = "0";

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0184 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String drugAllergy = firstpageStructureMap.get(Content.drugAllergy).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String drugAllergy = firstpageStructureMap.get(Content.drugAllergy);
             if (!CatalogueUtil.isEmpty(drugAllergy)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0188 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String bloodType = firstpageStructureMap.get(Content.bloodType).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String bloodType = firstpageStructureMap.get(Content.bloodType);
             if (!CatalogueUtil.isEmpty(bloodType)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0194 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String outWay = firstpageStructureMap.get(Content.outWay).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String outWay = firstpageStructureMap.get(Content.outWay);
             if (!CatalogueUtil.isEmpty(outWay)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0199 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornWeight = firstpageStructureMap.get(Content.newbornWeight).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String newbornWeight = firstpageStructureMap.get(Content.newbornWeight);
             if (!CatalogueUtil.isEmpty(newbornWeight)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0200 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornWeightStr = firstpageStructureMap.get(Content.newbornWeight).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String newbornWeightStr = firstpageStructureMap.get(Content.newbornWeight);
             if (!CatalogueUtil.isEmpty(newbornWeightStr)) {
                 int newbornWeight = Integer.parseInt(newbornWeightStr);
                 if (newbornWeight >= 1 && newbornWeight <= 10) {

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0201 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornAdmisWeight = firstpageStructureMap.get(Content.newbornAdmisWeight).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String newbornAdmisWeight = firstpageStructureMap.get(Content.newbornAdmisWeight);
             if (!CatalogueUtil.isEmpty(newbornAdmisWeight)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0202 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornAdmisWeightStr = firstpageStructureMap.get(Content.newbornAdmisWeight).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String newbornAdmisWeightStr = firstpageStructureMap.get(Content.newbornAdmisWeight);
             if (!CatalogueUtil.isEmpty(newbornAdmisWeightStr)) {
                 int newbornAdmisWeight = Integer.parseInt(newbornAdmisWeightStr);
                 if (newbornAdmisWeight >= 1 && newbornAdmisWeight <= 10) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -20,9 +20,9 @@ public class FIRP0220 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getBeHospitalizedDoc() != null && inputInfo.getBeHospitalizedDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            String firstAdmissionDate = firstpageStructureMap.get(Content.admisTime).toString();
+            String firstAdmissionDate = firstpageStructureMap.get(Content.admisTime);
             String admissionDate = beHospitalStructureMap.get(Content.admisDate);
             if (CatalogueUtil.equalsDate(firstAdmissionDate, admissionDate, "yyyy-MM-ddH")) {
                 status = "0";

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

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

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

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

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

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

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

@@ -20,9 +20,9 @@ public class FIRP0225 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String firstDischargeTime = firstpageStructureMap.get(Content.dischargeTime).toString();//病案首页出院时间
+            String firstDischargeTime = firstpageStructureMap.get(Content.dischargeTime);//病案首页出院时间
             String dischargeTime = leaveHospitalStructureMap.get(Content.dischargeTime);//出院小结出院时间
             if (CatalogueUtil.equalsDate(firstDischargeTime, dischargeTime, "yyyy-MM-ddH")) {
                 status = "0";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0243.java

@@ -21,7 +21,7 @@ public class FIRP0243 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> operative_information = (List<Map<String, String>>) firstpageStructureMap.get(Content.operative_information);
             if(operative_information != null && operative_information.size()>0){
                 for (Map<String,String> opInfo:operative_information) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0245.java

@@ -21,7 +21,7 @@ public class FIRP0245 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> operative_information = (List<Map<String, String>>) firstpageStructureMap.get(Content.operative_information);
             if(operative_information != null && operative_information.size()>0){
                 for (Map<String,String> opInfo:operative_information) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0246.java

@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
 public class FIRP0246 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
 
         }
     }

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

@@ -21,8 +21,8 @@ import java.util.regex.Pattern;
 public class FIRP0247 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.rescue_condition).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.rescue_condition);
             if (!CatalogueUtil.isEmpty(name)){
                 Pattern compile = Pattern.compile("(?<=抢救).*(?=次)");
                 Matcher matcher = compile.matcher(name);

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

@@ -21,8 +21,8 @@ import java.util.regex.Pattern;
 public class FIRP0249 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.rescue_condition).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.rescue_condition);
             if (!CatalogueUtil.isEmpty(name)){
                 Pattern compile = Pattern.compile("(?<=成功).*(?=次)");
                 Matcher matcher = compile.matcher(name);

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0251 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.single_disease_management).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.single_disease_management);
             if (!CatalogueUtil.isEmpty(name)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0253 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.clinical_pathway_management).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.clinical_pathway_management);
             if (!CatalogueUtil.isEmpty(name)){
                 status = "0";
             }

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

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

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

@@ -20,7 +20,7 @@ public class FIRP0258 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0259 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0260 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0261 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0262 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0263 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0264 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0265 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -20,7 +20,7 @@ public class FIRP0266 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            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))){
                 status = "-1";

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0267 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.charge).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.charge);
             if (!CatalogueUtil.isEmpty(name)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0269 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String name = firstpageStructureMap.get(Content.otherCharge).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String name = firstpageStructureMap.get(Content.otherCharge);
             if (!CatalogueUtil.isEmpty(name)){
                 status = "0";
             }

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0273 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornAge = firstpageStructureMap.get(Content.newbornAge).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String newbornAge = firstpageStructureMap.get(Content.newbornAge);
             if (!CatalogueUtil.isEmpty(newbornAge) && Integer.parseInt(newbornAge) <= 28){
                 //新生儿年龄单位为天,小于28天算通过
                 status = "0";

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

@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0274 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String newbornAge = firstpageStructureMap.get(Content.newbornAge).toString();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String newbornAge = firstpageStructureMap.get(Content.newbornAge);
             if (!CatalogueUtil.isEmpty(newbornAge)){
                 status = "0";
             }

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

@@ -20,9 +20,9 @@ public class FIRP0275 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null
                 && inputInfo.getLeaveHospitalDoc() != null && inputInfo.getLeaveHospitalDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
-            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay).toString();//病案首页出院时间
+            String firstDischargeTime = firstpageStructureMap.get(Content.actualStay);//病案首页出院时间
             String dischargeTime = leaveHospitalStructureMap.get(Content.stayLength);//出院小结出院时间
             if (CatalogueUtil.compareToken(firstDischargeTime, dischargeTime)) {
                 status = "0";

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0276.java

@@ -21,7 +21,7 @@ public class FIRP0276 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             List<Map<String, String>> outpatientEmergencyDiag = (List) firstpageStructureMap.get(Content.outpatientEmergencyDiag);
 
         }

+ 4 - 0
public/src/main/java/com/lantone/qc/pub/model/doc/FirstPageRecordDoc.java

@@ -1,8 +1,11 @@
 package com.lantone.qc.pub.model.doc;
 
+import com.google.common.collect.Maps;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Map;
+
 /**
  * @ClassName : FirstPageRecordDoc
  * @Description : 病案首页
@@ -12,4 +15,5 @@ import lombok.Setter;
 @Getter
 @Setter
 public class FirstPageRecordDoc extends ModelDoc {
+    private Map<String, Object> structureExtMap = Maps.newHashMap();
 }

+ 2 - 7
public/src/main/java/com/lantone/qc/pub/model/doc/LeaveHospitalDoc.java

@@ -7,9 +7,6 @@ import com.lantone.qc.pub.model.label.NoticeLabel;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @ClassName : LeaveHospitalDoc
  * @Description : 出院小结
@@ -18,11 +15,9 @@ import java.util.Map;
  */
 @Getter
 @Setter
-public class LeaveHospitalDoc {
-    //出院小结所有结构化信息存储
-    private Map<String, String> structureMap = new HashMap<>();
-    private DiagLabel leaveDiagLabel;//出院诊断
+public class LeaveHospitalDoc extends ModelDoc {
     private ChiefLabel chiefLabel;  //主诉
     private NoticeLabel noticeLabel;//注意事项
     private DoctorAdviceLabel doctorAdviceLabel;//医嘱
+    private DiagLabel leaveDiagLabel;//出院诊断
 }

+ 2 - 2
public/src/main/java/com/lantone/qc/pub/model/doc/ModelDoc.java

@@ -1,9 +1,9 @@
 package com.lantone.qc.pub.model.doc;
 
+import com.google.common.collect.Maps;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -15,5 +15,5 @@ import java.util.Map;
 @Setter
 public class ModelDoc {
     //所有结构化信息存储
-    private Map<String, Object> structureMap = new HashMap<>();
+    private Map<String, String> structureMap = Maps.newHashMap();
 }

+ 1 - 6
public/src/main/java/com/lantone/qc/pub/model/doc/RescueDoc.java

@@ -3,9 +3,6 @@ package com.lantone.qc.pub.model.doc;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @ClassName : RescueDoc
  * @Description : 抢救记录
@@ -14,7 +11,5 @@ import java.util.Map;
  */
 @Setter
 @Getter
-public class RescueDoc {
-    //抢救记录
-    private Map<String, String> structureMap = new HashMap<>();
+public class RescueDoc extends ModelDoc {
 }

+ 1 - 6
public/src/main/java/com/lantone/qc/pub/model/doc/RoundDoc.java

@@ -3,9 +3,6 @@ package com.lantone.qc.pub.model.doc;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * @ClassName : RoundDoc
  * @Description : 查房记录
@@ -14,7 +11,5 @@ import java.util.Map;
  */
 @Setter
 @Getter
-public class RoundDoc {
-    //查房记录
-    private Map<String, String> structureMap = new HashMap<>();
+public class RoundDoc extends ModelDoc {
 }

+ 5 - 0
trans/src/main/java/com/lantone/qc/trans/ModelDocTrans.java

@@ -1,5 +1,6 @@
 package com.lantone.qc.trans;
 
+import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.Preproc;
 import lombok.Getter;
@@ -17,4 +18,8 @@ public class ModelDocTrans {
     private Preproc preproc;
     private ModelDocGenerate modelDocGenerate;
 
+    public <T> T extract(MedrecVo medrecVo) {
+        return null;
+    }
+
 }

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/BeHospitalizedDocTrans.java

@@ -16,6 +16,7 @@ import java.util.Map;
  */
 public class BeHospitalizedDocTrans extends ModelDocTrans {
 
+    @Override
     public BeHospitalizedDoc extract(MedrecVo medrecVo) {
         String content = medrecVo.getContent().get("content").toString();
         int index1 = content.indexOf("初步诊断") + 5;

+ 48 - 2
trans/src/main/java/com/lantone/qc/trans/changx/ChangxDocTrans.java

@@ -4,8 +4,6 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.trans.DocTrans;
-import com.lantone.qc.trans.comsis.ModelDocGenerate;
-import com.lantone.qc.trans.comsis.Preproc;
 
 /**
  * @ClassName : TaiZhouDocTrans
@@ -25,10 +23,58 @@ public class ChangxDocTrans extends DocTrans {
                 beHospitalizedDocTrans.setModelDocGenerate(getModelDocGenerate());
                 inputInfo.setBeHospitalizedDoc(beHospitalizedDocTrans.extract(i));
             }
+            if (i.getTitle().equals("临床用血审核制度")) {
+                ClinicalBloodDocTrans clinicalBloodDocTrans = new ClinicalBloodDocTrans();
+                inputInfo.setClinicalBloodDoc(clinicalBloodDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("会诊制度")) {
+                ConsultationDocTrans consultationDocTrans = new ConsultationDocTrans();
+                inputInfo.setConsultationDocs(consultationDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("死亡病例讨论制度")) {
+                DeathCaseDiscussDocTrans deathCaseDiscussDocTrans = new DeathCaseDiscussDocTrans();
+                inputInfo.setDeathCaseDiscussDoc(deathCaseDiscussDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("死亡记录")) {
+                DeathRecordDocTrans deathRecordDocTrans = new DeathRecordDocTrans();
+                inputInfo.setDeathRecordDoc(deathRecordDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("疑难病例讨论制度")) {
+                DifficultCaseDiscussDocTrans difficultCaseDiscussDocTrans = new DifficultCaseDiscussDocTrans();
+                inputInfo.setDifficultCaseDiscussDocs(difficultCaseDiscussDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("值班及交接班制度")) {
+                DutyShiftSystemDocTrans dutyShiftSystemDocTrans = new DutyShiftSystemDocTrans();
+                inputInfo.setDutyShiftSystemDocs(dutyShiftSystemDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("首次病程录")) {
+                FirstCourseRecordDocTrans firstCourseRecordDocTrans = new FirstCourseRecordDocTrans();
+                inputInfo.setFirstCourseRecordDoc(firstCourseRecordDocTrans.extract(i));
+            }
             if (i.getTitle().equals("病案首页")) {
                 FirstPageRecordDocTrans firstPageRecordDocTrans = new FirstPageRecordDocTrans();
                 inputInfo.setFirstPageRecordDoc(firstPageRecordDocTrans.extract(i));
             }
+            if (i.getTitle().equals("出院小结")) {
+                LeaveHospitalDocTrans leaveHospitalDocTrans = new LeaveHospitalDocTrans();
+                inputInfo.setLeaveHospitalDoc(leaveHospitalDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("分级护理制度")) {
+                NursingSystemDocTrans nursingSystemDocTrans = new NursingSystemDocTrans();
+                inputInfo.setNursingSystemDoc(nursingSystemDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("围手术期病历讨论及记录")) {
+                OperationDiscussionDocTrans operationDiscussionDocTrans = new OperationDiscussionDocTrans();
+                inputInfo.setOperationDiscussionDocs(operationDiscussionDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("术前讨论制度")) {
+                PreoperativeDiscussionDocTrans preoperativeDiscussionDocTrans = new PreoperativeDiscussionDocTrans();
+                inputInfo.setPreoperativeDiscussionDocs(preoperativeDiscussionDocTrans.extract(i));
+            }
+            if (i.getTitle().equals("三级查房制度")) {
+                ThreeLevelWardDocTrans threeLevelWardDocTrans = new ThreeLevelWardDocTrans();
+                inputInfo.setThreeLevelWardDoc(threeLevelWardDocTrans.extract(i));
+            }
         }
         return inputInfo;
     }

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ClinicalBloodDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 临床用血审核制度文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:21
+ */
+public class ClinicalBloodDocTrans extends ModelDocTrans {
+}

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ConsultationDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 会诊制度文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:22
+ */
+public class ConsultationDocTrans extends ModelDocTrans {
+}

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/DeathCaseDiscussDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 死亡病例讨论制度文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:22
+ */
+public class DeathCaseDiscussDocTrans extends ModelDocTrans {
+}

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/DeathRecordDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 死亡记录文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:23
+ */
+public class DeathRecordDocTrans extends ModelDocTrans {
+}

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/DifficultCaseDiscussDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 疑难病例讨论制度文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:23
+ */
+public class DifficultCaseDiscussDocTrans extends ModelDocTrans {
+}

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/DutyShiftSystemDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 值班交接制度文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:24
+ */
+public class DutyShiftSystemDocTrans extends ModelDocTrans {
+}

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/FirstCourseRecordDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 首次病程录文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:25
+ */
+public class FirstCourseRecordDocTrans extends ModelDocTrans {
+}

+ 3 - 2
trans/src/main/java/com/lantone/qc/trans/changx/FirstPageRecordDocTrans.java

@@ -7,14 +7,15 @@ import com.lantone.qc.trans.ModelDocTrans;
 import java.util.Map;
 
 /**
- * @Description: 入院记录文档生成
+ * @Description: 病案首页文档生成
  * @author: 胡敬
  * @time: 2020/3/16 17:47
  */
 public class FirstPageRecordDocTrans extends ModelDocTrans {
 
+    @Override
     public FirstPageRecordDoc extract(MedrecVo medrecVo) {
-        Map<String,Object> content = medrecVo.getContent();
+        Map<String, String> content = (Map) medrecVo.getContent();
         FirstPageRecordDoc firstPageRecordDoc = new FirstPageRecordDoc();
         firstPageRecordDoc.setStructureMap(content);
         return firstPageRecordDoc;

+ 11 - 0
trans/src/main/java/com/lantone/qc/trans/changx/LeaveHospitalDocTrans.java

@@ -0,0 +1,11 @@
+package com.lantone.qc.trans.changx;
+
+import com.lantone.qc.trans.ModelDocTrans;
+
+/**
+ * @Description: 出院小结文档生成
+ * @author: rengb
+ * @time: 2020/3/17 13:25
+ */
+public class LeaveHospitalDocTrans extends ModelDocTrans {
+}

+ 0 - 0
trans/src/main/java/com/lantone/qc/trans/changx/NursingSystemDocTrans.java


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor