1、术语映射

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

@@ -1,5 +1,6 @@
 package com.diagbot.aggregate;
 
+import com.diagbot.dto.ConceptInfoDTO;
 import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.facade.DiseaseConfigFacade;
@@ -8,6 +9,7 @@ import com.diagbot.facade.LisConfigFacade;
 import com.diagbot.facade.OperationConfigFacade;
 import com.diagbot.facade.PacsConfigFacade;
 import com.diagbot.util.ListUtil;
+import com.diagbot.vo.PushVO;
 import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
@@ -49,7 +51,8 @@ public class AssemblePushAggregate {
             @DataConsumer("retPacs") List<PushBaseDTO> retPacs,
             @DataConsumer("retDiagMap") Map<String, List<PushBaseDTO>> retDiagMap,
             @DataConsumer("retOperation") List<PushBaseDTO> retOperation,
-            @DataConsumer("retDrug") List<PushBaseDTO> retDrug) {
+            @DataConsumer("retDrug") List<PushBaseDTO> retDrug,
+            @DataConsumer("retGeneraTreat") List<ConceptInfoDTO> retGeneraTreat) {
         //检验
         if (ListUtil.isNotEmpty(retLis)) {
             data.setLis(retLis);
@@ -197,4 +200,12 @@ public class AssemblePushAggregate {
         }
         return retDrug;
     }
+
+    @DataProvider("retGeneraTreat")
+    public List<ConceptInfoDTO> retGeneraTreat(@InvokeParameter("pushVO") PushVO pushVO,
+                                               @InvokeParameter("hospitalId") Long hospitalId) {
+        List<ConceptInfoDTO> retGeneraTreat = Lists.newLinkedList();
+
+        return retGeneraTreat;
+    }
 }

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

@@ -32,5 +32,5 @@ public class PushDTO {
     //诊断
     private Map<String, List<PushBaseDTO>> dis;
     //一般治疗
-    private String generaTreat;
+    private List<ConceptInfoDTO> generaTreat;
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class DiseaseConfigPageVO {
+public class DiseaseConfigPageVO extends Page {
     /**
      * 医院id
      */

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +12,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class DrugConfigPageVO {
+public class DrugConfigPageVO extends Page {
     /**
      * 医院id
      */