治疗方案

aipt-service/src/main/java/com/diagbot/aggregate/TreatmentAggregate.java

@@ -3,6 +3,9 @@ package com.diagbot.aggregate;
 import com.diagbot.client.bean.AdverseReaction;
 import com.diagbot.client.bean.Medicition;
 import com.diagbot.client.bean.MedicitionClass;
+import com.diagbot.client.bean.MeditionDetail;
+import com.diagbot.client.bean.Treat;
+import com.diagbot.client.bean.TreatmentPlan;
 import com.diagbot.dto.ConceptDetailDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptDetail;
@@ -17,7 +20,6 @@ import io.github.lvyahui8.spring.annotation.InvokeParameter;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -31,20 +33,20 @@ import java.util.Map;
 public class TreatmentAggregate {
 
     @DataProvider("setTreatmentAll")
-    public Map<String, Object> setTreatmentAll(@InvokeParameter("treatmentMap") Map<String, Object> treatmentMap,
-                                               @DataConsumer("setCommonTreatment") ConceptDetailDTO commonTreatment,
-                                               @DataConsumer("setSurgeryTreatment") ConceptDetailDTO surgeryTreatment,
-                                               @DataConsumer("setDrugs") List<MedicitionClass> drugsList,
-                                               @DataConsumer("setAdverseReactions") List<AdverseReaction> adverseReactionList) {
-        if (treatmentMap == null) {
-            treatmentMap = new LinkedHashMap<>();
+    public Treat setTreatmentAll(@InvokeParameter("treat") Treat treat,
+                                 @DataConsumer("setCommonTreatment") ConceptDetailDTO commonTreatment,
+                                 @DataConsumer("setSurgeryTreatment") ConceptDetailDTO surgeryTreatment,
+                                 @DataConsumer("setTreatmentPlan") List<TreatmentPlan> treatmentPlanList,
+                                 @DataConsumer("setAdverseReactions") List<AdverseReaction> adverseReactionList) {
+        if (treat == null) {
+            treat = new Treat();
         }
-        treatmentMap.put("commonTreatment", commonTreatment);
-        treatmentMap.put("surgeryTreatment", surgeryTreatment);
-        treatmentMap.put("treatment", drugsList);
-        treatmentMap.put("adverseReactions", adverseReactionList);
+        treat.setCommonTreatment(commonTreatment);
+        treat.setSurgeryTreatment(surgeryTreatment);
+        treat.setTreatmentPlan(treatmentPlanList);
+        treat.setAdverseEvent(adverseReactionList);
 
-        return treatmentMap;
+        return treat;
     }
 
     @DataProvider("setCommonTreatment")
@@ -91,76 +93,87 @@ public class TreatmentAggregate {
         return conceptDetailDTO;
     }
 
-    @DataProvider("setDrugs")
-    public List<MedicitionClass> setDrugs(@InvokeParameter("drugsList") List<MedicitionClass> drugsList,
-                                          @InvokeParameter("conceptMap") Map<String, Map<Long, Concept>> conceptMap,
-                                          @InvokeParameter("hasConDetailMap") Map<String, Map<Long, List<ConceptDetail>>> hasConDetailMap) {
-        if (ListUtil.isNotEmpty(drugsList)) {
-            for (MedicitionClass medicitionClass : drugsList) {
-                if (conceptMap != null
-                        && conceptMap.get(medicitionClass.getBigdrugsName()) != null
-                        && conceptMap.get(medicitionClass
-                        .getBigdrugsName())
-                        .containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()))) {
-                    Concept cateBigConcept = conceptMap
-                            .get(medicitionClass.getBigdrugsName())
-                            .get(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()));
-                    if (cateBigConcept != null) {
-                        medicitionClass.setBigdrugsConceptId(cateBigConcept.getId());
-                        if (hasConDetailMap != null
-                                && hasConDetailMap.get(cateBigConcept.getLibName()) != null
-                                && hasConDetailMap.get(cateBigConcept.getLibName())
-                                .containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()))) {
-                            medicitionClass.setShowInfo("1");
-                        } else {
-                            medicitionClass.setShowInfo("0");
-                        }
-                    }
-                }
-                medicitionClass.setBigdrgusLibType(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey());
-                medicitionClass.setBigdrugsType(ConceptTypeEnum.Drug_Category_Big.getKey());
-                if (conceptMap != null
-                        && conceptMap.get(medicitionClass.getSubdrugsName()) != null
-                        && conceptMap.get(medicitionClass.getSubdrugsName())
-                        .containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey()))) {
-                    Concept cateSmallConcept = conceptMap
-                            .get(medicitionClass.getSubdrugsName())
-                            .get(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey()));
-                    if (cateSmallConcept != null) {
-                        medicitionClass.setSubdrugsConceptId(cateSmallConcept.getId());
-                    }
-                }
-                medicitionClass.setSubdrugsLibType(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey());
-                medicitionClass.setSubdrugsType(ConceptTypeEnum.Drug_Category_Small.getKey());
+    @DataProvider("setTreatmentPlan")
+    public List<TreatmentPlan> setTreatmentPlan(@InvokeParameter("treatmentPlan") List<TreatmentPlan> treatmentPlanList,
+                                                @InvokeParameter("conceptMap") Map<String, Map<Long, Concept>> conceptMap,
+                                                @InvokeParameter("hasConDetailMap") Map<String, Map<Long, List<ConceptDetail>>> hasConDetailMap) {
+        if (ListUtil.isNotEmpty(treatmentPlanList)) {
+            for (TreatmentPlan treatmentPlan : treatmentPlanList) {
+                List<MeditionDetail> meditionDetailList = treatmentPlan.getMeditionDetails();
+                if (ListUtil.isNotEmpty(meditionDetailList)) {
+                    for (MeditionDetail meditionDetail : meditionDetailList) {
+                        //药品推荐
+                        List<MedicitionClass> treatmentDrugList = meditionDetail.getTreatment();
+                        if (ListUtil.isNotEmpty(treatmentDrugList)) {
+                            for (MedicitionClass medicitionClass : treatmentDrugList) {
+                                if (conceptMap != null
+                                        && conceptMap.get(medicitionClass.getBigdrugsName()) != null
+                                        && conceptMap.get(medicitionClass
+                                        .getBigdrugsName())
+                                        .containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()))) {
+                                    Concept cateBigConcept = conceptMap
+                                            .get(medicitionClass.getBigdrugsName())
+                                            .get(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()));
+                                    if (cateBigConcept != null) {
+                                        medicitionClass.setBigdrugsConceptId(cateBigConcept.getId());
+                                        if (hasConDetailMap != null
+                                                && hasConDetailMap.get(cateBigConcept.getLibName()) != null
+                                                && hasConDetailMap.get(cateBigConcept.getLibName())
+                                                .containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()))) {
+                                            medicitionClass.setShowInfo("1");
+                                        } else {
+                                            medicitionClass.setShowInfo("0");
+                                        }
+                                    }
+                                }
+                                medicitionClass.setBigdrgusLibType(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey());
+                                medicitionClass.setBigdrugsType(ConceptTypeEnum.Drug_Category_Big.getKey());
+                                if (conceptMap != null
+                                        && conceptMap.get(medicitionClass.getSubdrugsName()) != null
+                                        && conceptMap.get(medicitionClass.getSubdrugsName())
+                                        .containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey()))) {
+                                    Concept cateSmallConcept = conceptMap
+                                            .get(medicitionClass.getSubdrugsName())
+                                            .get(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey()));
+                                    if (cateSmallConcept != null) {
+                                        medicitionClass.setSubdrugsConceptId(cateSmallConcept.getId());
+                                    }
+                                }
+                                medicitionClass.setSubdrugsLibType(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey());
+                                medicitionClass.setSubdrugsType(ConceptTypeEnum.Drug_Category_Small.getKey());
 
