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

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

@@ -24,9 +24,9 @@ public class BEH0424 extends QCCatalogue {
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(structureMap != null){
-            String phone = structureMap.get("电话");
-            String contactNumber = structureMap.get("联系人电话");
-            if(CatalogueUtil.isEmpty(phone) && CatalogueUtil.isEmpty(contactNumber)){
+            //String phone = structureMap.get("电话");
+            String contactNumber = structureMap.get("联系电话");
+            if(/*CatalogueUtil.isEmpty(phone) && */CatalogueUtil.isEmpty(contactNumber)){
                 status.set("-1");
             }
         }

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

@@ -38,7 +38,8 @@ public class BEH0454 extends QCCatalogue {
             return;
         }
         if (StringUtils.isNotEmpty(pastLabel.getHeathCondition()) || pastLabel.getText().contains("既往")
-                || pastLabel.getText().contains("详见原病历")) {
+                || pastLabel.getText().contains("详见原病历") || pastLabel.getText().contains("健康")
+                || pastLabel.getText().contains("否认")) {
             status.set("0");
         }
         //既往有任一阳性疾病名称，则认为有健康状况

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

@@ -111,7 +111,7 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "病人出生日期=出生日期",
             "新生儿出生日期=出生日期",
             //            "出生地址=户口地址",
-            "本人电话=电话",
+            "本人电话=联系电话电话",
             "入病房时间=入院日期",
             "病历日期=记录日期",
             "主诉=主诉",

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

@@ -270,8 +270,11 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             List<String> titles = Lists.newArrayList("讨论时间", "讨论地点", "主持人", "经治医师", "讨论意见",
                     "参加人员及技术职称", "讨论方式", "讨论记录", "主持人签名", "记录人签名", "病史摘要", "术前诊断", "术前准备"
                     , "拟施手术", "拟施麻醉", "术中注意点", "家属谈话内容", "医生签名", "日  期", "术前准备情况", "手术指征", "手术方案",
-                    "可能出现的意外及防范措施", "讨论日期时间", "参加人员", "讨论主持人", "小结", "记录医师");
-            String text = sourceMap.get("原始文本");
+                    "可能出现的意外及防范措施", "讨论日期时间", "参加人员", "讨论主持人", "小结", "记录医师","手术指征与禁忌症"
+                    ,"拟施手术名称和方式及可能的变更","可替代方案","计划性多次手术","方式",
+                    "术前特殊准备",
+                    "心理状态","经济评估","主要术中、术后风险及防范措施","术中、术后注意事项（含护理事项）");
+            String text = sourceMap.get("原始文本").replaceAll("[0-9:.]","");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
@@ -323,7 +326,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术指征=手术指征与禁忌",
             "手术方案=拟施手术方式名称及可能的变更与禁忌症",
             "主持人=讨论主持人",
-            "小结=主持人小结"
+            "小结=主持人小结",
+            "术前特殊准备=术前准备"
     );
 
     /**********************************************手术知情同意书****************************************************/