辅检结构调整

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

@@ -6,15 +6,24 @@ import com.diagbot.client.CRFServiceClient;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.StandConvertEnum;
 import com.diagbot.model.ai.AIAnalyze;
-import com.diagbot.model.entity.Pacs;
-import com.diagbot.model.entity.PacsNew;
-import com.diagbot.model.label.*;
+import com.diagbot.model.label.ChiefLabel;
+import com.diagbot.model.label.DiagLabel;
+import com.diagbot.model.label.PacsLabel;
+import com.diagbot.model.label.PastLabel;
+import com.diagbot.model.label.PresentLabel;
+import com.diagbot.model.label.VitalLabel;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.NeoPushVO;
 import com.diagbot.vo.SearchData;
 import com.diagbot.vo.StandConvert;
-import com.diagbot.vo.neoPushEntity.*;
+import com.diagbot.vo.neoPushEntity.ChiefPushVo;
+import com.diagbot.vo.neoPushEntity.Diag;
+import com.diagbot.vo.neoPushEntity.DiagVo;
+import com.diagbot.vo.neoPushEntity.Drug;
+import com.diagbot.vo.neoPushEntity.LisPushVo;
+import com.diagbot.vo.neoPushEntity.PresentPushVo;
+import com.diagbot.vo.neoPushEntity.Symptom;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -140,14 +149,20 @@ public class CommonFacade {
         }
         standConvert.setLisList(allLis);
 
-        //所有辅助检查(结构化数据)
+        //所有辅助项目(结构化数据)
         List<String> allPacs = new ArrayList<>();
