1、修复初步诊断BUG

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

@@ -4,13 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.lantone.qc.kernel.client.CRFServiceClient;
-import com.lantone.qc.kernel.structure.ai.model.CrfOut;
 import com.lantone.qc.kernel.structure.ai.model.EntityEnum;
 import com.lantone.qc.kernel.structure.ai.model.Lemma;
 import com.lantone.qc.kernel.structure.ai.process.*;
 import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.kernel.util.KernelConstants;
-import com.lantone.qc.kernel.util.RedisUtil;
+import com.lantone.qc.kernel.util.DiagEnhancer;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -19,10 +17,11 @@ import com.lantone.qc.pub.model.label.*;
 import com.lantone.qc.pub.model.vo.CRFVo;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @ClassName : InHospitalDoc
@@ -45,9 +44,6 @@ public class BeHospitalizedAI {
     public static String entityRelationObject = "entity_relation_object";
     public static String outputs = "outputs";
 
-    @Autowired
-    RedisUtil redisUtil;
-
     public void medrec(InputInfo inputInfo, CRFServiceClient crfServiceClient) {
         JSONArray crfContent = new JSONArray();
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
@@ -244,10 +240,10 @@ public class BeHospitalizedAI {
      * @param inputInfo
      */
     public void putInitialDiagCrfData(JSONObject jsonObject, InputInfo inputInfo) {
-        if (jsonObject == null) {
-            return;
-        }
-        JSONObject aiOut = jsonObject.getJSONObject(entityRelationObject).getJSONObject(BeHospitalizedAI.outputs);
+//        if (jsonObject == null) {
+//            return;
+//        }
+//        JSONObject aiOut = jsonObject.getJSONObject(entityRelationObject).getJSONObject(BeHospitalizedAI.outputs);
         //诊断信息
         EntityProcessDiag entityProcessDiag = new EntityProcessDiag();
 //        List<Diag> diags = entityProcessDiag.extractEntity(aiOut);
@@ -261,12 +257,9 @@ public class BeHospitalizedAI {
         String diagString = inputInfo.getBeHospitalizedDoc().getInitialDiagLabel().getText();
         if (StringUtils.isNotEmpty(diagString)) {
             String[] diagArray = diagString.split(",");
-            Map<String, String> diagRedisMap = (Map<String, String>)redisUtil.get(KernelConstants.CONCEPT_DIAG_HOSPITAL_REFLECT);
             List<Diag> diags = new ArrayList<>();
             for (String d : diagArray) {
-                Diag diag = new Diag();
-                diag.setHospitalDiagName(d);  //存放医院原始疾病名称
-                diag.setName(diagRedisMap.get(d) == null ? "" : diagRedisMap.get(d));//映射到我们的标准疾病名称
+                Diag diag = DiagEnhancer.create(d);
                 diags.add(diag);
             }
             InitialDiagLabel initialDiagLabel = new InitialDiagLabel();