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

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

@@ -47,7 +47,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            List<String> titles = Lists.newArrayList("姓　　名","性 　 别","出生日期","出 生 地",
+            List<String> titles = Lists.newArrayList("入院记录","姓　　名","性 　 别","出生日期","出 生 地",
                     "民　　族","现 住 址","家长姓名","联系电话","产前检查","孕 产次","孕产次","末次月经","体 格 检 查","一 般 情 况",
                     "供 史 者","入院日期","病史可靠程度","记录日期","主  诉","现病史","既往史","月经史","婚育史","月 经 史","婚 育 史","既 往 史"
                     ,"胸闷心悸史","腹痛腹泻史","多饮多尿史","浮肿少尿史","尿频尿痛史","抽  搐  史","出　血　史","食物过敏史"
@@ -55,10 +55,14 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                     , "个 人 史","出  生  史","喂  养  史","输  血  史","生长发育史","预防接种史","家 族 史",
                     "体格检查（一）", "一般状况","皮    肤","体格检查（二）","专科检查","营养风险筛查表","辅助检查","初步诊断",
                     "医师签名", "日    期","修正诊断","医师签名","日   期","补充诊断","医师签名","日期","皮肤 、粘膜","产 科 检 查",
-                    "辅 助 检 查","营养风险筛查","个人史","婚　　姻","男友姓名","预 产 期","丈夫姓名","妇科检查");
+                    "辅 助 检 查","营养风险筛查","个人史","婚　　姻","男友姓名","预 产 期","丈夫姓名","妇科检查","记录医师","记录时间");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles= CommonAnalysisUtil.sortTitles(titles,text);
             CommonAnalysisUtil.cutByTitles(text,sortTitles,0,sourceMap);
+            if(sourceMap.containsKey("入院记录")){
+                String str=sourceMap.get("入院记录").substring(0,3);
+                sourceMap.put("孕产次",str);
+            }
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
@@ -140,7 +144,10 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "孕 产次=孕产次",
             "有/无=产前检查",
             "产科检查=专科检查",
-            "末次月经日期=末次月经"
+            "末次月经日期=末次月经",
+            "入院诊断1=初步诊断",
+            "记录医师=初步诊断医师签名",
+            "记录时间=初步诊断日期"
 
     );
 

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

@@ -144,7 +144,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术简要经过（包括术中所见）=手术简要经过",
             "术中诊断=术中后诊断",
             "术后诊疗计划（处理措施）=术后诊疗计划处理措施",
-            "手术开始时间=开始时间"
+            "手术开始时间=开始时间",
+            "记录医师=医师签名",
+            "病程内容=手术简要经过"
 
 
     );
@@ -180,9 +182,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
         } 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);
@@ -220,7 +223,13 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术切口类别（可选）=切口类别",
             "手术步骤=手术经过及处理",
             "记录者签名=记录医生",
-            "记录日期=记录时间"
+            "记录日期=记录时间",
+            "手术人员=手术医师",
+            "术中失血量=术中出血量",
+            "医师签名时间=记录时间",
+            "医师签名=记录医生",
+            "手术过程=手术经过及处理",
+            "手术简要经过（包括“术中所见”）=手术经过及处理"
     );