合并：台州规则初步并入北仑-crf并入

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/BeHospitalizedAI.java

@@ -95,10 +95,10 @@ public class BeHospitalizedAI extends ModelAI {
                 putContent(crfContent, medicalTextType.get(2), maritalText, Content.marriage);
             }
             /* 月经史 */
-//            if (beHospitalizedDoc.getMenstrualLabel() != null && beHospitalizedDoc.getMenstrualLabel().isCrfLabel()) {
-//                String menstrualText = beHospitalizedDoc.getMenstrualLabel().getText();
-//                putContent(crfContent, medicalTextType.get(2), concatMenstrual, menstrualText, Content.menses);
-//            }
+            if (beHospitalizedDoc.getMenstrualLabel() != null && beHospitalizedDoc.getMenstrualLabel().isCrfLabel()) {
+                String menstrualText = beHospitalizedDoc.getMenstrualLabel().getText();
+                putContent(crfContent, medicalTextType.get(2), concatMenstrual, menstrualText, Content.menses);
+            }
             /* 家族史 */
             if (beHospitalizedDoc.getFamilyLabel() != null && beHospitalizedDoc.getFamilyLabel().isCrfLabel()) {
                 String familyText = beHospitalizedDoc.getFamilyLabel().getText();

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/FirstCourseRecordAI.java

@@ -87,7 +87,7 @@ public class FirstCourseRecordAI extends ModelAI {
                 putContent(crfContent, medicalTextType.get(2), treatPlanLabel.getAiText(), "诊疗计划");
             }
 
-            String drugContent = CatalogueUtil.structureMapJoin(structureMap, Lists.newArrayList("诊疗计划"));
+            String drugContent = CatalogueUtil.structureMapJoin(structureMap, Lists.newArrayList("诊疗计划", "治疗计划"));
             putContent(crfContent, medicalTextType.get(3), drugContent, "药品");
             /*
             if (StringUtils.isNotEmpty(structureMap.get("诊疗计划")) && StringUtils.isNotEmpty(structureMap.get("需求评估"))) {
@@ -105,9 +105,9 @@ public class FirstCourseRecordAI extends ModelAI {
              */
 
             //病历特点与现病史比较相似度
-            if (inputInfo.getBeHospitalizedDoc() != null) {
+            if (inputInfo.getBeHospitalizedDoc() != null && StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getPresentLabel().getText())) {
                 //先从结构化数据找病例特点
-                if (StringUtil.isNotBlank(structureMap.get("现病史")) && inputInfo.getBeHospitalizedDoc().getPresentLabel() != null) {
+                if (StringUtil.isNotBlank(structureMap.get("现病史"))) {
                     putContent(similarContent, structureMap.get("现病史"), inputInfo.getBeHospitalizedDoc().getPresentLabel().getText());
                 } else if (firstCourseRecordDoc.getCaseCharacteristicLabel() != null && StringUtil.isNotBlank(firstCourseRecordDoc.getCaseCharacteristicLabel().getText())
                         && inputInfo.getBeHospitalizedDoc().getPresentLabel() != null) {

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/OperationAI.java

@@ -36,8 +36,8 @@ public class OperationAI extends ModelAI {
     public static String entityRelationObject = "entity_relation_object";
     public static String outputs = "outputs";
     public static String content = "content";
-    public static List<String> discussionKey = Lists.newArrayList("术前诊断", "术中后诊断", "手术名称", "麻醉方式"
-            , "手术简要经过", "目前情况", "术后注意事项");
+    public static List<String> discussionKey = Lists.newArrayList("术前诊断", "术中诊断", "术中后诊断", "手术名称", "麻醉方式"
+            , "手术经过", "手术简要经过", "目前情况", "术后注意事项");
 
     public void medrec(InputInfo inputInfo, CRFServiceClient crfServiceClient) {
         JSONArray crfContent = new JSONArray();
@@ -47,7 +47,7 @@ public class OperationAI extends ModelAI {
                 OperationRecordDoc operationRecordDoc = operationDocs.get(i).getOperationRecordDoc();
                 Map<String, String> structureMap = operationRecordDoc.getStructureMap();
                 //存放抓取的药品
-                String content = CatalogueUtil.structureMapJoin(structureMap, Lists.newArrayList("手术经过及处理", "手术中用药（化疗等药物）"));
+                String content = CatalogueUtil.structureMapJoin(structureMap, Lists.newArrayList("手术经过", "手术经过及处理", "手术中用药（化疗等药物）"));
                 putContent(crfContent, medicalTextType.get(1), content, "手术记录" + i + "药物");
             }
             if (operationDocs.get(i).getOperationDiscussionDoc() != null) {

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouDifficultCaseDiscussDocTrans.java

@@ -5,6 +5,7 @@ import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
 import com.lantone.qc.pub.model.doc.DifficultCaseDiscussDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
+import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
@@ -41,6 +42,7 @@ public class TaiZhouDifficultCaseDiscussDocTrans extends ModelDocTrans {
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
         }
 
+        MapUtil.keyAssig(structureMap, "讨论日期", "讨论时间");
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = new DifficultCaseDiscussDoc();
         difficultCaseDiscussDoc.setStructureMap(structureMap);
         difficultCaseDiscussDoc.setPageData((Map) structureMap);