Merge branch 'dev-taizhou-running' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0508.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.util.SpringContextUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -43,6 +44,9 @@ public class LEA0508 extends QCCatalogue {
         }
         for (String doctorNameSplit : doctorName.split("\\s+")) {
             Map<String, String> doctor = (Map) surgeon.get(doctorNameSplit);
+            if (doctor == null || doctor.size() == 0) {
+                continue;
+            }
             String occup = doctor.get("occup");
             if (StringUtils.isNotEmpty(occup) && "1".equals(occup)) {
                 status.set("0");

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstPageRecordDocTrans.java

@@ -43,11 +43,13 @@ public class TaiZhouFirstPageRecordDocTrans extends ModelDocTrans {
         structureExtMap.put(Content.dischargeDiag, FastJsonUtils.getJsonToBean(content.get(Content.dischargeDiag), Object.class));
 
         List<Map<String, String>> dischargeDiag = (List) structureExtMap.get(Content.dischargeDiag);
-        for (Map<String, String> diag : dischargeDiag) {
-            String diagCategory = diag.get("诊断类别");
-            if (StringUtil.isNotBlank(diagCategory) && "1".equals(diagCategory)) {
-                diag.put("诊断类别", "主要诊断");
-                break;
+        if (dischargeDiag != null && dischargeDiag.size() > 0) {
+            for (Map<String, String> diag : dischargeDiag) {
+                String diagCategory = diag.get("诊断类别");
+                if (StringUtil.isNotBlank(diagCategory) && "1".equals(diagCategory)) {
+                    diag.put("诊断类别", "主要诊断");
+                    break;
+                }
             }
         }
         //        structureExtMap.put(Content.pathologyDiagnose, FastJsonUtils.getJsonToBean(content.get(Content.pathologyDiagnose), Object.class));

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouOperationDocTrans.java

@@ -198,6 +198,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
             "主刀医师=主刀医师签名",
             "术前准备=术前准备内容",
             "注意事项=术前术后注意事项",
+            "其他术前相关情况=术前术后注意事项",
             "辅助检查结果=辅助检查",
             "术中、术后防范措施=可能意外和防范措施",
             "现病史- 发病情况=发病经过",