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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0131.java

@@ -57,9 +57,7 @@ public class THR0131 extends QCCatalogue {
         String conditionRecord = firstAttendStructureMap.get("病情记录");
         if (StringUtil.isNotBlank(conditionRecord)) {
             if (conditionRecord.contains("鉴别")
-                    || conditionRecord.contains("明确")
-                    || conditionRecord.contains("修正")
-                    || conditionRecord.contains("诊断")) {
+                    || conditionRecord.contains("诊断明确")) {
                 status.set("0");
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0134.java

@@ -36,7 +36,7 @@ public class THR0134 extends QCCatalogue {
         String admisDateStr = inputInfo.getBeHospitalizedDoc().getStructureMap().get("入院日期");
         String recordDateStr = firstAttendStructureMap.get("查房日期");
         String content = firstAttendStructureMap.get("病情记录");
-        if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑")) {
+        if (content.contains("初步诊断")) {
             status.set("0");
             return;
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0136.java

@@ -30,8 +30,8 @@ public class THR0136 extends QCCatalogue {
         if (firstCourseRecordDoc != null) {
             Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
             String diffDiag = structureMap.get("鉴别诊断");
-            if (StringUtil.isNotBlank(diffDiag) && (diffDiag.contains("诊断") || diffDiag.contains("鉴别")
-                    || diffDiag.contains("不能排除"))) {
+            if (StringUtil.isNotBlank(diffDiag) && (diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别")
+                   )) {
                 status.set("0");
                 return;
             }
@@ -58,8 +58,7 @@ public class THR0136 extends QCCatalogue {
         String conditionRecord = firstDirectStructureMap.get("病情记录");
         if (StringUtil.isNotBlank(conditionRecord)) {
             if (conditionRecord.contains("鉴别")
-                    || conditionRecord.contains("不能排除")
-                    || conditionRecord.contains("诊断")) {
+                    || conditionRecord.contains("诊断明确")) {
                 status.set("0");
                 return;
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0139.java

@@ -36,7 +36,7 @@ public class THR0139 extends QCCatalogue {
         String admisDateStr = inputInfo.getBeHospitalizedDoc().getStructureMap().get("入院日期");
         String recordDateStr = firstDirectStructureMap.get("查房日期");
         String content = firstDirectStructureMap.get("病情记录");
-        if (content.contains("诊断明确") || content.contains("同意目前诊断") || content.contains("目前考虑")) {
+        if (content.contains("初步诊断")) {
             status.set("0");
             return;
         }

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

@@ -39,7 +39,7 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             List<String> titles = Lists.newArrayList("病历记录时间", "一、病例特点", "二、初步诊断", "三、诊断依据"
-                    , "四、鉴别诊断", "五、诊疗计划", "记录医师");
+                    , "四、鉴别诊断", "五、诊疗计划", "记录医师","主诊医师");
             String text = sourceMap.get("原始文本");
             CommonAnalysisUtil.cutByTitles(text, titles, 0, sourceMap);
             //新生儿科特殊处理

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

@@ -193,9 +193,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     "麻醉医师", "手术护士", "巡回护士", "手术中用药（化疗等药物）", "手术切口类别（可选）", "术中出血量", "输血量", "术中输血量"
                     , "围术期并发症", "手术切除标本", "冰冻切片结果", "标本件数", "是否有植入物", "手术步骤", "记录者签名", "记录日期", "术中失血量",
                     "手术简要经过（包括“术中所见”）", "医师签名", "签名时间", "患者或代理人签名", "术中并发症", "日    期", "术前诊断", "术后诊断","手术经过",
-                    "手术适应症","手术记录人员");
+                    "手术适应症","手术记录人员","ml");
 
-            String text = sourceMap.get("原始文本").replace(" ", "");
+            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(), "");
@@ -251,7 +251,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "助手=一助",
             "手术前诊断=术前诊断",
             "手术记录人员=记录医生",
-            "签名时间=记录时间 "
+            "签名时间=记录时间"
+
     );