1、推送结果关联量表

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

@@ -2,6 +2,7 @@ package com.diagbot.aggregate;
 
 import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.PushScaleDTO;
 import com.diagbot.facade.DiseaseConfigFacade;
 import com.diagbot.facade.DrugConfigFacade;
 import com.diagbot.facade.LisConfigFacade;
@@ -56,7 +57,7 @@ public class AssemblePushAggregate {
             @DataConsumer("retDiagMap") Map<String, List<PushBaseDTO>> retDiagMap,
             @DataConsumer("retOperation") List<PushBaseDTO> retOperation,
             @DataConsumer("retDrug") List<PushBaseDTO> retDrug,
-            @DataConsumer("retScale") List<PushBaseDTO> retScale,
+            @DataConsumer("retScale") List<PushScaleDTO> retScale,
             @DataConsumer("retNurse") List<PushBaseDTO> retNurse) {
         //检验
         if (ListUtil.isNotEmpty(retLis)) {
@@ -214,10 +215,10 @@ public class AssemblePushAggregate {
     }
 
     @DataProvider("retScale")
-    public List<PushBaseDTO> retScale(@InvokeParameter("pushDTO") PushDTO data,
+    public List<PushScaleDTO> retScale(@InvokeParameter("pushDTO") PushDTO data,
                                       @InvokeParameter("hospitalId") Long hospitalId) {
         //量表
-        List<PushBaseDTO> retScale = new ArrayList<>();
+        List<PushScaleDTO> retScale = new ArrayList<>();
         if (ListUtil.isNotEmpty(data.getScale())) {
             retScale = data.getScale();
             List<String> uniqueNameList = retScale.stream()

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

@@ -21,9 +21,4 @@ public class PushBaseDTO {
      * 是否有静态知识
      */
     private Integer hasInfo = 0;
-
-    /**
-     * 是否有评估量表
-     */
-    private Integer hasScale = 0;
 }

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

@@ -38,7 +38,7 @@ public class PushDTO {
     //一般治疗
     private List<TreatDTO> treat = new ArrayList<>();
     //推送量表
-    private List<PushBaseDTO> scale = Lists.newArrayList();
+    private List<PushScaleDTO> scale = Lists.newArrayList();
 
     // 记录调试信息
     private Map<String, Object> debug = new LinkedHashMap<>();

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

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/5/26 13:31
+ */
+@Getter
+@Setter
+public class PushScaleDTO extends PushBaseDTO {
+    /**
+     * 是否有评估量表
+     */
+    private Integer hasScale = 0;
+}

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

@@ -45,8 +45,6 @@ public class PushFacade {
     @Autowired
     private CdssCoreClient cdssCoreClient;
     @Autowired
-    private ConceptInfoFacade conceptInfoFacade;
-    @Autowired
     private DictionaryFacade dictionaryFacade;
     @Autowired
     MrFacade mrFacade;