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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/difficultcasediscuss/DIF0120.java

@@ -1,5 +1,6 @@
 package com.lantone.qc.kernel.catalogue.yiwu.difficultcasediscuss;
 
+import com.google.common.collect.Lists;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
@@ -28,8 +29,8 @@ public class DIF0120 extends QCCatalogue {
         if (difficultCaseDiscussDocs != null && difficultCaseDiscussDocs.size() > 0) {
             for (DifficultCaseDiscussDoc dcdd : difficultCaseDiscussDocs) {
                 Map<String, String> dcddStructureMap = dcdd.getStructureMap();
-                String diisDate = dcddStructureMap.get("具体讨论意见");
-                if (CatalogueUtil.isEmpty(diisDate)) {
+                String content = CatalogueUtil.structureMapJoin(dcddStructureMap, Lists.newArrayList("现病史", "既往史"));
+                if (CatalogueUtil.isEmpty(content)) {
                     status.set("-1");
                     break;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/difficultcasediscuss/DIF0553.java

@@ -28,7 +28,7 @@ public class DIF0553 extends QCCatalogue {
         if(difficultCaseDiscussDocs != null && difficultCaseDiscussDocs.size()>0){
             for (DifficultCaseDiscussDoc dcdd:difficultCaseDiscussDocs) {
                 Map<String, String> dcddStructureMap = dcdd.getStructureMap();
-                String diisDate = dcddStructureMap.get("记录医生签名");
+                String diisDate = dcddStructureMap.get("记录医师");
                 if(CatalogueUtil.isEmpty(diisDate)){
                     status.set("-1");
                     break;

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

@@ -107,7 +107,7 @@ public class FirstCourseRecordAI extends ModelAI {
             //病历特点与现病史比较相似度
             if (inputInfo.getBeHospitalizedDoc() != null && StringUtil.isNotBlank(inputInfo.getBeHospitalizedDoc().getPresentLabel().getText())) {
                 //先从结构化数据找病例特点
-                if (StringUtil.isNotBlank(structureMap.get("现病史"))) {
+                if (StringUtil.isNotBlank(structureMap.get("现病史")) && inputInfo.getBeHospitalizedDoc().getPresentLabel() != null) {
                     putContent(similarContent, structureMap.get("现病史"), inputInfo.getBeHospitalizedDoc().getPresentLabel().getText());
                 } else if (firstCourseRecordDoc.getCaseCharacteristicLabel() != null && StringUtil.isNotBlank(firstCourseRecordDoc.getCaseCharacteristicLabel().getText())) {
                     //再从doc找病例特点

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

@@ -102,7 +102,7 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
         // 诊疗计划
         FirstCourseRecordDoc firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
         firstCourseRecordDoc.setPageData((Map) structureMap);
-        List<String> keys = Lists.newArrayList("检查计划", "治疗计划");
+        List<String> keys = Lists.newArrayList("检查计划", "治疗计划", "诊疗计划");
         String treatPlanJoin = structureMapJoin(structureMap, keys);
         firstCourseRecordDoc.getTreatPlanLabel().setAiText(treatPlanJoin);
         return firstCourseRecordDoc;

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

@@ -317,7 +317,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "参加人员及技术职称=参加人员",
             "主持人姓名=讨论主持人",
             "术前准备内容=术前准备",
-            "经治医师=手术者签名",
+            "经治医师=经治医生",
             "记录人签名=记录医生",
             "医生签名=记录医生",
             "讨论记录=讨论意见",