-        List<PacsNew> pacsNews = wordCrfDTO.getPacsLabel().getPacsNewList();
-        if (ListUtil.isNotEmpty(pacsNews)) {
-            List<String> pacss_unique = pacsNews.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
+        List<Item> pacsList = wordCrfDTO.getPacsLabel().getItem();
+        if (ListUtil.isNotEmpty(pacsList)) {
+            List<String> pacss_unique = pacsList.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
                     .map(x -> x.getName()).collect(Collectors.toList());
             allPacs.addAll(pacss_unique);
         }
+        // List<PacsNew> pacsNews = wordCrfDTO.getPacsLabel().getPacsNewList();
+        // if (ListUtil.isNotEmpty(pacsNews)) {
+        //     List<String> pacss_unique = pacsNews.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
+        //             .map(x -> x.getName()).collect(Collectors.toList());
+        //     allPacs.addAll(pacss_unique);
+        // }
         allPacs.addAll(wordCrfDTO.getPacs().stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
                 .map(x -> x.getName()).collect(Collectors.toList()));
         //开单检查
@@ -202,7 +217,7 @@ public class CommonFacade {
         PastLabel pastLabel = wordCrfDTO.getPastLabel();
         DiagLabel diagLabel = wordCrfDTO.getDiagLabel();
         List<Lis> lis = wordCrfDTO.getLis();
-        List<PacsNew> pacsNews = wordCrfDTO.getPacsLabel().getPacsNewList();
+        List<Item> pacsList = wordCrfDTO.getPacsLabel().getItem();
         VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
 
         //症状回填
@@ -223,7 +238,7 @@ public class CommonFacade {
         CoreUtil.setPropertyList(lis, "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.getName()));
         CoreUtil.setPropertyList(wordCrfDTO.getLisOrder(), "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.getName()));
         //辅助检查回填
-        CoreUtil.setPropertyList(pacsNews, "name", "uniqueName", map.get(StandConvertEnum.pacs.getName()));
+        CoreUtil.setPropertyList(pacsList, "name", "uniqueName", map.get(StandConvertEnum.pacs.getName()));
         CoreUtil.setPropertyList(wordCrfDTO.getPacs(), "name", "uniqueName", map.get(StandConvertEnum.pacs.getName()));
         CoreUtil.setPropertyList(wordCrfDTO.getPacsOrder(), "name", "uniqueName", map.get(StandConvertEnum.pacs.getName()));
         //体征回填
@@ -249,7 +264,8 @@ public class CommonFacade {
         PastLabel pastLabel = wordCrfDTO.getPastLabel();
         List<Lis> lis = wordCrfDTO.getLis();
 //        List<Pacs> pacs = wordCrfDTO.getPacs();
-        List<PacsNew> pacsNewList = wordCrfDTO.getPacsLabel().getPacsNewList();
+        // TODO 辅检
+        // List<PacsNew> pacsNewList = wordCrfDTO.getPacsLabel().getPacsNewList();
         pushVO.setAge(wordCrfDTO.getAge());
         pushVO.setSex(wordCrfDTO.getSex());
         pushVO.setDiaeaseName(diseaseName);
@@ -304,11 +320,12 @@ public class CommonFacade {
             lisPushVo.setLises(lis);
             pushVO.setLisPushVo(lisPushVo);
         }
-        if(ListUtil.isNotEmpty(pacsNewList)){
-            PacsPushVo pacsPushVo = new PacsPushVo();
-            pacsPushVo.setPacs(pacsNewList);
-            pushVO.setPacsPushVo(pacsPushVo);
-        }
+        // TODO
+        // if(ListUtil.isNotEmpty(pacsNewList)){
+        //     PacsPushVo pacsPushVo = new PacsPushVo();
+        //     pacsPushVo.setPacs(pacsNewList);
+        //     pushVO.setPacsPushVo(pacsPushVo);
+        // }
         if(ListUtil.isNotEmpty(diags)){
             DiagVo diagVo = new DiagVo();
             List<Diag> diseases = diags.stream().map(x -> {
@@ -362,63 +379,65 @@ public class CommonFacade {
                 });
             }
         }
-        //处理辅检
-        List<com.diagbot.biz.push.entity.Pacs> pacs = new ArrayList<>();
-        List<PacsNew> packagePacs = new ArrayList<>();
-        List<PacsNew> pacsNewList = wordCrfDTO.getPresentLabel().getPacsNewList();
-        if(ListUtil.isNotEmpty(pacsNewList)){
-            List<String> pacsNames = pacsNewList.stream().map(x -> x.getName()).collect(Collectors.toList());
-            Map<String, Map<String, Long>> configMap = pacsConfigFacade.getConfigMap(wordCrfDTO.getHospitalId(), pacsNames, null);
-            if(configMap.size() > 0){
-                pacsNewList.stream().forEach(pacsNew ->{
-                    String name = pacsNew.getName();
-                    List<Pacs> disease = pacsNew.getDisease();
-                    List<Pacs> pacsResults = pacsNew.getPacsResults();
-                    if(configMap.containsKey(name)){
-                        Map<String, Long> uinqueNameMap = configMap.get(name);
-                        List<PacsNew> collect = uinqueNameMap.keySet().stream().map(x -> {
-                            PacsNew pan = new PacsNew();
-                            pan.setName(name);
-                            pan.setUniqueName(x);
-                            pan.setPacsResults(pacsResults);
-                            pan.setDisease(disease);
-                            return pan;
-                        }).collect(Collectors.toList());
-                        packagePacs.addAll(collect);
-                        collect.forEach(x ->{
-                            com.diagbot.biz.push.entity.Pacs p = new com.diagbot.biz.push.entity.Pacs();
-                            p.setName(x.getName());
-                            p.setUniqueName(x.getUniqueName());
-                            pacs.add(p);
-                        });
-                    }else {
-                        PacsNew pan = new PacsNew();
-                        pan.setName(name);
-                        pan.setPacsResults(pacsResults);
-                        pan.setDisease(disease);
-                        packagePacs.add(pan);
-                        com.diagbot.biz.push.entity.Pacs p = new com.diagbot.biz.push.entity.Pacs();
-                        p.setName(name);
-                        pacs.add(p);
-                    }
-                });
-            }else {
-                packagePacs.addAll(pacsNewList);
-                pacsNewList.forEach(x ->{
-                    com.diagbot.biz.push.entity.Pacs p = new com.diagbot.biz.push.entity.Pacs();
-                    p.setName(x.getName());
-                    pacs.add(p);
-                });
-            }
-        }
-        if(ListUtil.isNotEmpty(pacs)){
-            wordCrfDTO.getPacs().addAll(pacs);
-        }
-
         wordCrfDTO.getLis().addAll(lisList);
 
+        //处理辅检 TODO 辅检
+        // List<com.diagbot.biz.push.entity.Pacs> pacs = new ArrayList<>();
+        // List<PacsNew> packagePacs = new ArrayList<>();
+        // List<PacsNew> pacsNewList = wordCrfDTO.getPresentLabel().getPacsNewList();
+        // if(ListUtil.isNotEmpty(pacsNewList)){
+        //     List<String> pacsNames = pacsNewList.stream().map(x -> x.getName()).collect(Collectors.toList());
+        //     Map<String, Map<String, Long>> configMap = pacsConfigFacade.getConfigMap(wordCrfDTO.getHospitalId(), pacsNames, null);
+        //     if(configMap.size() > 0){
+        //         pacsNewList.stream().forEach(pacsNew ->{
+        //             String name = pacsNew.getName();
+        //             List<Pacs> disease = pacsNew.getDisease();
+        //             List<Pacs> pacsResults = pacsNew.getPacsResults();
+        //             if(configMap.containsKey(name)){
+        //                 Map<String, Long> uinqueNameMap = configMap.get(name);
+        //                 List<PacsNew> collect = uinqueNameMap.keySet().stream().map(x -> {
+        //                     PacsNew pan = new PacsNew();
+        //                     pan.setName(name);
+        //                     pan.setUniqueName(x);
+        //                     pan.setPacsResults(pacsResults);
+        //                     pan.setDisease(disease);
+        //                     return pan;
+        //                 }).collect(Collectors.toList());
+        //                 packagePacs.addAll(collect);
+        //                 collect.forEach(x ->{
+        //                     com.diagbot.biz.push.entity.Pacs p = new com.diagbot.biz.push.entity.Pacs();
+        //                     p.setName(x.getName());
+        //                     p.setUniqueName(x.getUniqueName());
+        //                     pacs.add(p);
+        //                 });
+        //             }else {
+        //                 PacsNew pan = new PacsNew();
+        //                 pan.setName(name);
+        //                 pan.setPacsResults(pacsResults);
+        //                 pan.setDisease(disease);
+        //                 packagePacs.add(pan);
+        //                 com.diagbot.biz.push.entity.Pacs p = new com.diagbot.biz.push.entity.Pacs();
+        //                 p.setName(name);
+        //                 pacs.add(p);
+        //             }
+        //         });
+        //     }else {
+        //         packagePacs.addAll(pacsNewList);
+        //         pacsNewList.forEach(x ->{
+        //             com.diagbot.biz.push.entity.Pacs p = new com.diagbot.biz.push.entity.Pacs();
+        //             p.setName(x.getName());
+        //             pacs.add(p);
+        //         });
+        //     }
+        // }
+        // if(ListUtil.isNotEmpty(pacs)){
+        //     wordCrfDTO.getPacs().addAll(pacs);
+        // }
+
+
         PacsLabel pacsLabel = wordCrfDTO.getPacsLabel();
-        pacsLabel.getPacsNewList().addAll(packagePacs);
+        // TODO 辅检
+        // pacsLabel.getPacsNewList().addAll(packagePacs);
     }
 
     private Lis getLis(String bigName, String detailName, String value, String unit, String uniqueName) {

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

@@ -6,9 +6,33 @@ import com.diagbot.client.CRFServiceClient;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.model.ai.process.*;
-import com.diagbot.model.entity.*;
-import com.diagbot.model.label.*;
+import com.diagbot.model.ai.process.EntityProcessClinic;
+import com.diagbot.model.ai.process.EntityProcessDiag;
+import com.diagbot.model.ai.process.EntityProcessFamily;
+import com.diagbot.model.ai.process.EntityProcessLis;
+import com.diagbot.model.ai.process.EntityProcessMarital;
+import com.diagbot.model.ai.process.EntityProcessMenses;
+import com.diagbot.model.ai.process.EntityProcessPacsNew;
+import com.diagbot.model.ai.process.EntityProcessPast;
+import com.diagbot.model.ai.process.EntityProcessPersonal;
+import com.diagbot.model.ai.process.EntityProcessVital;
+import com.diagbot.model.entity.Diag;
+import com.diagbot.model.entity.GeneralDesc;
+import com.diagbot.model.entity.Lis;
+import com.diagbot.model.entity.Medicine;
+import com.diagbot.model.entity.PacsNew;
+import com.diagbot.model.entity.Usual;
+import com.diagbot.model.entity.Vital;
+import com.diagbot.model.label.ChiefLabel;
+import com.diagbot.model.label.DiagLabel;
+import com.diagbot.model.label.FamilyLabel;
+import com.diagbot.model.label.MaritalLabel;
+import com.diagbot.model.label.MenstrualLabel;
+import com.diagbot.model.label.PacsLabel;
+import com.diagbot.model.label.PastLabel;
+import com.diagbot.model.label.PersonalLabel;
+import com.diagbot.model.label.PresentLabel;
+import com.diagbot.model.label.VitalLabel;
 import com.diagbot.util.Content;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
@@ -19,7 +43,6 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -151,13 +174,15 @@ public class BeHospitalizedAI extends ModelAI {
                     return pacsNew;
                 }).collect(Collectors.toList());
                 PacsLabel pacsLabel = new PacsLabel();
-                pacsLabel.setPacsNewList(collect);
-                wordCrfDTO.setPacsLabel(pacsLabel);
-
                 StringBuffer sb = new StringBuffer();
-                for (PacsNew pacsNew : collect) {
-                    sb.append(StringUtils.isNotBlank(pacsNew.getUniqueName())? pacsNew.getUniqueName() + ":":pacsNew.getName()+ ":").append(pacsNew.getResult() + "。");
+                for (com.diagbot.biz.push.entity.Pacs pacs : inputInfo.getPacs()) {
+                    sb.append(StringUtils.isNotBlank(pacs.getUniqueName())? pacs.getUniqueName() + ":":pacs.getName()+ ":").append(pacs.getResult() + "。");
                 }
+                // wordCrfDTO.setPacsLabel(pacsLabel);
+                // pacsLabel.setPacsNewList(collect);
+                // for (PacsNew pacsNew : collect) {
+                //     sb.append(StringUtils.isNotBlank(pacsNew.getUniqueName())? pacsNew.getUniqueName() + ":":pacsNew.getName()+ ":").append(pacsNew.getResult() + "。");
+                // }
                 pacsLabel.setText(sb.toString());
                 pacsLabel.setAiText(sb.toString());
                 putContent(crfContent, medicalTextType.get(5), sb.toString(), Content.pacs);
@@ -654,7 +679,7 @@ public class BeHospitalizedAI extends ModelAI {
     }
 
     /*
-     * 初步诊断信息提取
+     * 辅检信息提取
      *
      * @param jsonObject
      * @param inputInfo
@@ -668,15 +693,15 @@ public class BeHospitalizedAI extends ModelAI {
             return;
         }
         EntityProcessPacsNew entityProcessPacsNew = new EntityProcessPacsNew();
-        Map<String, PacsNew> map = entityProcessPacsNew.extractEntity(aiOut);
-
-        List<PacsNew> pacsNewList = pacsLabel.getPacsNewList();
-        for (PacsNew p : pacsNewList) {
-            if (map.get(p.getName()) != null) {
-                p.setPacsResults(map.get(p.getName()).getPacsResults());
-                p.setDisease(map.get(p.getName()).getDisease());
-            }
-        }
+        // Map<String, PacsNew> map = entityProcessPacsNew.extractEntity(aiOut);
+        //
+        // List<PacsNew> pacsNewList = pacsLabel.getPacsNewList();
+        // for (PacsNew p : pacsNewList) {
+        //     if (map.get(p.getName()) != null) {
+        //         p.setPacsResults(map.get(p.getName()).getPacsResults());
+        //         p.setDisease(map.get(p.getName()).getDisease());
+        //     }
+        // }
     }
 
     /**

src/main/java/com/diagbot/model/ai/process/EntityProcessClinic.java

@@ -4,7 +4,23 @@ package com.diagbot.model.ai.process;
 import com.alibaba.fastjson.JSONObject;
 import com.diagbot.model.ai.model.EntityEnum;
 import com.diagbot.model.ai.model.Lemma;
-import com.diagbot.model.entity.*;
+import com.diagbot.model.entity.Aggravate;
+import com.diagbot.model.entity.BeHospitalizedWay;
+import com.diagbot.model.entity.BodyPart;
+import com.diagbot.model.entity.Cause;
+import com.diagbot.model.entity.Clinical;
+import com.diagbot.model.entity.Degree;
+import com.diagbot.model.entity.Diag;
+import com.diagbot.model.entity.General;
+import com.diagbot.model.entity.GeneralDesc;
+import com.diagbot.model.entity.Medicine;
+import com.diagbot.model.entity.Modification;
+import com.diagbot.model.entity.Operation;
+import com.diagbot.model.entity.PD;
+import com.diagbot.model.entity.Property;
+import com.diagbot.model.entity.Relief;
+import com.diagbot.model.entity.Treat;
+import com.diagbot.model.entity.Trend;
 import com.diagbot.model.label.PresentLabel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,7 +28,6 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 现病史处理
@@ -98,17 +113,19 @@ public class EntityProcessClinic extends EntityProcess {
 //            EntityProcessPacs entityProcessLis = new EntityProcessPacs();
 //            List<Pacs> pacses = entityProcessLis.extractEntity(aiOut);
 //            presentLabel.setPacses(pacses);
-            EntityProcessPacsNew entityProcessPacsNew = new EntityProcessPacsNew();
-            Map<String, PacsNew> pacsNewMap = entityProcessPacsNew.extractEntity(aiOut);
-            List<PacsNew> collect = new ArrayList<>();
-            if(pacsNewMap.size() > 0){
-                pacsNewMap.forEach((item,pacsNew)->{
-                    pacsNew.setName(item);
-                    pacsNew.setResult(presentLabel.getText());
-                    collect.add(pacsNew);
-                });
-            }
-            presentLabel.setPacsNewList(collect);
+
+            // TODO 辅检
+            // EntityProcessPacsNew entityProcessPacsNew = new EntityProcessPacsNew();
+            // Map<String, PacsNew> pacsNewMap = entityProcessPacsNew.extractEntity(aiOut);
+            // List<PacsNew> collect = new ArrayList<>();
+            // if(pacsNewMap.size() > 0){
+            //     pacsNewMap.forEach((item,pacsNew)->{
+            //         pacsNew.setName(item);
+            //         pacsNew.setResult(presentLabel.getText());
+            //         collect.add(pacsNew);
+            //     });
+            // }
+            // presentLabel.setPacsNewList(collect);
 
             //治疗
             List<Lemma> cureLemmas = createEntityTree(aiOut, EntityEnum.CURE.toString());

src/main/java/com/diagbot/model/ai/process/EntityProcessPacsNew.java

@@ -33,6 +33,7 @@ public class EntityProcessPacsNew extends EntityProcess {
                     if (relationLemma.getProperty().equals(EntityEnum.BODY.toString())) {
                         BodyPart bodyPart = new BodyPart();
                         bodyPart.setName(relationLemma.getText());
+                        bodyPart.setStandName(relationLemma.getText());
                         bodyPartList.add(bodyPart);
                     }
                 }

src/main/java/com/diagbot/model/label/PacsLabel.java

@@ -1,7 +1,8 @@
 package com.diagbot.model.label;
 
 
-import com.diagbot.model.entity.PacsNew;
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.model.entity.Pacs;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,5 +19,9 @@ import java.util.List;
 @Getter
 public class PacsLabel extends GeneralLabel {
 //     List<Pacs> pacses;
-    List<PacsNew> pacsNewList = new ArrayList<>(); // 辅检信息
+//     List<PacsNew> pacsNewList = new ArrayList<>(); // 辅检信息
+    private List<Pacs> pacsResults = new ArrayList<>(); // 辅检提取的描述信息
+    private List<Pacs> disease = new ArrayList<>(); // 辅检提取的诊断
+    private List<Item> res = new ArrayList<>(); // 描述文本 + 诊断
+    private List<Item> item = new ArrayList<>(); // 所有的辅检项目
 }

src/main/java/com/diagbot/model/label/PresentLabel.java

@@ -20,7 +20,8 @@ public class PresentLabel extends GeneralLabel {
     private List<Clinical> clinicals = new ArrayList<>();
     //辅助检查
 //    private List<Pacs> pacses;
-    List<PacsNew> pacsNewList = new ArrayList<>(); // 辅检信息
+//     List<PacsNew> pacsNewList = new ArrayList<>(); // 辅检信息
+    List<PacsNew> pacsLabel = new ArrayList<>(); // 辅检信息
     //化验
     private List<Lis> lises;
     //治疗

src/main/java/com/diagbot/process/BillProcess.java

@@ -33,7 +33,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 开单总入口
@@ -169,19 +168,27 @@ public class BillProcess {
         //辅助检查描述
         PacsLabel pacsLabel = wordCrfDTO.getPacsLabel();
         List<Item> pacsDescList = new ArrayList<>();
-        pacsLabel.getPacsNewList().stream().filter(x -> ListUtil.isNotEmpty(x.getPacsResults()) || ListUtil.isNotEmpty(x.getDisease())).forEach(
-                x ->{
-                    List<String> pacsResults = x.getPacsResults().stream().map(pacr -> pacr.getStandName()).collect(Collectors.toList());
-                    List<String> diseases = x.getDisease().stream().map(disease -> disease.getStandName()).collect(Collectors.toList());
-                    pacsResults.addAll(diseases);
-                    pacsResults.stream().forEach(z ->{
-                        Item item = new Item();
-                        item.setName(z);
-                        item.setUniqueName(z);
-                        pacsDescList.add(item);
-                    });
+        pacsLabel.getRes().stream().forEach(
+                x -> {
+                    Item item = new Item();
+                    item.setName(x.getName());
+                    item.setUniqueName(x.getUniqueName());
+                    pacsDescList.add(item);
                 }
         );
+        // pacsLabel.getPacsNewList().stream().filter(x -> ListUtil.isNotEmpty(x.getPacsResults()) || ListUtil.isNotEmpty(x.getDisease())).forEach(
+        //         x ->{
+        //             List<String> pacsResults = x.getPacsResults().stream().map(pacr -> pacr.getStandName()).collect(Collectors.toList());
+        //             List<String> diseases = x.getDisease().stream().map(disease -> disease.getStandName()).collect(Collectors.toList());
+        //             pacsResults.addAll(diseases);
+        //             pacsResults.stream().forEach(z ->{
+        //                 Item item = new Item();
+        //                 item.setName(z);
+        //                 item.setUniqueName(z);
+        //                 pacsDescList.add(item);
+        //             });
+        //         }
+        // );
 
         // 手术数据
         List<Operation> operations_all = new ArrayList<>();

src/main/java/com/diagbot/process/HighRiskProcess.java

@@ -10,7 +10,6 @@ import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.enums.TypeEnum;
 import com.diagbot.model.label.PacsLabel;
 import com.diagbot.util.CoreUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.MsgUtil;
 import org.springframework.stereotype.Component;
 
@@ -18,7 +17,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 高风险总入口
@@ -109,19 +107,15 @@ public class HighRiskProcess {
                     } else if (TypeEnum.pacs.getName().equals(nodeNeoDTO.getTermtype())) {
                         //辅助检查描述
                         List<Item> pacsDescList = new ArrayList<>();
-                        pacsLabel.getPacsNewList().stream().filter(x -> ListUtil.isNotEmpty(x.getPacsResults()) || ListUtil.isNotEmpty(x.getDisease())).forEach(
+                        pacsLabel.getRes().stream().forEach(
                                 x -> {
-                                    List<String> pacsResults = x.getPacsResults().stream().map(pacr -> pacr.getStandName()).collect(Collectors.toList());
-                                    List<String> diseases = x.getDisease().stream().map(disease -> disease.getStandName()).collect(Collectors.toList());
-                                    pacsResults.addAll(diseases);
-                                    pacsResults.stream().forEach(z -> {
-                                        Item item = new Item();
-                                        item.setName(z);
-                                        item.setUniqueName(z);
-                                        pacsDescList.add(item);
-                                    });
+                                    Item item = new Item();
+                                    item.setName(x.getName());
+                                    item.setUniqueName(x.getUniqueName());
+                                    pacsDescList.add(item);
                                 }
                         );
+
                         //辅检匹配结果
                         for (Item item : pacsDescList) {
                             if (item.getUniqueName().equals(nodeNeoDTO.getVal())) {

src/main/java/com/diagbot/repository/PacsRemindNode.java

@@ -5,8 +5,6 @@ import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.OtherTipPacsNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.entity.node.PacsRemind;
-import com.diagbot.model.entity.Pacs;
-import com.diagbot.model.entity.PacsNew;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 
@@ -37,14 +35,8 @@ public class PacsRemindNode {
 			pacsdiseases.add(dg.getUniqueName());
 		}
 
-		for (PacsNew pacsNew : wordCrfDTO.getPacsLabel().getPacsNewList()) {
-			for (Pacs pacs : pacsNew.getPacsResults()) {
-				pacsresult.add(pacs.getStandName());
-			}
-
-			for (Pacs pacs : pacsNew.getDisease()) {
-				pacsresultdisease.add(pacs.getStandName());
-			}
+		for (Item item1: wordCrfDTO.getPacsLabel().getRes()) {
+			pacsresult.add(item1.getUniqueName());
 		}
 
 		if (null!=wordCrfDTO.getSex()) {