Merge branch 'beilun/dev-fqw' into beilun/dev

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

@@ -18,6 +18,7 @@ import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import org.apache.commons.lang3.StringUtils;
 
@@ -46,6 +47,18 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            List<String> titles = Lists.newArrayList("姓　　名","性 　 别","出生日期","出 生 地",
+                    "民　　族","现 住 址","家长姓名","联系电话","产前检查","末次月经","体 格 检 查","一 般 情 况",
+                    "供 史 者","入院日期","病史可靠程度","记录日期","主  诉","现病史","既往史","月经史","婚育史"
+                    ,"胸闷心悸史","腹痛腹泻史","多饮多尿史","浮肿少尿史","尿频尿痛史","抽  搐  史","出　血　史","食物过敏史"
+                    , "药物过敏史","传染病 史","手术外伤史","输  血  史","重大疾病史和治疗史","其他","系统回顾"
+                    , "个 人 史","出  生  史","喂  养  史","输  血  史","生长发育史","预防接种史","家 族 史",
+                    "体格检查（一）", "一般状况","皮    肤","体格检查（二）","专科检查","营养风险筛查表","辅助检查","初步诊断",
+                    "医师签名", "日期","修正诊断","医师签名","日期","补充诊断","医师签名","日期","皮肤 、粘膜","产 科 检 查",
+                    "辅 助 检 查","营养风险筛查","个人史","婚　　姻","男友姓名","预 产 期","孕 产次");
+            String text = sourceMap.get("原始文本");
+            List<String> sortTitles= CommonAnalysisUtil.sortTitles(titles,text);
+            CommonAnalysisUtil.cutByTitles(text,sortTitles,0,sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
@@ -123,8 +136,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "病史提供者=病史陈述者",
             "家庭地址=户口地址",
             "患者手机号码=联系电话",
-            "入院诊断=初步诊断",
-            "病历内容=个人史"
+            "入院诊断=初步诊断"
 
     );
 

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

@@ -279,12 +279,12 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "注意事项=术前术后注意事项",
             "其他术前相关情况=术前术后注意事项",
             "辅助检查结果=辅助检查",
-            "术中、术后防范措施=可能意外和防范措施",
-            "术中注意点=可能意外和防范措施",
+            "术中、术后防范措施=主要术中、术后风险及防范措施",
+            "术中注意点=主要术中、术后风险及防范措施",
             "现病史- 发病情况=发病经过",
             "本人姓名=姓名",
-            "拟施手术名称和方式=拟行术式",
-            "拟施手术=拟行术式",
+            "拟施手术名称和方式=拟施手术方式名称及可能的变更与禁忌症",
+            "拟施手术=拟施手术方式名称及可能的变更与禁忌症",
             "拟实施麻醉方法代码=拟施麻醉方式",
             "拟施麻醉=拟施麻醉方式",
             "拟实施手术及操作名称=拟施手术方式、名称及可能的变更与禁忌症",
@@ -296,12 +296,12 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "讨论日期=讨论时间",
             "参加人员及技术职称=参加人员",
             "主持人姓名=讨论主持人",
-            "拟施手术名称和方式及可能的变更=拟施手术方式、名称及可能的变更与禁忌症",
             "术前准备内容=术前准备",
             "经治医师=手术者签名",
             "记录人签名=记录医生",
             "医生签名=记录医生",
-            "讨论记录=讨论意见"
+            "讨论记录=讨论意见",
+            "患者签名日期=讨论时间"
     );
 
     /**********************************************手术知情同意书****************************************************/