辅检模型更换，化验、辅检标准词转换

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -72,8 +72,8 @@ public class CommonFacade {
         diagList.addAll(CoreUtil.getPropertyList(diagLabel.getDiags()));
         diagList.addAll(CoreUtil.getPropertyList(pastLabel.getDiags()));
         //下的诊断
-        diagList.addAll(CoreUtil.getPropertyList(wordCrfDTO.getDiagOrder().stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
-                .map(x -> x.getName()).collect(Collectors.toList())));
+        diagList.addAll(wordCrfDTO.getDiagOrder().stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
+                .map(x -> x.getName()).collect(Collectors.toList()));
 
         //所有化验(结构化数据)
         List<String> allLis = new ArrayList<>();

src/main/java/com/diagbot/facade/IndicationFacade.java

@@ -80,7 +80,7 @@ public class IndicationFacade {
         if (methodList.contains("crf")) {
             wordCrfDTO = commonFacade.crf_process(indicationPushVO);
         }
-        CoreUtil.getDebugStr(crfStart, "模型处理耗时", debug);
+            CoreUtil.getDebugStr(crfStart, "模型处理耗时", debug);
 
         // 标准词转换
         long standStart = System.currentTimeMillis();

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -321,6 +321,12 @@ public class NeoFacade {
                 similarMap.get(StandConvertEnum.operation.getName()), "operation");
         map.put(StandConvertEnum.operation.getName(), operationMap);
 
+        // 辅检数据
+        List<String> pacs_list = standConvert.getPacsList();
+        Map<String, String> pacsMap = getStandConvertTypeMap(modelAI, pacs_list,
+                similarMap.get(StandConvertEnum.pacs.getName()), "pacs");
+        map.put(StandConvertEnum.pacs.getName(), pacsMap);
+
         return map;
     }
 
@@ -394,6 +400,14 @@ public class NeoFacade {
         List<String> diseaseList = standConvert.getDiaglList();
         Map<String, String> diseaseMap = getStandConvertMapBatch(diseaseList, "disease");
         map.put(StandConvertEnum.disease.getName(), diseaseMap);
+
+        List<String> pacsList = standConvert.getPacsList();
+        Map<String, String> pacsMap = getStandConvertMapBatch(pacsList, "pacs");
+        map.put(StandConvertEnum.pacs.getName(), pacsMap);
+
+        List<String> lisList = standConvert.getLisList();
+        Map<String, String> lisMap = getStandConvertMapBatch(lisList, "lis");
+        map.put(StandConvertEnum.lis.getName(), lisMap);
         return map;
     }
 

src/main/java/com/diagbot/facade/PushFacade.java

@@ -41,7 +41,7 @@ public class PushFacade {
 
         // 标准词转换
         StandConvert standConvert = commonFacade.dataTypeGet(wordCrfDTO);
-        Map<String, Map<String, String>> standConvertMap = neoFacade.standConvert(standConvert);
+        Map<String, Map<String, String>> standConvertMap = neoFacade.standConvertCrf(standConvert);
         commonFacade.dataTypeSet(wordCrfDTO, standConvertMap);
         List<String> ruleTypeList = Arrays.asList(pushVo.getFeatureType().split(","));
         //生成push入参，供图谱调用

src/main/java/com/diagbot/model/ai/BeHospitalizedAI.java

@@ -144,7 +144,7 @@ public class BeHospitalizedAI extends ModelAI {
                     PacsNew pacsNew = new PacsNew();
                     pacsNew.setName(x.getName());
                     pacsNew.setUniqueName(x.getUniqueName());
-                    pacsNew.setDesc(x.getDesc());
+                    pacsNew.setResult(x.getResult());
                     return pacsNew;
                 }).collect(Collectors.toList());
                 wordCrfDTO.setPacsNews(collect);
@@ -263,7 +263,7 @@ public class BeHospitalizedAI extends ModelAI {
                 List<PacsNew> pacsNews = wordCrfDTO.getPacsNews();
                 for (PacsNew pacsnew:pacsNews) {
                     JSONArray crfPacsContent = new JSONArray();
-                    putContent(crfPacsContent, medicalTextType.get(3), pacsnew.getDesc(), Content.pacs);
+                    putContent(crfPacsContent, medicalTextType.get(5), pacsnew.getResult(), Content.pacs);
                     JSONObject midPacsData = loadAI(crfPacsContent, crfServiceClient);
                     JSONObject jsonObject = midPacsData.getJSONObject(Content.pacs);
                     if(jsonObject == null){

src/main/java/com/diagbot/model/entity/PacsNew.java

@@ -13,6 +13,6 @@ import java.util.List;
 public class PacsNew  {
     private String name;
     private String uniqueName;
-    private String desc;
+    private String result;
     private List<Pacs> pacsResults;
 }