沙雅推荐内容修改为医院术语

src/main/java/com/diagbot/aggregate/AssemblePushAggregate.java

@@ -44,18 +44,26 @@ public class AssemblePushAggregate {
         //检验
         if (ListUtil.isNotEmpty(retLis)) {
             data.setLis(retLis);
+        } else {
+            data.setOperations(null);
         }
         //检查
         if (ListUtil.isNotEmpty(retPacs)) {
             data.setPacs(retPacs);
+        } else {
+            data.setOperations(null);
         }
         //诊断
         if (MapUtils.isNotEmpty(retDiagMap)) {
             data.setDis(retDiagMap);
+        } else {
+            data.setOperations(null);
         }
         //手术
         if (ListUtil.isNotEmpty(retOperation)) {
             data.setOperations(retOperation);
+        } else {
+            data.setOperations(null);
         }
         //药品
         if (ListUtil.isNotEmpty(retDrug)) {
@@ -64,6 +72,8 @@ public class AssemblePushAggregate {
         //分类药品
         if (MapUtils.isNotEmpty(retDrugs)) {
             data.setMedicine(retDrugs);
+        } else {
+            data.setOperations(null);
         }
         //量表
         if (ListUtil.isNotEmpty(retScale)) {
@@ -81,6 +91,9 @@ public class AssemblePushAggregate {
                                     @InvokeParameter("hospitalId") Long hospitalId) {
         //检验
         List<PushBaseDTO> retLis = new ArrayList<>();
+        //检验出参
+        List<PushBaseDTO> retOutLis = new ArrayList<>();
+        Map<String, String> stringMap = new HashMap<>();
         if (ListUtil.isNotEmpty(data.getLis())) {
             retLis = data.getLis();
             List<String> uniqueNameList = retLis.stream()
@@ -89,19 +102,42 @@ public class AssemblePushAggregate {
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
                     = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.LisPack.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
+            if (hospitalId == -1) {
+                return retLis;
+            }
+
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
-                retLis.forEach(item -> {
-                    if (uniqueNameMap.get(item.getName()) != null) {
-                        item.setHisNameList(uniqueNameMap.get(item.getName())
-                                .values().stream()
-                                .map(i -> i.keySet())
-                                .flatMap(Collection::stream)
-                                .collect(Collectors.toList()));
+
+                for (Map.Entry<String, Map<String, Map<String, List<String>>>> uniqueNameMapEntry : uniqueNameMap.entrySet()) {
+                    if (uniqueNameMapEntry.getValue() != null) {
+                        for (Map.Entry<String, Map<String, List<String>>> entry : uniqueNameMapEntry.getValue().entrySet()) {
+                            stringMap.put(uniqueNameMapEntry.getKey(), entry.getKey());
+                        }
                     }
-                });
+                }
+
+                for(PushBaseDTO pushDto : retLis){
+                    for (Map.Entry<String, String> stringEntry : stringMap.entrySet()) {
+                        if (stringEntry.getValue().equals(pushDto.getName())) {
+                            PushBaseDTO pushBaseDTO = new PushBaseDTO();
+                            pushBaseDTO.setName(stringEntry.getKey());
+                            retOutLis.add(pushBaseDTO);
+                        }
+                    }
+                }
+
+//                retLis.forEach(item -> {
+//                    if (uniqueNameMap.get(item.getName()) != null) {
+//                        item.setHisNameList(uniqueNameMap.get(item.getName())
+//                                .values().stream()
+//                                .map(i -> i.keySet())
+//                                .flatMap(Collection::stream)
+//                                .collect(Collectors.toList()));
+//                    }
+//                });
             }
         }
-        return retLis;
+        return retOutLis;
     }
 
     @DataProvider("retPacs")
@@ -109,6 +145,9 @@ public class AssemblePushAggregate {
                                      @InvokeParameter("hospitalId") Long hospitalId) {
         //检查
         List<PushBaseDTO> retPacs = new ArrayList<>();
+        //检查出参
+        List<PushBaseDTO> retOutPacs = new ArrayList<>();
+        Map<String, String> stringMap = new HashMap<>();
         if (ListUtil.isNotEmpty(data.getPacs())) {
             retPacs = data.getPacs();
             List<String> uniqueNameList = retPacs.stream()
@@ -117,25 +156,55 @@ public class AssemblePushAggregate {
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
                     = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Pacs.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
+            if (hospitalId == -1) {
+                return retPacs;
+            }
+
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
-                retPacs.forEach(item -> {
-                    if (uniqueNameMap.get(item.getName()) != null) {
-                        item.setHisNameList(uniqueNameMap.get(item.getName())
-                                .values().stream()
-                                .map(i -> i.keySet())
-                                .flatMap(Collection::stream)
-                                .collect(Collectors.toList()));
+//                // 遍历外层 Map
+//                for (String key : uniqueNameMap.keySet()) {
+//                    // 创建 PushBaseDTO 对象并设置 name 字段
+//                    PushBaseDTO pushBaseDTO = new PushBaseDTO();
+//                    pushBaseDTO.setName(key);
+//                    retOutPacs.add(pushBaseDTO);
+//                }
+                for (Map.Entry<String, Map<String, Map<String, List<String>>>> uniqueNameMapEntry : uniqueNameMap.entrySet()) {
+                    if (uniqueNameMapEntry.getValue() != null) {
+                        for (Map.Entry<String, Map<String, List<String>>> entry : uniqueNameMapEntry.getValue().entrySet()) {
+                            stringMap.put(uniqueNameMapEntry.getKey(), entry.getKey());
+                        }
                     }
-                });
+                }
+
+                for(PushBaseDTO pushDto : retPacs){
+                    for (Map.Entry<String, String> stringEntry : stringMap.entrySet()) {
+                        if (stringEntry.getValue().equals(pushDto.getName())) {
+                            PushBaseDTO pushBaseDTO = new PushBaseDTO();
+                            pushBaseDTO.setName(stringEntry.getKey());
+                            retOutPacs.add(pushBaseDTO);
+                        }
+                    }
+                }
+//                retPacs.forEach(item -> {
+//                    if (uniqueNameMap.get(item.getName()) != null) {
+//                        item.setHisNameList(uniqueNameMap.get(item.getName())
+//                                .values().stream()
+//                                .map(i -> i.keySet())
+//                                .flatMap(Collection::stream)
+//                                .collect(Collectors.toList()));
+//                    }
+//                });
             }
         }
-        return retPacs;
+        return retOutPacs;
     }
 
     @DataProvider("retDiagMap")
     public Map<String, List<PushBaseDTO>> retDiagMap(@InvokeParameter("pushDTO") PushDTO data,
                                                      @InvokeParameter("hospitalId") Long hospitalId) {
         Map<String, List<PushBaseDTO>> retMap = new HashMap<>();
+        //出参
+        Map<String, List<PushBaseDTO>> retOutDiags = new LinkedHashMap<>();
         if (data.getDis() != null && data.getDis().size() > 0) {
             retMap = data.getDis();
             List<String> uniqueNameList = Lists.newLinkedList();
@@ -150,22 +219,39 @@ public class AssemblePushAggregate {
                 Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
                         = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Disease.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
+                if (hospitalId == -1) {
+                    return retMap;
+                }
+
+                List<PushBaseDTO> diagList = new ArrayList<>();
                 for (Map.Entry<String, List<PushBaseDTO>> entry : retMap.entrySet()) {
                     if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
-                        entry.getValue().forEach(item -> {
-                            if (uniqueNameMap.get(item.getName()) != null) {
-                                item.setHisNameList(uniqueNameMap.get(item.getName())
-                                        .values().stream()
-                                        .map(i -> i.keySet())
-                                        .flatMap(Collection::stream)
-                                        .collect(Collectors.toList()));
-                            }
-                        });
+                        // 遍历外层 Map
+                        for (String key : uniqueNameMap.keySet()) {
+                            // 创建 PushBaseDTO 对象并设置 name 字段
+                            PushBaseDTO pushBaseDTO = new PushBaseDTO();
+                            pushBaseDTO.setName(key);
+                            diagList.add(pushBaseDTO);
+                        }
                     }
+                    retOutDiags.put(entry.getKey(), diagList);
                 }
+//                for (Map.Entry<String, List<PushBaseDTO>> entry : retMap.entrySet()) {
+//                    if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
+//                        entry.getValue().forEach(item -> {
+//                            if (uniqueNameMap.get(item.getName()) != null) {
+//                                item.setHisNameList(uniqueNameMap.get(item.getName())
+//                                        .values().stream()
+//                                        .map(i -> i.keySet())
+//                                        .flatMap(Collection::stream)
+//                                        .collect(Collectors.toList()));
+//                            }
+//                        });
+//                    }
+//                }
             }
         }
-        return retMap;
+        return retOutDiags;
     }
 
     @DataProvider("retOperation")
@@ -173,6 +259,8 @@ public class AssemblePushAggregate {
                                           @InvokeParameter("hospitalId") Long hospitalId) {
         //手术
         List<PushBaseDTO> retOperation = new ArrayList<>();
+        //手术出参
+        List<PushBaseDTO> retOutOperation = new ArrayList<>();
         if (ListUtil.isNotEmpty(data.getOperations())) {
             retOperation = data.getOperations();
             List<String> uniqueNameList = retOperation.stream()
@@ -181,19 +269,29 @@ public class AssemblePushAggregate {
             Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
                     = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Operation.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
+            if (hospitalId == -1) {
+                return retOperation;
+            }
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
-                retOperation.forEach(item -> {
-                    if (uniqueNameMap.get(item.getName()) != null) {
-                        item.setHisNameList(uniqueNameMap.get(item.getName())
-                                .values().stream()
-                                .map(i -> i.keySet())
-                                .flatMap(Collection::stream)
-                                .collect(Collectors.toList()));
-                    }
-                });
+                // 遍历外层 Map
+                for (String key : uniqueNameMap.keySet()) {
+                    // 创建 PushBaseDTO 对象并设置 name 字段
+                    PushBaseDTO pushBaseDTO = new PushBaseDTO();
+                    pushBaseDTO.setName(key);
+                    retOutOperation.add(pushBaseDTO);
+                }
+//                retOperation.forEach(item -> {
+//                    if (uniqueNameMap.get(item.getName()) != null) {
+//                        item.setHisNameList(uniqueNameMap.get(item.getName())
+//                                .values().stream()
+//                                .map(i -> i.keySet())
+//                                .flatMap(Collection::stream)
+//                                .collect(Collectors.toList()));
+//                    }
+//                });
             }
         }
-        return retOperation;
+        return retOutOperation;
     }
 
     @DataProvider("retDrug")
@@ -226,32 +324,47 @@ public class AssemblePushAggregate {
 
     @DataProvider("retDrugs")
     public Map<String, List<PushBaseDTO>> retDrugs(@InvokeParameter("pushDTO") PushDTO data,
-                                     @InvokeParameter("hospitalId") Long hospitalId) {
+                                                   @InvokeParameter("hospitalId") Long hospitalId) {
         //药品
         Map<String, List<PushBaseDTO>> retDrugs = new LinkedHashMap<>();
-        if(MapUtils.isNotEmpty(data.getMedicine())) {
+        //出参
+        Map<String, List<PushBaseDTO>> retOutDrugs = new LinkedHashMap<>();
+        if (MapUtils.isNotEmpty(data.getMedicine())) {
             retDrugs = data.getMedicine();
-            for(Map.Entry<String, List<PushBaseDTO>> entry : retDrugs.entrySet()) {
+            for (Map.Entry<String, List<PushBaseDTO>> entry : retDrugs.entrySet()) {
                 List<String> uniqueNameList = entry.getValue().stream()
                         .map(i -> i.getName())
                         .collect(Collectors.toList());
                 Map<String, Map<String, Map<String, List<String>>>> uniqueNameMap
                         = mappingConfigFacade.groupByUniqueNameWithName(uniqueNameList, ConceptTypeEnum.Drug.getKey(), hospitalId, StatusEnum.Enable.getKey());
 
+                if (hospitalId == -1) {
+                    return retDrugs;
+                }
+
+                List<PushBaseDTO> drugList = new ArrayList<>();
                 if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
-                    entry.getValue().forEach(item -> {
-                        if (uniqueNameMap.get(item.getName()) != null) {
-                            item.setHisNameList(uniqueNameMap.get(item.getName())
-                                    .values().stream()
-                                    .map(i -> i.keySet())
-                                    .flatMap(Collection::stream)
-                                    .collect(Collectors.toList()));
-                        }
-                    });
+                    // 遍历外层 Map
+                    for (String key : uniqueNameMap.keySet()) {
+                        // 创建 PushBaseDTO 对象并设置 name 字段
+                        PushBaseDTO pushBaseDTO = new PushBaseDTO();
+                        pushBaseDTO.setName(key);
+                        drugList.add(pushBaseDTO);
+                    }
+                    retOutDrugs.put(entry.getKey(), drugList);
+//                    entry.getValue().forEach(item -> {
+//                        if (uniqueNameMap.get(item.getName()) != null) {
+//                            item.setHisNameList(uniqueNameMap.get(item.getName())
+//                                    .values().stream()
+//                                    .map(i -> i.keySet())
+//                                    .flatMap(Collection::stream)
+//                                    .collect(Collectors.toList()));
+//                        }
+//                    });
                 }
             }
         }
-        return retDrugs;
+        return retOutDrugs;
     }
 
     @DataProvider("retScale")

src/main/java/com/diagbot/dto/PushDTO.java

@@ -44,6 +44,15 @@ public class PushDTO {
     //经典病例
     private List<PushBaseDTO> classicCase = new ArrayList<>();
 
+    // 危机值提醒
+    private List<BillMsg> criticalValList = new ArrayList<>();
+    // 开单合理性提示信息
+    private List<BillMsg> billMsgList = new ArrayList<>();
+    // 高危药品、手术
+    private List<BillMsg> highRiskList = new ArrayList<>();
+    // 其他提醒
+    private List<BillMsg> otherList = new ArrayList<>();
+
     // 记录调试信息
     private Map<String, Object> debug = new LinkedHashMap<>();
 }

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

@@ -284,6 +284,23 @@ public class DataPageDockFacade {
         CdssLogUtil.addBizReq(pushVO);
         PushDTO pushDTO = pushFacade.push(pushVO);
         pushDTO.setDebug(null);
+
+        IndicationPushVO indicationPushVO = new IndicationPushVO();
+        BeanUtil.copyProperties(dataEngineVO, indicationPushVO);
+
+        //增加处理后的入参
+        CdssLogUtil.addBizReq(indicationPushVO);
+        IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
+
+        // 危机值提醒
+        pushDTO.setCriticalValList(indicationDTO.getCriticalValList());
+        // 开单合理性提示信息
+        pushDTO.setBillMsgList(indicationDTO.getBillMsgList());
+        // 高危药品、手术
+        pushDTO.setHighRiskList(indicationDTO.getHighRiskList());
+        // 其他提醒
+        pushDTO.setOtherList(indicationDTO.getOtherList());
+
         return RespDTO.onSuc(pushDTO);
     }
 

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

@@ -2365,10 +2365,18 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             Map<String, List<MappingConfigWrapper>> formMap
                     = entry.getValue().stream().collect(Collectors.groupingBy(MappingConfigWrapper::getForm));
             for (Map.Entry<String, List<MappingConfigWrapper>> subEntry : formMap.entrySet()) {
-                subMap.put(subEntry.getKey(), subEntry.getValue().stream().collect(Collectors.groupingBy(MappingConfigWrapper::getHisName,
+//                subMap.put(subEntry.getKey(), subEntry.getValue().stream().collect(Collectors.groupingBy(MappingConfigWrapper::getHisName,
+//                        Collectors.mapping(MappingConfigWrapper::getHisDetailName, Collectors.toList()))));
+                subMap.put(entry.getKey(), subEntry.getValue().stream().collect(Collectors.groupingBy(MappingConfigWrapper::getHisName,
                         Collectors.mapping(MappingConfigWrapper::getHisDetailName, Collectors.toList()))));
+                for (MappingConfigWrapper mappingConfigWrapper : subEntry.getValue()){
+                    if(StringUtil.isNotBlank(mappingConfigWrapper.getHisName()) && !retMap.containsKey(mappingConfigWrapper.getHisName())){
+                        retMap.put(mappingConfigWrapper.getHisName(), subMap);
+                    }
+                }
             }
-            retMap.put(entry.getKey(), subMap);
+//            retMap.put(entry.getKey(), subMap);
+
         }
 
         return retMap;

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

@@ -177,6 +177,10 @@ public class PushFacade {
         if (ListUtil.isNotEmpty(pushDTO.getClassicCase())) {
             conceptBaseList.addAll(pushDTO.getClassicCase());
         }
+        // 症状
+        if (ListUtil.isNotEmpty(pushDTO.getSymptom())) {
+            conceptBaseList.addAll(pushDTO.getSymptom());
+        }
         if (ListUtil.isNotEmpty(conceptBaseList)) {
             conceptNameList = conceptBaseList.stream()
                     .map(i -> i.getName())
@@ -271,6 +275,15 @@ public class PushFacade {
                     }
                 });
             }
+
+            if (ListUtil.isNotEmpty(pushDTO.getSymptom())) {
+                pushDTO.getSymptom().forEach(item -> {
+                    item.setType(12);
+                    if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("12"))) {
+                        item.setHasInfo(1);
+                    }
+                });
+            }
         }
 
         //量表

src/main/java/com/diagbot/vo/DataEngineVO.java

@@ -203,4 +203,9 @@ public class DataEngineVO extends CdssLogBaseVO{
      * 量表结果
      */
     private List<Scale> scale = new ArrayList<>();
+
+    /**
+     * 医生
+     */
+    private Doctor doctor;
 }

src/main/java/com/diagbot/web/DataPageDockController.java

@@ -68,6 +68,9 @@ public class DataPageDockController {
         if ("medical_record".equals(dataEngineVO.getPlanCode())) {
             //病历推送
             dataEngineVO.setFeatureType("1,4,5,6,7,8,9,10,12,13,14");
+            //规则类型（1:危急值提醒，2:开单合理项，3:高危药品、手术，4:其他提醒）
+            //开单合理性
+            dataEngineVO.setRuleType("2,3,4");
             return RespDTO.onSuc(dataPageDockFacade.getEnginePush(dataEngineVO));
         } else if ("medical_advice".equals(dataEngineVO.getPlanCode())) {
             //医嘱推送