推理出参优化

src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -2,7 +2,7 @@ package com.diagbot.client;
 
 import com.diagbot.client.hystrix.CdssCoreHystrix;
 import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.PushCoreDTO;
+import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.PushVO;
@@ -24,7 +24,7 @@ public interface CdssCoreClient {
     RespDTO<IndicationDTO> indication(@Valid @RequestBody IndicationPushVO indicationPushVO);
 
     @PostMapping("/core/push")
-    RespDTO<PushCoreDTO> push(@RequestBody @Valid PushVO pushVo);
+    RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVo);
 }
 
 

src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -2,7 +2,7 @@ package com.diagbot.client.hystrix;
 
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.PushCoreDTO;
+import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.PushVO;
@@ -28,7 +28,7 @@ public class CdssCoreHystrix implements CdssCoreClient {
     }
 
     @Override
-    public RespDTO<PushCoreDTO> push(@RequestBody @Valid PushVO pushVo) {
+    public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVo) {
         log.error("【hystrix】调用{}异常", "push");
         return null;
     }

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

@@ -12,10 +12,9 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class PushBaseCoreDTO {
+public class PushBaseDTO {
     //条目名称
     private String name;
-
-    //his条目名称
+    //医院端名称
     private List<String> hisNameList;
 }

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

@@ -13,15 +13,15 @@ import java.util.Map;
  */
 @Getter
 @Setter
-public class PushCoreDTO {
+public class PushDTO {
     //症状
-    private List<PushBaseCoreDTO> symptom;
+    private List<PushBaseDTO> symptom;
     //体格检查
-    private List<PushBaseCoreDTO> vital;
+    private List<PushBaseDTO> vital;
     //检验
-    private List<PushBaseCoreDTO> lis;
+    private List<PushBaseDTO> lis;
     //检查
-    private List<PushBaseCoreDTO> pacs;
+    private List<PushBaseDTO> pacs;
     //诊断
-    private Map<String, List<PushBaseCoreDTO>> dis;
+    private Map<String, List<PushBaseDTO>> dis;
 }

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

@@ -2,8 +2,8 @@ package com.diagbot.facade;
 
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.PushBaseCoreDTO;
-import com.diagbot.dto.PushCoreDTO;
+import com.diagbot.dto.PushBaseDTO;
+import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
@@ -44,17 +44,17 @@ public class PushFacade {
      *
      * @param pushVO
      */
-    public PushCoreDTO push(PushVO pushVO) {
+    public PushDTO push(PushVO pushVO) {
         SearchData searchData = new SearchData();
         BeanUtil.copyProperties(pushVO, searchData);
         searchData = assembleFacade.assembleData(searchData);
         BeanUtil.copyProperties(searchData, pushVO);
-        RespDTO<PushCoreDTO> resp = cdssCoreClient.push(pushVO);
+        RespDTO<PushDTO> resp = cdssCoreClient.push(pushVO);
         RespDTOUtil.respNGDealCover(resp, "远程调用推理接口失败");
-        PushCoreDTO data = resp.data;
+        PushDTO data = resp.data;
         //TODO 外部名称映射
         if (ListUtil.isNotEmpty(data.getLis())) {
-            List<PushBaseCoreDTO> retLis = data.getLis();
+            List<PushBaseDTO> retLis = data.getLis();
             List<String> uniqueNameList = retLis.stream()
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
@@ -70,7 +70,7 @@ public class PushFacade {
             }
         }
         if (ListUtil.isNotEmpty(data.getPacs())) {
-            List<PushBaseCoreDTO> retPacs = data.getPacs();
+            List<PushBaseDTO> retPacs = data.getPacs();
             List<String> uniqueNameList = retPacs.stream()
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
@@ -86,9 +86,9 @@ public class PushFacade {
             }
         }
         if (data.getDis() != null && data.getDis().size() > 0) {
-            Map<String, List<PushBaseCoreDTO>> retMap = data.getDis();
+            Map<String, List<PushBaseDTO>> retMap = data.getDis();
             List<String> uniqueNameList = Lists.newLinkedList();
-            for (Map.Entry<String, List<PushBaseCoreDTO>> entry : retMap.entrySet()) {
+            for (Map.Entry<String, List<PushBaseDTO>> entry : retMap.entrySet()) {
                 if (ListUtil.isNotEmpty(entry.getValue())) {
                     uniqueNameList.addAll(entry.getValue().stream()
                             .map(i -> i.getName())
@@ -98,7 +98,7 @@ public class PushFacade {
             if (ListUtil.isNotEmpty(uniqueNameList)) {
                 Map<String, Map<String, Long>> uniqueNameMap
                         = diseaseConfigFacade.getUniqueNameConfigMap(pushVO.getHospitalId(), null, uniqueNameList);
-                for (Map.Entry<String, List<PushBaseCoreDTO>> entry : retMap.entrySet()) {
+                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) {

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

@@ -3,7 +3,7 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.annotation.TokenAuth;
 import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.PushCoreDTO;
+import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
 import com.diagbot.vo.IndicationPushVO;
@@ -35,8 +35,8 @@ public class PushController {
     @PostMapping("/push")
     @SysLogger("push")
     @TokenAuth
-    public RespDTO<PushCoreDTO> push(@RequestBody @Valid PushVO pushVO) {
-        PushCoreDTO data = pushFacade.push(pushVO);
+    public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVO) {
+        PushDTO data = pushFacade.push(pushVO);
         return RespDTO.onSuc(data);
     }