Merge remote-tracking branch 'origin/hb/beilun' into hb/beilun

kernel/src/main/resources/logback-spring.xml

@@ -9,7 +9,7 @@
 
     <contextName>logback</contextName>
     <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/opt/qc-beilun/logs" />
+    <property name="log.path" value="../qc/logs" />
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->

trans/src/main/java/com/lantone/qc/trans/shengzhouyy/DifficultCaseDiscussDocTrans.java

@@ -9,6 +9,7 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 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;
 
 import java.util.List;
 import java.util.Map;
@@ -36,14 +37,20 @@ public class DifficultCaseDiscussDocTrans 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("讨论日期", "讨论意见", "地点", "主持人", "参加人员的姓名及专业技术职务", "主持人小结",
+                    "记录医师", "记录医师签名", "主持人签名", "汇报病情", "讨论目的", "讨论时间","参加人员","入院诊断",
+                    "讨论摘要","讨论内容");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+            String talk_time = sourceMap.get("讨论时间");
+            if (StringUtils.isNotBlank(talk_time)) {
+                String[] split = talk_time.split(" ");
+                if (split.length > 0) sourceMap.put("讨论时间", split[0]);
+            }
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
         }
 
@@ -75,6 +82,11 @@ public class DifficultCaseDiscussDocTrans extends ModelDocTrans {
             "主持人小结=主持人总结",
             "汇报病情=汇报病史",
             "讨论意见=讨论发言",
-            "记录医师签名=记录医生"
+            "记录医师签名=记录医生",
+            "入院诊断=汇报病史",
+            "参加人员=参加人员的姓名及专业技术职务",
+            "讨论摘要=讨论发言",
+            "讨论内容=讨论发言",
+            "讨论时间=讨论日期"
     );
 }