义乌规则修改bug，字段修改隐射

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0011.java

@@ -17,12 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -99,7 +94,7 @@ public class BEH0011 extends QCCatalogue {
                 }
             }
             a1 = structureMap.get("糖尿病");
-            if  (StringUtils.isNotEmpty(a1) && !"否认".equals(a1)) {
+            if (StringUtils.isNotEmpty(a1) && !"否认".equals(a1)) {
                 Diag diag = new Diag();
                 diag.setName("糖尿病");
                 diag.setHospitalDiagName("糖尿病");
@@ -113,8 +108,10 @@ public class BEH0011 extends QCCatalogue {
         List<String> initDiags = new ArrayList<>();
         List<Diag> initialDiagDiags = initialDiagLabel.getDiags();
         addInitDiagHospitalName(initDiags, initialDiagDiags);
-        List<Diag> suppleDiagDiags = suppleDiagLabel.getDiags();
-        addInitDiagHospitalName(initDiags, suppleDiagDiags);
+        if (suppleDiagLabel != null) {
+            List<Diag> suppleDiagDiags = suppleDiagLabel.getDiags();
+            addInitDiagHospitalName(initDiags, suppleDiagDiags);
+        }
         initDiags = initDiags.stream().distinct().collect(Collectors.toList());
 
         String infoStr = "";

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/firstpagerecord/FIRP0201.java

@@ -1,10 +1,10 @@
 package com.lantone.qc.kernel.catalogue.yiwu.firstpagerecord;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -19,8 +19,8 @@ import java.util.Map;
 public class FIRP0201 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureExtMap() != null) {
+            Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
             /*
             String infantAgeMonths = firstpageStructureMap.get(Content.newbornAgeMonths);
             String infantAgeDays = firstpageStructureMap.get(Content.newbornAgeDays);
@@ -29,8 +29,8 @@ public class FIRP0201 extends QCCatalogue {
             }
 
              */
-            String newbornAdmisWeight = firstpageStructureMap.get(Content.newbornAdmisWeight);
-            if (CatalogueUtil.isEmpty(newbornAdmisWeight)){
+            Object newbornAdmisWeight = firstpageStructureMap.get(Content.newbornAdmisWeight);
+            if (newbornAdmisWeight != null && StringUtil.isBlank(newbornAdmisWeight.toString())) {
                 status.set("-1");
             }
         }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuConsultationDocTrans.java

@@ -110,7 +110,8 @@ public class YiWuConsultationDocTrans extends ModelDocTrans {
     private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
             "事件日期=记录时间",
             "医生=记录医师",
-            "会诊执行情况=会诊情况"
+            "会诊执行情况=会诊情况",
+            "记录医师签名=记录医生"
     );