-                LinkedList<Medicition> medicitionList = medicitionClass.getMedicitionsList();
-                for (Medicition medicition : medicitionList) {
-                    if (conceptMap != null
-                            && conceptMap.get(medicition.getMedicitionName()) != null
-                            && conceptMap.get(medicition.getMedicitionName())
-                            .containsKey(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()))) {
-                        Concept drugConcept = conceptMap
-                                .get(medicition.getMedicitionName())
-                                .get(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()));
-                        if (drugConcept != null) {
-                            medicition.setConceptId(drugConcept.getId());
+                                LinkedList<Medicition> medicitionList = medicitionClass.getMedicitionsList();
+                                for (Medicition medicition : medicitionList) {
+                                    if (conceptMap != null
+                                            && conceptMap.get(medicition.getMedicitionName()) != null
+                                            && conceptMap.get(medicition.getMedicitionName())
+                                            .containsKey(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()))) {
+                                        Concept drugConcept = conceptMap
+                                                .get(medicition.getMedicitionName())
+                                                .get(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()));
+                                        if (drugConcept != null) {
+                                            medicition.setConceptId(drugConcept.getId());
+                                        }
+                                    }
+                                    medicition.setLibType(LexiconTypeEnum.DRUGS.getKey());
+                                    medicition.setType(ConceptTypeEnum.Drug.getKey());
+                                    if (hasConDetailMap != null
+                                            && hasConDetailMap.get(medicition.getMedicitionName()) != null
+                                            && hasConDetailMap.get(medicition.getMedicitionName())
+                                            .containsKey(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()))) {
+                                        medicition.setShowInfo("1");
+                                    } else {
+                                        medicition.setShowInfo("0");
+                                    }
+                                }
+                                medicitionClass.setMedicitionsList(medicitionList);
+                            }
                         }
                     }
-                    medicition.setLibType(LexiconTypeEnum.DRUGS.getKey());
-                    medicition.setType(ConceptTypeEnum.Drug.getKey());
-                    if (hasConDetailMap != null
-                            && hasConDetailMap.get(medicition.getMedicitionName()) != null
-                            && hasConDetailMap.get(medicition.getMedicitionName())
-                            .containsKey(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()))) {
-                        medicition.setShowInfo("1");
-                    } else {
-                        medicition.setShowInfo("0");
-                    }
                 }
-                medicitionClass.setMedicitionsList(medicitionList);
             }
         }
-        return drugsList;
+        return treatmentPlanList;
     }
 
     @DataProvider("setAdverseReactions")
@@ -196,4 +209,4 @@ public class TreatmentAggregate {
         }
         return adverseReactionList;
     }
-}
+}

aipt-service/src/main/java/com/diagbot/client/bean/MeditionDetail.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:15
+ */
+@Getter
+@Setter
+public class MeditionDetail {
+    private String description;
+    private List<MedicitionClass> treatment;
+}

aipt-service/src/main/java/com/diagbot/client/bean/ResponseData.java

@@ -1,6 +1,9 @@
 package com.diagbot.client.bean;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.eventbus.AllowConcurrentEvents;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,6 +13,8 @@ import java.util.Map;
 /**
  * Created by fyeman on 2018/2/2.
  */
