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

# Conflicts:
#	trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0026.java

@@ -39,7 +39,7 @@ public class BEH0026 extends QCCatalogue {
             return;
         }
         String pastText = pastLabel.getText();
-        if (pastText.contains("食物过敏史") || pastText.contains("详见原病历")) {
+        if (pastText.contains("过敏史") || pastText.contains("详见原病历")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0030.java

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.label.FamilyLabel;
 import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
@@ -32,8 +33,9 @@ public class BEH0030 extends QCCatalogue {
             return;
         }
         PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
+        FamilyLabel familyLabel=inputInfo.getBeHospitalizedDoc().getFamilyLabel();
         /* 如果既往史为空或者既往史文本为空，则不报错 */
-        if (pastLabel == null || StringUtil.isBlank(pastLabel.getText())) {
+        if ((pastLabel == null || StringUtil.isBlank(pastLabel.getText()))&&(familyLabel == null || StringUtil.isBlank(familyLabel.getText()))) {
             status.set("0");
             return;
         }
@@ -47,10 +49,15 @@ public class BEH0030 extends QCCatalogue {
             status.set("0");
         }
         String pastText = pastLabel.getText();
+        String familyText=familyLabel.getText();
         if (pastText.contains("肝炎") || pastText.contains("结核") || pastText.contains("详见原病历")
                 || pastText.contains("乙肝")) {
             status.set("0");
         }
+        if (familyText.contains("肝炎") || familyText.contains("结核") || familyText.contains("详见原病历")
+                || familyText.contains("乙肝")) {
+            status.set("0");
+        }
     }
 
 }

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

@@ -50,7 +50,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
-            List<String> titles = Lists.newArrayList("婚    姻","婚姻状况","住      址","供 史 者","性      别","婚　　姻","民　　族","民    族","个人史","妇科检查","产科检查","实验室","初步诊断","修正诊断","补充诊断","医师签名","日    期");
+            List<String> titles = Lists.newArrayList("婚    姻","婚姻状况","住      址","供 史 者","性      别","婚　　姻","民　　族","民    族","个人史","妇科检查","产科检查","实验室","初步诊断","修正诊断","补充诊断","医师签名","日    期","诊断和诊断修正");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
             CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
@@ -98,8 +98,22 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
                         replaceAll("签名时间","");
                 sourceMap.put("修正诊断",value);
             }
+            if(sourceMap.containsKey("诊断和诊断修正")){
+                String value=sourceMap.get("诊断和诊断修正").replaceAll("医师签名","").
+                        replaceAll(":","").
+                        replaceAll("日    期","").
+                        replaceAll("■","").
+                        replaceAll("补充诊断","").
+                        replaceAll("修正诊断","").
+                        replaceAll("\"","").
+                        replaceAll("：","").
+                        replaceAll("日期","").
+                        replaceAll("医生签名","").
+                        replaceAll("签名时间","");
+                sourceMap.put("修正诊断",value);
+            }
             if(sourceMap.containsKey("补充诊断")){
-                String value=sourceMap.get("修正诊断").replaceAll("医师签名","").
+                String value=sourceMap.get("补充诊断").replaceAll("医师签名","").
                         replaceAll(":","").
                         replaceAll("日    期","").
                         replaceAll("■","").
@@ -236,7 +250,8 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "骨盆外测量=专科检查",
             "婚姻=婚姻状况",
             "住址=户口地址",
-            "患者籍贯=出生地"
+            "患者籍贯=出生地",
+            "诊断和诊断修正=修正诊断"
 
 
     );

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

@@ -190,9 +190,11 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             List<String> titles = Lists.newArrayList("手术开始时间", "手术结束时间", "手术时间", "手术前诊断", "术（中）后诊断",
                     "手术名称", "手术医师", "助手医师", "第一助手", "第二助手","第三助手","洗手护士", "麻醉方式", "手术人员",
+                    "手术名称", "手术医师", "助手医师", "第一助手", "第二助手","第三助手","洗手护士", "麻醉方式", "手术人员","麻醉人员",
                     "麻醉医师", "手术护士", "巡回护士", "手术中用药（化疗等药物）", "手术切口类别（可选）", "术中出血量", "输血量", "术中输血量"
                     , "围术期并发症", "手术切除标本", "冰冻切片结果", "标本件数", "是否有植入物", "手术步骤", "记录者签名", "记录日期", "术中失血量",
                     "手术简要经过（包括“术中所见”）", "医师签名", "签名时间", "患者或代理人签名", "术中并发症", "日    期", "术前诊断", "术后诊断","手术经过");
+                    "手术简要经过（包括“术中所见”）", "医师签名", "签名时间", "患者或代理人签名", "术中并发症", "日    期", "术前诊断", "术后诊断","手术经过","手术适应症");
             String text = sourceMap.get("原始文本").replace(" ", "");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
@@ -247,6 +249,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "助手=一助",
             "初步诊断=术前诊断",
             "手术经过=手术经过及处理"
+            "助手=一助",
+            "手术前诊断=术前诊断"
     );
 
 
@@ -287,11 +291,18 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     , "拟施手术名称和方式及可能的变更", "可替代方案", "计划性多次手术",
                     "术前特殊准备", "心理状态", "经济评估", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）",
                     "一：经治医师汇报病史", "二：讨论目的", "三：讨论");
-            String text = sourceMap.get("原始文本").replaceAll("[0-9:.]", "");
+            String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
             CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+            if(sourceMap.containsKey("术前诊断")){
+                String[] str=sourceMap.get("术前诊断").split("术前准备");
+                if(str.length>1){
+                    sourceMap.put("术前准备",str[1]);
+                    sourceMap.put("术前诊断",str[0]);
+                }
+            }
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts, modeId);
             addKeyMapping(structureMap, "麻醉方式", "拟施手术名称及麻醉方式");
             addKeyMapping(structureMap, "主刀医师签名", "主刀医生");
@@ -322,7 +333,6 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "术前术后注意事项=主要术中、术后风险及防范措施",
             "时间=讨论时间",
             "手术指征与禁忌症=手术指征与禁忌",
-            "病史摘要=手术指征与禁忌",
             "讨论日期时间=讨论时间",
             "讨论日期=讨论时间",
             "参加人员及技术职称=参加人员",
@@ -353,6 +363,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "麻醉方式=拟施麻醉方式",
             "拟施手术名称和方式及可能的变更=拟施手术方式名称及可能的变更与禁忌症",
             "手术要点=主要术中、术后风险及防范措施"
+            "手术要点=主要术中、术后风险及防范措施",
+            "病历内容=简要病情"
     );
 
     /**********************************************手术知情同意书****************************************************/