Merge remote-tracking branch 'origin/dev-1.2' into dev

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

@@ -125,23 +125,23 @@ public class BeHospitalizedAI extends ModelAI {
                 putContent(crfContent, medicalTextType.get(3), pacs_text, Content.pacs);//辅助检查(暂用主诉现病史模型,之后会新训练单独模型再做修改)
             }
             if (beHospitalizedDoc.getInitialDiagLabel().isCrfLabel()) {
-                if (StringUtil.isNotBlank(initial_diag_text) && CatalogueUtil.numberExist(initial_diag_text)) {
-                    initial_diag_text = CatalogueUtil.removeBetweenWordSpace(initial_diag_text);
+                if (StringUtil.isNotBlank(initial_diag_text)) {
+                    /*initial_diag_text = CatalogueUtil.removeBetweenWordSpace(initial_diag_text);*/
+                    putContent(crfContent, medicalTextType.get(6), initial_diag_text, Content.initial_diag);//初步诊断
                 }
-                putContent(crfContent, medicalTextType.get(6), initial_diag_text, Content.initial_diag);//初步诊断
             }
             if (StringUtils.isNotEmpty(revised_diag_text) && beHospitalizedDoc.getRevisedDiagLabel().isCrfLabel()) {
                 //修正诊断
-                if (CatalogueUtil.numberExist(initial_diag_text)) {
+                /*if (CatalogueUtil.numberExist(initial_diag_text)) {
                     revised_diag_text = CatalogueUtil.removeBetweenWordSpace(revised_diag_text);
-                }
+                }*/
                 putContent(crfContent, medicalTextType.get(6), revised_diag_text, Content.revised_diag);
             }
             if (StringUtils.isNotEmpty(supple_diag_text) && beHospitalizedDoc.getSuppleDiagLabel().isCrfLabel()) {
                 //补充诊断
-                if (CatalogueUtil.numberExist(initial_diag_text)) {
+                /*if (CatalogueUtil.numberExist(initial_diag_text)) {
                     supple_diag_text = CatalogueUtil.removeBetweenWordSpace(supple_diag_text);
-                }
+                }*/
                 putContent(crfContent, medicalTextType.get(6), supple_diag_text, Content.supple_diag);
             }
             JSONObject midData = loadAI(inputInfo.isUseCrfCache(), inputInfo.getMedicalRecordInfoDoc().getStructureMap().get("behospitalCode"), crfContent, crfServiceClient);

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

@@ -49,15 +49,15 @@ public class FirstCourseRecordAI extends ModelAI {
             //初步诊断
             if (StringUtils.isNotEmpty(structureMap.get(Content.initial_diag))) {
                 String initial_diag = structureMap.get(Content.initial_diag);
-                if (CatalogueUtil.numberExist(initial_diag)) {
+                /*if (CatalogueUtil.numberExist(initial_diag)) {
                     initial_diag = CatalogueUtil.removeBetweenWordSpace(structureMap.get(Content.initial_diag));
-                }
+                }*/
                 putContent(crfContent, medicalTextType.get(1), initial_diag, Content.initial_diag);
             } else if (firstCourseRecordDoc.getInitialDiagLabel() != null && StringUtil.isNotBlank(firstCourseRecordDoc.getInitialDiagLabel().getText())) {
                 String initial_diag = firstCourseRecordDoc.getInitialDiagLabel().getText();
-                if (CatalogueUtil.numberExist(initial_diag)) {
+                /*if (CatalogueUtil.numberExist(initial_diag)) {
                     initial_diag = CatalogueUtil.removeBetweenWordSpace(firstCourseRecordDoc.getInitialDiagLabel().getText());
-                }
+                }*/
                 putContent(crfContent, medicalTextType.get(1), initial_diag, Content.initial_diag);
             }
 
@@ -66,15 +66,15 @@ public class FirstCourseRecordAI extends ModelAI {
             //鉴别诊断
             if (StringUtils.isNotEmpty(structureMap.get("鉴别诊断"))) {
                 String diffDiag = structureMap.get("鉴别诊断");
-                if (CatalogueUtil.numberExist(diffDiag)) {
+                /*if (CatalogueUtil.numberExist(diffDiag)) {
                     diffDiag = CatalogueUtil.removeBetweenWordSpace(diffDiag);
-                }
+                }*/
                 putContent(crfContent, medicalTextType.get(1), diffDiag, "鉴别诊断");
             } else if (firstCourseRecordDoc.getDifferentialDiagLabel() != null && StringUtil.isNotBlank(firstCourseRecordDoc.getDifferentialDiagLabel().getText())) {
                 String diffDiag = firstCourseRecordDoc.getDifferentialDiagLabel().getText();
-                if (CatalogueUtil.numberExist(diffDiag)) {
+                /*if (CatalogueUtil.numberExist(diffDiag)) {
                     diffDiag = CatalogueUtil.removeBetweenWordSpace(diffDiag);
-                }
+                }*/
                 putContent(crfContent, medicalTextType.get(1), diffDiag, "鉴别诊断");
             }
             //诊疗计划

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

@@ -50,9 +50,9 @@ public class LeaveHospitalAI extends ModelAI {
                 //出院诊断
                 if (StringUtil.isNotBlank(leaveHospitalStructureMap.get(Content.dischargeDiag))) {
                     String dischargeDiag = leaveHospitalStructureMap.get(Content.dischargeDiag);
-                    if (CatalogueUtil.numberExist(dischargeDiag)) {
+                    /*if (CatalogueUtil.numberExist(dischargeDiag)) {
                         dischargeDiag = CatalogueUtil.removeBetweenWordSpace(dischargeDiag);
-                    }
+                    }*/
                     putContent(crfContent, medicalTextType.get(1), dischargeDiag, Content.dischargeDiag);
                 }
             }