+@Getter
+@Setter
 public class ResponseData {
     private String participleSymptom = "";
 
@@ -19,107 +24,10 @@ public class ResponseData {
     private List<FeatureRate> labs = new ArrayList<>(10);
     private List<FeatureRate> pacs = new ArrayList<>(10);
     private List<FeatureRate> history = new ArrayList<>(10);
-    private Map<String, JSONObject> treat;   //治疗方案
+    private Treat treat;   //治疗方案
     private Map<String, JSONObject> scale;   //量表内容
     private Map<String, JSONObject> managementEvaluation;   //管理评估
     private List<MedicalIndication> medicalIndications;     //量表和指标项推送
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
-
-
-    public String getParticipleSymptom() {
-        return participleSymptom;
-    }
-
-    public void setParticipleSymptom(String participleSymptom) {
-        this.participleSymptom = participleSymptom;
-    }
-
-    public List<FeatureRate> getSymptom() {
-        return symptom;
-    }
-
-    public void setSymptom(List<FeatureRate> symptom) {
-        this.symptom = symptom;
-    }
-
-    public List<FeatureRate> getVitals() {
-        return vitals;
-    }
-
-    public void setVitals(List<FeatureRate> vitals) {
-        this.vitals = vitals;
-    }
-
-    public List<FeatureRate> getDis() {
-        return dis;
-    }
-
-    public void setDis(List<FeatureRate> dis) {
-        this.dis = dis;
-    }
-
-    public List<FeatureRate> getLabs() {
-        return labs;
-    }
-
-    public void setLabs(List<FeatureRate> labs) {
-        this.labs = labs;
-    }
-
-    public List<FeatureRate> getPacs() {
-        return pacs;
-    }
-
-    public void setPacs(List<FeatureRate> pacs) {
-        this.pacs = pacs;
-    }
-
-    public List<FeatureRate> getHistory() {
-        return history;
-    }
-
-    public void setHistory(List<FeatureRate> history) {
-        this.history = history;
-    }
-
-    public Map<String, JSONObject> getTreat() {
-        return treat;
-    }
-
-    public void setTreat(Map<String, JSONObject> treat) {
-        this.treat = treat;
-    }
-
-    public Map<String, Map<String, String>> getInputs() {
-        return inputs;
-    }
-
-    public void setInputs(Map<String, Map<String, String>> inputs) {
-        this.inputs = inputs;
-    }
-
-    public Map<String, JSONObject> getScale() {
-        return scale;
-    }
-
-    public void setScale(Map<String, JSONObject> scale) {
-        this.scale = scale;
-    }
-
-    public Map<String, JSONObject> getManagementEvaluation() {
-        return managementEvaluation;
-    }
-
-    public void setManagementEvaluation(Map<String, JSONObject> managementEvaluation) {
-        this.managementEvaluation = managementEvaluation;
-    }
-
-    public List<MedicalIndication> getMedicalIndications() {
-        return medicalIndications;
-    }
-
-    public void setMedicalIndications(List<MedicalIndication> medicalIndications) {
-        this.medicalIndications = medicalIndications;
-    }
-}
+}

aipt-service/src/main/java/com/diagbot/client/bean/Treat.java

@@ -0,0 +1,26 @@
+package com.diagbot.client.bean;
+
+import com.diagbot.dto.ConceptDetailDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 15:36
+ */
+@Getter
+@Setter
+public class Treat {
+    private Integer disType;
+    private String diseaseName;
+    private List<AdverseReaction> adverseEvent;//不良反应
+    private List<TreatmentPlan> treatmentPlan;//治疗方案
+    private ConceptDetailDTO commonTreatment; //一般治疗
+    private ConceptDetailDTO surgeryTreatment; //手术治疗
+    private Object followUp;
+    private Map<String, List<Medicition>> drugHistory;
+}

