Merge remote-tracking branch 'origin/hb/beilun' into hb/beilun

trans/src/main/java/com/lantone/qc/trans/shengzhouyy/DeathCaseDiscussDocTrans.java

@@ -1,7 +1,7 @@
 package com.lantone.qc.trans.shengzhouyy;
 
 import com.google.common.collect.Lists;
-import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
+import com.lantone.qc.dbanaly.facade.shengzhouzz.ShengzhouyyXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
@@ -9,6 +9,7 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -27,10 +28,16 @@ public class DeathCaseDiscussDocTrans extends ModelDocTrans {
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
-            Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            Map<String, String> sourceMap = ShengzhouyyXmlUtil.xmlToMap(content);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+            String moderator_summary_opinions = sourceMap.get("主持人总结意见");
+            if (StringUtils.isNotBlank(moderator_summary_opinions)){
+                String[] split = moderator_summary_opinions.split("死亡原因：");
+                sourceMap.put("主持人小结",split[0]);
+                sourceMap.put("死亡诊断",split[1]);
+            }
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
         }
 
@@ -43,15 +50,10 @@ public class DeathCaseDiscussDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "主持人=讨论主持人",
-            "死亡日期=死亡时间",
-            "讨论意见=讨论内容",
-            "现病史- 发病情况=入院情况",
-            "医生=记录医师",
-            "本人姓名=姓名",
-            "事件日期=讨论时间",
-            "当前诊断=死亡诊断",
-            "病历日期=记录时间",
-            "讨论小结=结论"
+            "病程时间=讨论时间",
+            "主持人姓名=主持人",
+            "参加讨论人员名单=参加人员",
+            "讨论结论=讨论内容",
+            "记录人签名=记录医生"
     );
 }