台州质控术前小结structureMap修改映射

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0331.java

@@ -29,6 +29,7 @@ public class PRE0331 extends QCCatalogue {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
                     && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("麻醉方式"))) {
                 status.set("-1");
+                return;
             }
         }
     }

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

@@ -15,6 +15,7 @@ import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -186,7 +187,10 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
-
+        addKeyMapping(structureMap,"麻醉方式","拟施手术名称及麻醉方式");
+        addKeyMapping(structureMap,"主刀医师签名","主刀医生");
+        addKeyMapping(structureMap,"既往疾病史","其他");
+        addKeyMapping(structureMap,"诊疗计划","治疗计划和措施");
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = new PreoperativeDiscussionDoc();
         preoperativeDiscussionDoc.setStructureMap(structureMap);
         preoperativeDiscussionDoc.setPageData((Map) structureMap);
@@ -302,4 +306,16 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
             "签名++++=签名"
     );
 
+    /**
+     * 给structureMap添加一个key（映射）
+     * @param structureMap
+     * @param target    需要用到的key
+     * @param source    structureMap中含有的key
+     */
+    protected void addKeyMapping(Map<String, String> structureMap, String target, String source) {
+        if (StringUtils.isEmpty(structureMap.get(target)) && StringUtils.isNotEmpty(structureMap.get(source))) {
+            structureMap.put(target, structureMap.get(source));
+        }
+    }
+
 }