aipt-service/src/main/java/com/diagbot/client/bean/TreatmentPlan.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:14
+ */
+@Getter
+@Setter
+public class TreatmentPlan {
+    private String title;
+    private List<MeditionDetail> meditionDetails;
+}

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.client.bean.ResponseData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.LisResult;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -146,15 +147,14 @@ public class PushFacade {
      * @param searchVo
      * @return
      */
-    public Map<String, Object> getTreatment(SearchVo searchVo) {
+    public Treat getTreatment(SearchVo searchVo) {
         ResponseData data = clinicalFacade.processClinicalData(searchVo);
-        Map<String, JSONObject> treat = data.getTreat();
+        Treat treat = data.getTreat();
         if (StringUtil.isBlank(searchVo.getDiseaseName())) {
             throw new CommonException(CommonErrorCode.PARAM_ERROR, "请输入需获取治疗方案的诊断名称");
         }
-        Map<String, Object> treatmentMap
-                = treatmentFacade.getTreatment(treat, searchVo.getDiseaseName(), searchVo.getDisType());
-        return treatmentMap;
+        treat = treatmentFacade.getTreatment(treat, searchVo.getDiseaseName(), searchVo.getDisType());
+        return treat;
     }
 
     /**

aipt-service/src/main/java/com/diagbot/facade/TreatmentFacade.java

@@ -1,9 +1,11 @@
 package com.diagbot.facade;
 
-import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.bean.AdverseReaction;
 import com.diagbot.client.bean.Medicition;
 import com.diagbot.client.bean.MedicitionClass;
+import com.diagbot.client.bean.MeditionDetail;
+import com.diagbot.client.bean.Treat;
+import com.diagbot.client.bean.TreatmentPlan;
 import com.diagbot.dto.ConceptRes;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptDetail;
@@ -13,7 +15,6 @@ import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.ConceptBaseVO;
 import com.google.common.collect.Lists;
@@ -48,8 +49,9 @@ public class TreatmentFacade {
      * @param
      * @return
      */
-    public Map<String, Object> getTreatment(Map<String, JSONObject> treatmentMap, String diseaseName, Integer disType) {
-        Map<String, Object> retMap = new LinkedHashMap<>();
+    public Treat getTreatment(Treat treat, String diseaseName, Integer disType) {
+        //Map<String, Object> retMap = new LinkedHashMap<>();
+        List<MedicitionClass> drugsList = Lists.newLinkedList();
         List<String> conceptNameList = Lists.newLinkedList();
         conceptNameList.add(diseaseName);
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
@@ -59,54 +61,55 @@ public class TreatmentFacade {
         if (disease == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "诊断不存在");
         }
-        if (treatmentMap == null || treatmentMap.size() == 0) {
+        if (treat == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "未找到治疗方案");
         }
 
         //治疗方案对应诊断
-        retMap.put("diseaseName", diseaseName);
-
-        //获取知识图谱治疗方案
-        /*JSONObject treatmentJson = treatmentMap.get(diseaseName);
-        if (treatmentJson == null || treatmentJson.isEmpty()) {
-            return retMap;
-        }*/
+        treat.setDiseaseName(diseaseName);
 
-        //推荐药物
-        List<MedicitionClass> drugsList = Lists.newLinkedList();
-        if (treatmentMap.get("treatment") != null) {
-            drugsList = FastJsonUtils.getJsonToList(treatmentMap.get("treatment").toJSONString(), MedicitionClass.class);
-        }
+        //推荐治疗方案
+        List<TreatmentPlan> treatmentPlanList = treat.getTreatmentPlan();
         //不良反应
-        List<AdverseReaction> adverseReactionList = Lists.newLinkedList();
-        if (treatmentMap.get("adverseEvent") != null) {
-            adverseReactionList = FastJsonUtils.getJsonToList(treatmentMap.get("adverseEvent").toJSONString(), AdverseReaction.class);
-        }
-        if (ListUtil.isNotEmpty(drugsList)) {
-            //药品大类
-            List<String> cateBigNameList = drugsList
-                    .stream()
-                    .map(drugs -> drugs.getBigdrugsName())
-                    .collect(Collectors.toList());
-            conceptNameList.addAll(cateBigNameList);
-            //药品小类
-            List<String> cateSmallNameList = drugsList
-                    .stream()
-                    .map(drugs -> drugs.getSubdrugsName())
-                    .collect(Collectors.toList());
-            conceptNameList.addAll(cateSmallNameList);
-            //药品
-            List<Medicition> medicitionTotalList = Lists.newLinkedList();
-            for (MedicitionClass medicitionClass : drugsList) {
-                if (medicitionClass.getMedicitionsList() != null) {
-                    medicitionTotalList.addAll(medicitionClass.getMedicitionsList());
+        List<AdverseReaction> adverseReactionList = treat.getAdverseEvent();
+
+        if (ListUtil.isNotEmpty(treatmentPlanList)) {
+            for (TreatmentPlan treatmentPlan : treatmentPlanList) {
+                List<MeditionDetail> meditionDetailList = treatmentPlan.getMeditionDetails();
+                if (ListUtil.isNotEmpty(meditionDetailList)) {
+                    for (MeditionDetail meditionDetail : meditionDetailList) {
+                        //药品推荐
+                        List<MedicitionClass> treatmentDrugList = meditionDetail.getTreatment();
+                        if (ListUtil.isNotEmpty(treatmentDrugList)) {
+                            drugsList.addAll(treatmentDrugList);
+                            //药品大类
+                            List<String> cateBigNameList = treatmentDrugList
+                                    .stream()
+                                    .map(drugs -> drugs.getBigdrugsName())
+                                    .collect(Collectors.toList());
+                            conceptNameList.addAll(cateBigNameList);
+                            //药品小类
+                            List<String> cateSmallNameList = treatmentDrugList
+                                    .stream()
+                                    .map(drugs -> drugs.getSubdrugsName())
+                                    .collect(Collectors.toList());
+                            conceptNameList.addAll(cateSmallNameList);
+                            //药品
+                            List<Medicition> medicitionTotalList = Lists.newLinkedList();
+                            for (MedicitionClass medicitionClass : treatmentDrugList) {
+                                if (medicitionClass.getMedicitionsList() != null) {
+                                    medicitionTotalList.addAll(medicitionClass.getMedicitionsList());
+                                }
+                            }
+                            List<String> drugNameList = medicitionTotalList
+                                    .stream()
+                                    .map(m -> m.getMedicitionName())
+                                    .collect(Collectors.toList());
+                            conceptNameList.addAll(drugNameList);
+                        }
+                    }
                 }
             }
-            List<String> drugNameList = medicitionTotalList
-                    .stream()
-                    .map(m -> m.getMedicitionName())
-                    .collect(Collectors.toList());
-            conceptNameList.addAll(drugNameList);
         }
         if (ListUtil.isNotEmpty(adverseReactionList)) {
             List<String> adNameList = adverseReactionList
@@ -143,33 +146,32 @@ public class TreatmentFacade {
 
         try {
             Map<String, Object> invokeParams = new HashMap<>();
-            invokeParams.put("treatmentMap", retMap);
+            invokeParams.put("treat", treat);
             invokeParams.put("diseaseName", diseaseName);
             invokeParams.put("drugsList", drugsList);
+            invokeParams.put("treatmentPlan", treatmentPlanList);
             invokeParams.put("conceptMap", conceptMap);
             invokeParams.put("hasConDetailMap", hasConDetailMap);
             invokeParams.put("adverseReactionList", adverseReactionList);
             invokeParams.put("isChronic", isChronic);
 
-            retMap
-                    = dataBeanAggregateQueryFacade.get("setTreatmentAll", invokeParams, Map.class);
+            treat = dataBeanAggregateQueryFacade.get("setTreatmentAll", invokeParams, Treat.class);
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
         //判断是否慢病，慢病增加回访时间，上次用药，不良反应
         if (isChronic) {
-            if (retMap == null) {
-                retMap = new LinkedHashMap<>();
+            if (treat == null) {
+                treat = new Treat();
+                treat.setDiseaseName(diseaseName);
             }
+            treat.setDisType(1);
             //慢病，增加回访时间，暂时前端写死， 以后由只是图谱返回
-            retMap.put("followUp", null);
+            treat.setFollowUp(null);
             //上次用药-icss层处理
-            retMap.put("drugHistory", null);
-
-            //单药双药等
-            retMap.put("treatCate", treatmentMap.get(diseaseName).get("treatCate"));
+            treat.setDrugHistory(null);
         }
-        return retMap;
+        return treat;
     }
 
     /**

aipt-service/src/main/java/com/diagbot/web/PushController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
@@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.Map;
 
 /**
  * @Description:推理
@@ -58,8 +58,8 @@ public class PushController {
                     "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/treatment")
     @SysLogger("treatment")
-    public RespDTO<Map<String, Object>> getTreatment(@Valid @RequestBody SearchVo searchVo) {
-        Map<String, Object> data = pushFacade.getTreatment((searchVo));
+    public RespDTO<Treat> getTreatment(@Valid @RequestBody SearchVo searchVo) {
+        Treat data = pushFacade.getTreatment((searchVo));
         return RespDTO.onSuc(data);
     }
 

data-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -3,6 +3,7 @@ package com.diagbot.client;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DisclaimerInformationDTO;
@@ -47,7 +48,7 @@ public interface AiptServiceClient {
      * @return
      */
     @PostMapping("/push/treatment")
-    RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData);
+    RespDTO<Treat> getTreatment(@RequestBody SearchData searchData);
 
     @PostMapping("/disclaimerInformation/getDisclaimerInformations")
     RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();

data-service/src/main/java/com/diagbot/client/bean/AdverseReaction.java

@@ -0,0 +1,23 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description: 不良反应
+ * @Author:zhaops
+ * @time: 2019/3/14 11:14
+ */
+@Getter
+@Setter
+public class AdverseReaction {
+    private Long conceptId;
+    private String name;  //名称
+    private Integer libType;
+    private Integer type;
+    private String showInfo = "0";//是否显示提示信息
+    private Integer controlType; //控件类型
+    private List<AdverseReactionDetail> details;
+}

data-service/src/main/java/com/diagbot/client/bean/AdverseReactionDetail.java

@@ -0,0 +1,16 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 不良反应明细
+ * @Author:zhaops
+ * @time: 2019/3/14 11:19
+ */
+@Getter
+@Setter
+public class AdverseReactionDetail {
+    private String name;
+    private Integer value; //是否选中：0-未选中，1-选中
+}

data-service/src/main/java/com/diagbot/client/bean/Medicition.java

@@ -0,0 +1,28 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:药品信息
+ * @Author:zhaops
+ * @time: 2018/12/17 13:27
+ */
+@Getter
+@Setter
+public class Medicition {
+    private Long conceptId;
+    private String medicitionName;
+    private Integer libType;
+    /**
+     * 1-显示，0-隐藏
+     */
+    private String isShow;
+    private String forbidden;
+    /**
+     * 1-有提示信息，0-没有提示信息
+     */
+    private String showInfo = "0";
+    private String rate;
+    private Integer type;
+}

data-service/src/main/java/com/diagbot/client/bean/MedicitionClass.java

@@ -0,0 +1,27 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.LinkedList;
+
+/**
+ * @Description:药品分类
+ * @Author:zhaops
+ * @time: 2018/12/17 13:32
+ */
+@Getter
+@Setter
+public class MedicitionClass {
+    private String showInfo = "0";
+    private String drugsForbidden;
+    private Long bigdrugsConceptId;//药品分类概念id-大类
+    private String bigdrugsName;//药类名
+    private Integer bigdrgusLibType;
+    private Integer bigdrugsType;
+    private Long subdrugsConceptId;//药品分类概念id-小类
+    private String subdrugsName;//药类名-小类
+    private Integer subdrugsLibType;
+    private Integer subdrugsType;
+    private LinkedList<Medicition> medicitionsList;
+}

data-service/src/main/java/com/diagbot/client/bean/MeditionDetail.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:15
+ */
+@Getter
+@Setter
+public class MeditionDetail {
+    private String description;
+    private List<MedicitionClass> treatment;
+}

data-service/src/main/java/com/diagbot/client/bean/Treat.java

@@ -0,0 +1,26 @@
+package com.diagbot.client.bean;
+
+import com.diagbot.dto.ConceptDetailDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 15:36
+ */
+@Getter
+@Setter
+public class Treat {
+    private Integer disType;
+    private String diseaseName;
+    private List<AdverseReaction> adverseEvent;//不良反应
+    private List<TreatmentPlan> treatmentPlan;//治疗方案
+    private ConceptDetailDTO commonTreatment; //一般治疗
+    private ConceptDetailDTO surgeryTreatment; //手术治疗
+    private Object followUp;
+    private Map<String, List<Medicition>> drugHistory;
+}

data-service/src/main/java/com/diagbot/client/bean/TreatmentPlan.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:14
+ */
+@Getter
+@Setter
+public class TreatmentPlan {
+    private String title;
+    private List<MeditionDetail> meditionDetails;
+}

data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -4,6 +4,7 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.PushDTO;
@@ -50,7 +51,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
      * @return
      */
     @Override
-    public RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData) {
+    public RespDTO<Treat> getTreatment(@RequestBody SearchData searchData) {
         log.error("【hystrix】调用{}异常", "getTreatment");
         return null;
     }

data-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.ConceptPushDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -87,12 +88,11 @@ public class PushFacade {
      * @param pushVO
      * @return
      */
-    public Map<String, Object> pushTreatment(PushVO pushVO) {
+    public Treat pushTreatment(PushVO pushVO) {
         SearchData searchData = assembleFacade.assembleData(pushVO);
-        RespDTO<Map<String, Object>> res = aiptServiceClient.getTreatment(searchData);
-        RespDTOUtil.respNGDealCover(res, "中间层没有返回治疗方案");
-        Map<String, Object> data = res.data;
-        return data;
+        RespDTO<Treat> res = aiptServiceClient.getTreatment(searchData);
+        RespDTOUtil.respNGDeal(res, "中间层没有返回治疗方案");
+        return res.data;
     }
 
     /**
@@ -104,7 +104,7 @@ public class PushFacade {
     public List<ScaleContent> pushScale(PushVO pushVO) {
         SearchData searchData = assembleFacade.assembleData(pushVO);
         RespDTO<List<ScaleContent>> res = aiptServiceClient.getScale(searchData);
-        RespDTOUtil.respNGDealCover(res, "中间层没有返回量表");
+        RespDTOUtil.respNGDeal(res, "中间层没有返回量表");
         List<ScaleContent> data = res.data;
         return data;
     }

data-service/src/main/java/com/diagbot/web/PushController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
@@ -93,7 +94,7 @@ public class PushController {
                     "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
-    public RespDTO<Map<String, Object>> pushTreatment(@RequestBody @Valid PushVO pushVO) {
+    public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
     }
 

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -6,6 +6,7 @@ import com.diagbot.client.bean.ConceptExistVO;
 import com.diagbot.client.bean.DisTypeVO;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptIntroduceDTO;
@@ -154,7 +155,7 @@ public interface AiptServiceClient {
      * @return
      */
     @PostMapping("/push/treatment")
-    RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData);
+    RespDTO<Treat> getTreatment(@RequestBody SearchData searchData);
 
     /**
      * 推理

icss-service/src/main/java/com/diagbot/client/bean/MeditionDetail.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:15
+ */
+@Getter
+@Setter
+public class MeditionDetail {
+    private String description;
+    private List<MedicitionClass> treatment;
+}

icss-service/src/main/java/com/diagbot/client/bean/ResponseData.java

@@ -1,6 +1,8 @@
 package com.diagbot.client.bean;
 
 import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,6 +12,8 @@ import java.util.Map;
 /**
  * Created by fyeman on 2018/2/2.
  */
+@Getter
+@Setter
 public class ResponseData {
     private String participleSymptom = "";
 
@@ -19,107 +23,10 @@ public class ResponseData {
     private List<FeatureRate> labs = new ArrayList<>(10);
     private List<FeatureRate> pacs = new ArrayList<>(10);
     private List<FeatureRate> history = new ArrayList<>(10);
-    private Map<String, JSONObject> treat;   //治疗方案
+    private Treat treat;   //治疗方案
     private Map<String, JSONObject> scale;   //量表内容
     private Map<String, JSONObject> managementEvaluation;   //管理评估
     private List<MedicalIndication> medicalIndications;     //量表和指标项推送
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
-
-
-    public String getParticipleSymptom() {
-        return participleSymptom;
-    }
-
-    public void setParticipleSymptom(String participleSymptom) {
-        this.participleSymptom = participleSymptom;
-    }
-
-    public List<FeatureRate> getSymptom() {
-        return symptom;
-    }
-
-    public void setSymptom(List<FeatureRate> symptom) {
-        this.symptom = symptom;
-    }
-
-    public List<FeatureRate> getVitals() {
-        return vitals;
-    }
-
-    public void setVitals(List<FeatureRate> vitals) {
-        this.vitals = vitals;
-    }
-
-    public List<FeatureRate> getDis() {
-        return dis;
-    }
-
-    public void setDis(List<FeatureRate> dis) {
-        this.dis = dis;
-    }
-
-    public List<FeatureRate> getLabs() {
-        return labs;
-    }
-
-    public void setLabs(List<FeatureRate> labs) {
-        this.labs = labs;
-    }
-
-    public List<FeatureRate> getPacs() {
-        return pacs;
-    }
-
-    public void setPacs(List<FeatureRate> pacs) {
-        this.pacs = pacs;
-    }
-
-    public List<FeatureRate> getHistory() {
-        return history;
-    }
-
-    public void setHistory(List<FeatureRate> history) {
-        this.history = history;
-    }
-
-    public Map<String, JSONObject> getTreat() {
-        return treat;
-    }
-
-    public void setTreat(Map<String, JSONObject> treat) {
-        this.treat = treat;
-    }
-
-    public Map<String, Map<String, String>> getInputs() {
-        return inputs;
-    }
-
-    public void setInputs(Map<String, Map<String, String>> inputs) {
-        this.inputs = inputs;
-    }
-
-    public Map<String, JSONObject> getScale() {
-        return scale;
-    }
-
-    public void setScale(Map<String, JSONObject> scale) {
-        this.scale = scale;
-    }
-
-    public Map<String, JSONObject> getManagementEvaluation() {
-        return managementEvaluation;
-    }
-
-    public void setManagementEvaluation(Map<String, JSONObject> managementEvaluation) {
-        this.managementEvaluation = managementEvaluation;
-    }
-
-    public List<MedicalIndication> getMedicalIndications() {
-        return medicalIndications;
-    }
-
-    public void setMedicalIndications(List<MedicalIndication> medicalIndications) {
-        this.medicalIndications = medicalIndications;
-    }
 }

icss-service/src/main/java/com/diagbot/client/bean/Treat.java

@@ -0,0 +1,26 @@
+package com.diagbot.client.bean;
+
+import com.diagbot.dto.ConceptDetailDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 15:36
+ */
+@Getter
+@Setter
+public class Treat {
+    private Integer disType;
+    private String diseaseName;
+    private List<AdverseReaction> adverseEvent;//不良反应
+    private List<TreatmentPlan> treatmentPlan;//治疗方案
+    private ConceptDetailDTO commonTreatment; //一般治疗
+    private ConceptDetailDTO surgeryTreatment; //手术治疗
+    private Object followUp;
+    private Map<String, List<Medicition>> drugHistory;
+}

icss-service/src/main/java/com/diagbot/client/bean/TreatmentPlan.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:14
+ */
+@Getter
+@Setter
+public class TreatmentPlan {
+    private String title;
+    private List<MeditionDetail> meditionDetails;
+}

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -7,6 +7,7 @@ import com.diagbot.client.bean.ConceptExistVO;
 import com.diagbot.client.bean.DisTypeVO;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;
@@ -188,7 +189,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
      * @return
      */
     @Override
-    public RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData) {
+    public RespDTO<Treat> getTreatment(@RequestBody SearchData searchData) {
         log.error("【hystrix】调用{}异常", "getTreatment");
         return null;
     }

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.RespDTO;
@@ -72,8 +73,8 @@ public class PushFacade {
      * @param searchData
      * @return
      */
-    public Map<String, Object> getTreatment(SearchData searchData) {
-        RespDTO<Map<String, Object>> res = aiptServiceClient.getTreatment(searchData);
+    public Treat getTreatment(SearchData searchData) {
+        RespDTO<Treat> res = aiptServiceClient.getTreatment(searchData);
         RespDTOUtil.respNGDealCover(res, "中间层没有返回治疗方案");
         return res.data;
     }
@@ -137,9 +138,9 @@ public class PushFacade {
      * @param pushVO
      * @return
      */
-    public Map<String, Object> pushTreatment(PushVO pushVO) {
+    public Treat pushTreatment(PushVO pushVO) {
         SearchData searchData = assembleFacade.assembleData(pushVO);
-        Map<String, Object> data = getTreatment(searchData);
+        Treat data = getTreatment(searchData);
         data = treatmentFacade.getTreatment(data, pushVO.getPatientId());
         return data;
     }

icss-service/src/main/java/com/diagbot/facade/TreatmentFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.DisTypeVO;
 import com.diagbot.client.bean.Medicition;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.InquiryDrug;
 import com.diagbot.entity.InquiryInfo;
@@ -46,18 +47,14 @@ public class TreatmentFacade {
      * @param
      * @return
      */
-    public Map<String, Object> getTreatment(Map<String, Object> map, Long patientId) {
-        Map<String, Object> retMap = map;
+    public Treat getTreatment(Treat treat, Long patientId) {
         //慢病 上次用药处理
-        if (map.containsKey("drugHistory")) {
-            //上次用药
-            if (patientId == null) {
-                retMap.put("drugHistory", null);
-            } else {
-                retMap.put("drugHistory", getDrugHistory(patientId));
-            }
+        if (treat.getDisType() != null && treat.getDisType().equals(1) && patientId != null) {
+            treat.setDrugHistory(getDrugHistory(patientId));
+        } else {
+            treat.setDrugHistory(null);
         }
-        return retMap;
+        return treat;
     }
 
 

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.RespDTO;
@@ -101,7 +102,7 @@ public class PushController {
                     "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
-    public RespDTO<Map<String, Object>> pushTreatment(@RequestBody @Valid PushVO pushVO) {
+    public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
     }
 

ltapi-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -3,6 +3,7 @@ package com.diagbot.client;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.PushDTO;
@@ -39,7 +40,7 @@ public interface AiptServiceClient {
      * @return
      */
     @PostMapping("/push/treatment")
-    RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData);
+    RespDTO<Treat> getTreatment(@RequestBody SearchData searchData);
 
     /**
      * 计算接口-量表/公式

ltapi-service/src/main/java/com/diagbot/client/bean/AdverseReaction.java

@@ -0,0 +1,23 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description: 不良反应
+ * @Author:zhaops
+ * @time: 2019/3/14 11:14
+ */
+@Getter
+@Setter
+public class AdverseReaction {
+    private Long conceptId;
+    private String name;  //名称
+    private Integer libType;
+    private Integer type;
+    private String showInfo = "0";//是否显示提示信息
+    private Integer controlType; //控件类型
+    private List<AdverseReactionDetail> details;
+}

ltapi-service/src/main/java/com/diagbot/client/bean/AdverseReactionDetail.java

@@ -0,0 +1,16 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 不良反应明细
+ * @Author:zhaops
+ * @time: 2019/3/14 11:19
+ */
+@Getter
+@Setter
+public class AdverseReactionDetail {
+    private String name;
+    private Integer value; //是否选中：0-未选中，1-选中
+}

ltapi-service/src/main/java/com/diagbot/client/bean/Medicition.java

@@ -0,0 +1,28 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:药品信息
+ * @Author:zhaops
+ * @time: 2018/12/17 13:27
+ */
+@Getter
+@Setter
+public class Medicition {
+    private Long conceptId;
+    private String medicitionName;
+    private Integer libType;
+    /**
+     * 1-显示，0-隐藏
+     */
+    private String isShow;
+    private String forbidden;
+    /**
+     * 1-有提示信息，0-没有提示信息
+     */
+    private String showInfo = "0";
+    private String rate;
+    private Integer type;
+}

ltapi-service/src/main/java/com/diagbot/client/bean/MedicitionClass.java

@@ -0,0 +1,27 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.LinkedList;
+
+/**
+ * @Description:药品分类
+ * @Author:zhaops
+ * @time: 2018/12/17 13:32
+ */
+@Getter
+@Setter
+public class MedicitionClass {
+    private String showInfo = "0";
+    private String drugsForbidden;
+    private Long bigdrugsConceptId;//药品分类概念id-大类
+    private String bigdrugsName;//药类名
+    private Integer bigdrgusLibType;
+    private Integer bigdrugsType;
+    private Long subdrugsConceptId;//药品分类概念id-小类
+    private String subdrugsName;//药类名-小类
+    private Integer subdrugsLibType;
+    private Integer subdrugsType;
+    private LinkedList<Medicition> medicitionsList;
+}

ltapi-service/src/main/java/com/diagbot/client/bean/MeditionDetail.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:15
+ */
+@Getter
+@Setter
+public class MeditionDetail {
+    private String description;
+    private List<MedicitionClass> treatment;
+}

ltapi-service/src/main/java/com/diagbot/client/bean/Treat.java

@@ -0,0 +1,26 @@
+package com.diagbot.client.bean;
+
+import com.diagbot.dto.ConceptDetailDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 15:36
+ */
+@Getter
+@Setter
+public class Treat {
+    private Integer disType;
+    private String diseaseName;
+    private List<AdverseReaction> adverseEvent;//不良反应
+    private List<TreatmentPlan> treatmentPlan;//治疗方案
+    private ConceptDetailDTO commonTreatment; //一般治疗
+    private ConceptDetailDTO surgeryTreatment; //手术治疗
+    private Object followUp;
+    private Map<String, List<Medicition>> drugHistory;
+}

ltapi-service/src/main/java/com/diagbot/client/bean/TreatmentPlan.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/21 11:14
+ */
+@Getter
+@Setter
+public class TreatmentPlan {
+    private String title;
+    private List<MeditionDetail> meditionDetails;
+}

ltapi-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -4,6 +4,7 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -43,7 +44,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
      * @return
      */
     @Override
-    public RespDTO<Map<String, Object>> getTreatment(@RequestBody SearchData searchData) {
+    public RespDTO<Treat> getTreatment(@RequestBody SearchData searchData) {
         log.error("【hystrix】调用{}异常", "getTreatment");
         return null;
     }

ltapi-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ScaleContent;
 import com.diagbot.client.bean.SearchData;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.ConceptPushDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -15,7 +16,6 @@ import org.springframework.stereotype.Component;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -87,12 +87,11 @@ public class PushFacade {
      * @param pushVO
      * @return
      */
-    public Map<String, Object> pushTreatment(PushVO pushVO) {
+    public Treat pushTreatment(PushVO pushVO) {
         SearchData searchData = assembleFacade.assembleData(pushVO);
-        RespDTO<Map<String, Object>> res = aiptServiceClient.getTreatment(searchData);
-        RespDTOUtil.respNGDealCover(res, "中间层没有返回治疗方案");
-        Map<String, Object> data = res.data;
-        return data;
+        RespDTO<Treat> res = aiptServiceClient.getTreatment(searchData);
+        RespDTOUtil.respNGDeal(res, "中间层没有返回治疗方案");
+        return res.data;
     }
 
     /**

ltapi-service/src/main/java/com/diagbot/web/PushController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
@@ -94,7 +95,7 @@ public class PushController {
                     "otherOrder：其他下单项，多项用分号隔开,String<br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
-    public RespDTO<Map<String, Object>> pushTreatment(@RequestBody @Valid PushVO pushVO) {
+    public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
     }
 

triage-service/src/main/java/com/diagbot/client/bean/ResponseData.java

@@ -1,5 +1,8 @@
 package com.diagbot.client.bean;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -8,6 +11,8 @@ import java.util.Map;
 /**
  * Created by fyeman on 2018/2/2.
  */
+@Getter
+@Setter
 public class ResponseData {
     private String participleSymptom = "";
 
@@ -18,60 +23,4 @@ public class ResponseData {
     private List<FeatureRate> pacs = new ArrayList<>(10);
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
-
-    public String getParticipleSymptom() {
-        return participleSymptom;
-    }
-
-    public void setParticipleSymptom(String participleSymptom) {
-        this.participleSymptom = participleSymptom;
-    }
-
-    public List<FeatureRate> getSymptom() {
-        return symptom;
-    }
-
-    public void setSymptom(List<FeatureRate> symptom) {
-        this.symptom = symptom;
-    }
-
-    public List<FeatureRate> getVitals() {
-        return vitals;
-    }
-
-    public void setVitals(List<FeatureRate> vitals) {
-        this.vitals = vitals;
-    }
-
-    public List<FeatureRate> getDis() {
-        return dis;
-    }
-
-    public void setDis(List<FeatureRate> dis) {
-        this.dis = dis;
-    }
-
-    public List<FeatureRate> getLabs() {
-        return labs;
-    }
-
-    public void setLabs(List<FeatureRate> labs) {
-        this.labs = labs;
-    }
-
-    public List<FeatureRate> getPacs() {
-        return pacs;
-    }
-
-    public void setPacs(List<FeatureRate> pacs) {
-        this.pacs = pacs;
-    }
-
-    public Map<String, Map<String, String>> getInputs() {
-        return inputs;
-    }
-
-    public void setInputs(Map<String, Map<String, String>> inputs) {
-        this.inputs = inputs;
-    }
 }