推理接口入参整理

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

@@ -2,13 +2,13 @@ package com.diagbot.aggregate;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.diagbot.biz.push.entity.FeatureRate;
+import com.diagbot.biz.push.entity.MedicalIndication;
+import com.diagbot.biz.push.entity.MedicalIndicationDetail;
+import com.diagbot.biz.push.entity.ResponseData;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.CalculateData;
-import com.diagbot.client.bean.FeatureRate;
 import com.diagbot.client.bean.HosCodeVO;
-import com.diagbot.client.bean.MedicalIndication;
-import com.diagbot.client.bean.MedicalIndicationDetail;
-import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.ConceptPushDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;

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

@@ -1,17 +1,16 @@
 package com.diagbot.aggregate;
 
-import com.diagbot.dto.LisResult;
-import com.diagbot.dto.PacsResult;
-import com.diagbot.enums.FeatureTypeEnum;
-import com.diagbot.enums.SysTypeEnum;
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Lis;
+import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.biz.push.entity.SearchData;
+import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.facade.TransferFacade;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.SearchVo;
+import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -28,133 +27,191 @@ public class SearchItemAggregate {
     private TransferFacade transferFacade;
 
     @DataProvider("assembleSearchData")
-    public SearchVo assembleSearchData(@InvokeParameter("searchVo") SearchVo searchVo,
-                                       @InvokeParameter("isConnect") Boolean isConnect,
-                                       @DataConsumer("setLisArr") List<LisResult> lisArr,
-                                       @DataConsumer("setPacsStr") String pacs,
-                                       @DataConsumer("setDiag") String diag,
-                                       @DataConsumer("setDiseaseName") String diseaseName,
-                                       @DataConsumer("setLisOrder") String lisOrder,
-                                       @DataConsumer("setPacsOrder") String pacsOrder) {
+    public SearchData assembleSearchData(@InvokeParameter("searchData") SearchData searchData,
+                                         @InvokeParameter("isConnect") Boolean isConnect,
+                                         @DataConsumer("setLis") List<Lis> lis,
+                                         @DataConsumer("setPacs") List<Pacs> pacs,
+                                         @DataConsumer("setDiag") List<Item> diag,
+                                         @DataConsumer("setDrug") List<Item> drug,
+                                         @DataConsumer("setLisOrder") List<Lis> lisOrder,
+                                         @DataConsumer("setPacsOrder") List<Pacs> pacsOrder,
+                                         @DataConsumer("setDiagOrder") List<Item> diagOrder,
+                                         @DataConsumer("setDrugOrder") List<Item> drugOrder,
+                                         @DataConsumer("setOperationOrder") List<Item> operationOrder,
+                                         @DataConsumer("setOtherOrder") List<Item> otherOrder,
+                                         @DataConsumer("setDiseaseName") Item diseaseName
+    ) {
         if (isConnect) {
-            //化验转公表项处理
-            searchVo.setLisArr(lisArr);
-            //下面转换仅限数据引擎模式
-            if (searchVo.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
-                //辅检预处理
-                searchVo.setPacs(pacs);
-                //诊断预处理
-                searchVo.setDiag(diag);
-                //治疗方案诊断转换
-                searchVo.setDiseaseName(diseaseName);
-                //化验开单项
-                searchVo.setLisOrder(lisOrder);
-                //辅检开单项
-                searchVo.setPacsOrder(pacsOrder);
-            }
+            //化验数据映射公表（化验公表项）
+            searchData.setLis(lis);
+            //辅检数据映射公表（辅检项目）
+            searchData.setPacs(pacs);
+            //诊断数据映射公表（诊断）
+            searchData.setDiag(diag);
+            //药品数据映射公表（药品通用名）
+            searchData.setDrug(drug);
+            //化验开单项映射
+            searchData.setLisOrder(lisOrder);
+            //辅检开单项映射
+            searchData.setPacsOrder(pacsOrder);
+            //诊断开单项映射
+            searchData.setDiagOrder(diagOrder);
+            //药品开单项映射
+            searchData.setDrugOrder(drugOrder);
+            //手术开单项映射
+            searchData.setOperationOrder(operationOrder);
+            //其他开单项映射
+            searchData.setOtherOrder(otherOrder);
+            //选中诊断映射
+            searchData.setDiseaseName(diseaseName);
         }
-        return searchVo;
+        return searchData;
     }
 
     /**
      * 化验增加公表项
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    @DataProvider("setLisArr")
-    public List<LisResult> setLisArr(@InvokeParameter("searchVo") SearchVo searchVo) {
-        List<LisResult> lisArr = searchVo.getLisArr();
-        lisArr = transferFacade.addLisUniqueName(lisArr, searchVo.getHosCode());
-        return lisArr;
+    @DataProvider("setLis")
+    public List<Lis> setLis(@InvokeParameter("searchData") SearchData searchData) {
+        List<Lis> lis = searchData.getLis();
+        lis = transferFacade.addLisUniqueName(lis, searchData.getHosCode());
+        return lis;
     }
 
     /**
-     * 辅检转内部项目名称
+     * 辅检增加公表项
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    @DataProvider("setPacsStr")
-    public String setPacsStr(@InvokeParameter("searchVo") SearchVo searchVo) {
-        String pacs = "";
-        if (StringUtil.isNotBlank(searchVo.getPacs())) {
-            pacs += searchVo.getPacs() + ";";
-        }
-        List<PacsResult> pacsArr = searchVo.getPacsArr();
-        if (ListUtil.isNotEmpty(pacsArr)) {
-            List<PacsResult> convertPacsArr = transferFacade.addPacsUniqueName(pacsArr, searchVo.getHosCode());
-            for (PacsResult pacsResult : convertPacsArr) {
-                String pacsResultString = "";
-                if (StringUtils.isNotBlank(pacsResult.getUniqueName())) {
-                    pacsResultString = pacsResult.getUniqueName() + ":";
-                } else {
-                    pacsResultString = pacsResult.getName() + ":";
-                }
-                pacsResultString += pacsResult.getResult() + ";";
-                pacs += pacsResultString;
-            }
-        }
+    @DataProvider("setPacs")
+    public List<Pacs> setPacs(@InvokeParameter("searchData") SearchData searchData) {
+        List<Pacs> pacs = searchData.getPacs();
+        pacs = transferFacade.addPacsUniqueName(pacs, searchData.getHosCode());
         return pacs;
     }
 
     /**
-     * 诊断转内部名称
+     * 诊断增加公表项
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
     @DataProvider("setDiag")
-    public String setDiag(@InvokeParameter("searchVo") SearchVo searchVo) {
-        String diag = "";
-        if (StringUtil.isNotBlank(searchVo.getDiag())) {
-            diag = transferFacade.strConvert(searchVo.getDiag(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Disease.getKey());
-        }
+    public List<Item> setDiag(@InvokeParameter("searchData") SearchData searchData) {
+        List<Item> diag = searchData.getDiag();
+        diag = transferFacade.addItemUniqueName(diag, ConceptTypeEnum.Disease.getKey(), searchData.getHosCode());
         return diag;
     }
 
     /**
-     * 获取治疗方案诊断转内部名称
+     * 药品增加公表项
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    @DataProvider("setDiseaseName")
-    public String setDiseaseName(@InvokeParameter("searchVo") SearchVo searchVo) {
-        String diseaseName = "";
-        if (StringUtil.isNotBlank(searchVo.getDiseaseName())) {
-            diseaseName = transferFacade.strConvert(searchVo.getDiseaseName(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Disease.getKey());
-        }
-        return diseaseName;
+    @DataProvider("setDrug")
+    public List<Item> setDrug(@InvokeParameter("searchData") SearchData searchData) {
+        List<Item> drug = searchData.getDrug();
+        drug = transferFacade.addItemUniqueName(drug, ConceptTypeEnum.Drug.getKey(), searchData.getHosCode());
+        return drug;
     }
 
     /**
-     * 化验开单项映射公表名称
+     * 化验开单项增加公表名称
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
     @DataProvider("setLisOrder")
-    public String setLisOrder(@InvokeParameter("searchVo") SearchVo searchVo) {
-        String lisOrder = "";
-        if (StringUtil.isNotBlank(searchVo.getLisOrder())) {
-            lisOrder = transferFacade.strConvert(searchVo.getLisOrder(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Lis.getKey());
-        }
+    public List<Lis> setLisOrder(@InvokeParameter("searchData") SearchData searchData) {
+        List<Lis> lisOrder = searchData.getLisOrder();
+        lisOrder = transferFacade.addLisUniqueName(lisOrder, searchData.getHosCode());
         return lisOrder;
     }
 
     /**
-     * 辅检开单项转内部项目名称
+     * 辅检开单项增加公表项
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
     @DataProvider("setPacsOrder")
-    public String setPacsOrder(@InvokeParameter("searchVo") SearchVo searchVo) {
-        String pacsOrder = "";
-        if (StringUtil.isNotBlank(searchVo.getPacsOrder())) {
-            pacsOrder = transferFacade.strConvert(searchVo.getPacsOrder(), searchVo.getHosCode(), FeatureTypeEnum.Feature_Type_Pacs.getKey());
-        }
+    public List<Pacs> setPacsOrder(@InvokeParameter("searchData") SearchData searchData) {
+        List<Pacs> pacsOrder = searchData.getPacsOrder();
+        pacsOrder = transferFacade.addPacsUniqueName(pacsOrder, searchData.getHosCode());
         return pacsOrder;
     }
+
+    /**
+     * 诊断开单项增加公表项
+     *
+     * @param searchData
+     * @return
+     */
+    @DataProvider("setDiagOrder")
+    public List<Item> setDiagOrder(@InvokeParameter("searchData") SearchData searchData) {
+        List<Item> diagOrder = searchData.getDiagOrder();
+        diagOrder = transferFacade.addItemUniqueName(diagOrder, ConceptTypeEnum.Disease.getKey(), searchData.getHosCode());
+        return diagOrder;
+    }
+
+    /**
+     * 药品开单项增加公表项
+     *
+     * @param searchData
+     * @return
+     */
+    @DataProvider("setDrugOrder")
+    public List<Item> setDrugOrder(@InvokeParameter("searchData") SearchData searchData) {
+        List<Item> drugOrder = searchData.getDrugOrder();
+        drugOrder = transferFacade.addItemUniqueName(drugOrder, ConceptTypeEnum.Drug.getKey(), searchData.getHosCode());
+        return drugOrder;
+    }
+
+    /**
+     * 手术开单项增加公表项
+     *
+     * @param searchData
+     * @return
+     */
+    @DataProvider("setOperationOrder")
+    public List<Item> setOperationOrder(@InvokeParameter("searchData") SearchData searchData) {
+        List<Item> operationOrder = searchData.getOperationOrder();
+        operationOrder = transferFacade.addItemUniqueName(operationOrder, ConceptTypeEnum.OPERATION.getKey(), searchData.getHosCode());
+        return operationOrder;
+    }
+
+    /**
+     * 其他开单项增加公表项（暂未处理）
+     *
+     * @param searchData
+     * @return
+     */
+    @DataProvider("setOtherOrder")
+    public List<Item> setOtherOrder(@InvokeParameter("searchData") SearchData searchData) {
+        List<Item> operationOrder = searchData.getOperationOrder();
+        return operationOrder;
+    }
+
+    /**
+     * 诊断开单项增加公表项
+     *
+     * @param searchData
+     * @return
+     */
+    @DataProvider("setDiseaseName")
+    public Item setDiseaseName(@InvokeParameter("searchData") SearchData searchData) {
+        List<Item> diseaseItem = Lists.newLinkedList();
+        diseaseItem.add(searchData.getDiseaseName());
+        diseaseItem = transferFacade.addItemUniqueName(diseaseItem, ConceptTypeEnum.Disease.getKey(), searchData.getHosCode());
+        if (ListUtil.isNotEmpty(diseaseItem)) {
+            return diseaseItem.get(0);
+        } else {
+            return null;
+        }
+    }
 }

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

@@ -1,12 +1,12 @@
 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.biz.push.entity.AdverseReaction;
+import com.diagbot.biz.push.entity.ConceptDetailDTO;
+import com.diagbot.biz.push.entity.Medicition;
+import com.diagbot.biz.push.entity.MedicitionClass;
+import com.diagbot.biz.push.entity.MeditionDetail;
+import com.diagbot.biz.push.entity.Treat;
+import com.diagbot.biz.push.entity.TreatmentPlan;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.enums.ConceptTypeEnum;

aipt-service/src/main/java/com/diagbot/client/AIServiceClient.java

@@ -1,10 +1,10 @@
 package com.diagbot.client;
 
+import com.diagbot.biz.push.entity.ResponseData;
+import com.diagbot.biz.push.entity.SearchData;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.hystrix.AIServiceHystrix;
-import com.diagbot.vo.SearchVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,20 +21,20 @@ public interface AIServiceClient {
     /**
      * 推理
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
     @PostMapping(value = "/push-web/algorithm/neural")
-    Response<ResponseData> bayesPageData(@RequestBody SearchVo searchVo);
+    Response<ResponseData> bayesPageData(@RequestBody SearchData searchData);
 
     /**
      * 量表推理
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
     @PostMapping(value = "/push-web/graph/scale")
-    Map<String, Object> scale(@RequestBody SearchVo searchVo);
+    Map<String, Object> scale(@RequestBody SearchData searchData);
 
     /**
      * 计算接口

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

@@ -1,23 +0,0 @@
-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;
-}

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

@@ -1,16 +0,0 @@
-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-选中
-}

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

@@ -1,43 +1,16 @@
 package com.diagbot.client.bean;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * Created by fyeman on 2018/1/17.
  */
+@Getter
+@Setter
 public class FeatureRate {
     private String featureName;
     private String extraProperty;
     private String desc;
     private String rate;
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public String getRate() {
-        return rate;
-    }
-
-    public void setRate(String rate) {
-        this.rate = rate;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public String getExtraProperty() {
-        return extraProperty;
-    }
-
-    public void setExtraProperty(String extraProperty) {
-        this.extraProperty = extraProperty;
-    }
-}
+}

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

@@ -1,22 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-
-/**
- * @Description:推送指标
- * @Author:zhaops
- * @time: 2019/3/14 14:40
- */
-@Getter
-@Setter
-public class MedicalIndication {
-    private Long conceptId;
-    private Integer libType;
-    private Integer type;
-    private String name;
-    private List<MedicalIndicationDetail> details;
-}

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

@@ -1,17 +0,0 @@
-package com.diagbot.client.bean;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:推送指标明细
- * @Author:zhaops
- * @time: 2019/4/11 10:15
- */
-@Getter
-@Setter
-public class MedicalIndicationDetail {
-    private Integer type; //1-量表，2-公式，3-其他指标，4-危机值
-    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""} ,controlType:0-radio,1-checkbox,2-text,3-dropdownlist
-}

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

@@ -1,28 +0,0 @@
-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;
-}

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

@@ -1,27 +0,0 @@
-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;
-}

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

@@ -1,18 +0,0 @@
-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,7 +1,8 @@
 package com.diagbot.client.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.google.common.eventbus.AllowConcurrentEvents;
+import com.diagbot.biz.push.entity.MedicalIndication;
+import com.diagbot.biz.push.entity.Treat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,6 +14,7 @@ import java.util.Map;
 /**
  * Created by fyeman on 2018/2/2.
  */
+/*
 @Getter
 @Setter
 public class ResponseData {
@@ -30,4 +32,4 @@ public class ResponseData {
     private List<MedicalIndication> medicalIndications;     //量表和指标项推送
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
-}
+}*/

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

@@ -12,6 +12,7 @@ import java.util.Map;
 /**
  * Created by fyeman on 2018/1/31.
  */
+/*
 @Getter
 @Setter
 public class SearchData {
@@ -64,4 +65,4 @@ public class SearchData {
     private List<Feature> pacsFeatureList = new ArrayList<>();
     private List<Feature> diagFeatureList = new ArrayList<>();
     private List<Feature> symptompropertyFeatureList = new ArrayList<>();
-}
+}*/

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

@@ -1,26 +0,0 @@
-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/hystrix/AIServiceHystrix.java

@@ -1,10 +1,10 @@
 package com.diagbot.client.hystrix;
 
+import com.diagbot.biz.push.entity.ResponseData;
+import com.diagbot.biz.push.entity.SearchData;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
-import com.diagbot.vo.SearchVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,11 +22,11 @@ public class AIServiceHystrix implements AIServiceClient {
     /**
      * 推理
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
     @Override
-    public Response<ResponseData> bayesPageData(SearchVo searchVo) {
+    public Response<ResponseData> bayesPageData(SearchData searchData) {
         log.error("【hystrix】调用{}异常", "bayesPageData");
         return null;
     }
@@ -34,11 +34,11 @@ public class AIServiceHystrix implements AIServiceClient {
     /**
      * 量表推理
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
     @Override
-    public Map<String, Object> scale(@RequestBody SearchVo searchVo) {
+    public Map<String, Object> scale(@RequestBody SearchData searchData) {
         log.error("【hystrix】调用{}异常", "scale");
         return null;
     }

aipt-service/src/main/java/com/diagbot/dto/PushDTO.java

@@ -1,6 +1,7 @@
 package com.diagbot.dto;
 
-import com.diagbot.client.bean.MedicalIndication;
+import com.diagbot.biz.push.entity.MedicalIndication;
+import com.diagbot.biz.push.entity.Treat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,4 +25,5 @@ public class PushDTO {
     private Map<String, List<ConceptPushDTO>> dis;
     private ConceptPushDTO dept;
     private List<MedicalIndication> medicalIndications;
+    private Treat treat;
 }

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

@@ -1,26 +1,20 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
+import com.diagbot.biz.push.entity.ResponseData;
+import com.diagbot.biz.push.entity.SearchData;
 import com.diagbot.client.AIServiceClient;
-import com.diagbot.client.NLPServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
-import com.diagbot.dto.Lexeme;
-import com.diagbot.dto.LisResult;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.enums.ScaleTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.ScaleContentService;
-import com.diagbot.util.ListUtil;
-import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -39,110 +33,47 @@ public class ClinicalFacade {
     private AIServiceClient aiServiceClient;
     @Autowired
     private ScaleContentService scaleContentService;
-    @Autowired
-    private NLPServiceClient nlpServiceClient;
-
-    @Autowired
-    private ConceptFacade conceptFacade;
-
-    private static String up = "升高";
-    private static String down = "降低";
-    private static String normal = "正常";
-
-    private static String pos = "阳性";
-    private static String neg = "阴性";
-
-    //    private static Map<String, List<Map<String, String>>> standWordObj = null;
 
     /**
      * 处理临床数据
      *
-     * @param searchVo
+     * @param searchData
      * @return ResponseData
      */
-    public ResponseData processClinicalData(@RequestBody SearchVo searchVo) {
-        SearchVo sData = searchVo;
-        //        Map<String, List<Map<String, String>>> standWord = getStandWord();
-        //        //        standWordObj = getStandWord();
-        //        Response<List<Lexeme>> resp = nlpServiceClient.split(sData.getSymptom());
-        //        if (null != resp && null != resp.getData()) {
-        //            addStandWord(resp.getData(), standWord, sData);
-        //        }
-
-        // sData.setLisArr(processLis(sData.getLisArr()));
-
-        /*if (ListUtil.isNotEmpty(sData.getLisArr())) {
-            List<String> otherVal = sData.getLisArr().stream().map(lisArr -> lisArr.getOtherValue()).collect(Collectors.toList());
-            sData.setLis(String.join(",", otherVal));
-        }*/
-
-        Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
+    public ResponseData processClinicalData(@RequestBody SearchData searchData) {
+        Response<ResponseData> res = aiServiceClient.bayesPageData(searchData);
         if (res == null || res.getData() == null) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "AI没有返回结果");
         }
-
         return res.getData();
     }
 
-    private List<LisResult> processLis(List<LisResult> lisArr) {
-        if (ListUtil.isEmpty(lisArr)) {
-            return lisArr;
-        }
-
-        String Otherval = "";
-
-        for (int i = 0; i < lisArr.size(); i++) {
-            LisResult lisres = lisArr.get(i);
-
-            Otherval = (lisres.getOtherValue().trim().length() > 0) ? lisres.getOtherValue().trim() + "\n" : "";
-            Otherval = lisres.getOtherValue();
-
-            if (Otherval.indexOf(pos) >= 0 || Otherval.indexOf(neg) >= 0) {
-                lisres.setOtherValue(lisres.getUniqueName() + Otherval);
-            } else {
-                Otherval = (Otherval.trim().length() > 0) ? Otherval.trim() + "\n" : "";
-                if (lisres.getValue() == null) {
-                    continue;
-                } else if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
-                    lisres.setOtherValue(Otherval + lisres.getUniqueName() + up);
-                } else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
-                    lisres.setOtherValue(Otherval + lisres.getUniqueName() + down);
-                } else {
-                    lisres.setOtherValue(Otherval + lisres.getUniqueName() + normal);
-                }
-            }
-        }
-
-        return lisArr;
-    }
-
     /**
-     * 获取量表内容
+     * 获取量表动态内容
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    public Map<String, Object> scale(SearchVo searchVo) {
-        Map<String, Object> response = aiServiceClient.scale(searchVo);
+    public Map<String, Object> scale(SearchData searchData) {
+        Map<String, Object> response = aiServiceClient.scale(searchData);
         if (null == response) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "量表没有返回结果");
         }
         return response;
     }
 
-
     /**
-     * 获取量表内容
+     * 获取量表全文
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    public List<ScaleContent> getScale(SearchVo searchVo) {
-        Map<String, Object> response = aiServiceClient.scale(searchVo);
+    public List<ScaleContent> getScale(SearchData searchData) {
+        Map<String, Object> response = aiServiceClient.scale(searchData);
         if (null == response) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "量表没有返回结果");
         }
-        List<ScaleContent> list = getContent(searchVo.getScaleName(), JSON.toJSONString(response));
+        List<ScaleContent> list = getContent(searchData.getScaleName(), JSON.toJSONString(response));
         return list;
     }
 
@@ -170,237 +101,4 @@ public class ClinicalFacade {
         }
         return response;
     }
-
-    public SearchVo addStandWord(List<Lexeme> lexemes, Map<String, List<Map<String, String>>> standWords, SearchVo sData) {
-        List<Lexeme> feature = new ArrayList<>();
-        //收集分词结果中体征指标或体征指标值（数字）
-        for (int i = 0; i < lexemes.size(); i++) {
-            if (lexemes.get(i).getProperty().contains("33") || lexemes.get(i).getProperty().contains("28")
-                    || lexemes.get(i).getProperty().contains("2") || lexemes.get(i).getProperty().contains("9")
-            ) {
-                feature.add(lexemes.get(i));
-            }
-        }
-        //根据收集到的分词结果把体征指标和对应体征指标值（数字）拼接
-        List<String> featureType = new ArrayList<>();
-        for (int i = 0; i < feature.size(); i++) {
-            boolean featureTypeState = true;
-            if (i < feature.size() - 2) {
-                if ((feature.get(i).getProperty().contains("33") && feature.get(i + 1).getProperty().contains("28")
-                        && feature.get(i + 2).getProperty().contains("2"))
-                        || (feature.get(i).getProperty().contains("33") && feature.get(i + 1).getProperty().contains("28")
-                        && feature.get(i + 2).getProperty().contains("9"))) {
-                    featureType.add(feature.get(i).getText() + "\t" + feature.get(i + 1).getText() + "\t"
-                            + feature.get(i + 2).getText());
-                    featureTypeState = false;
-                }
-            }
-            if (i < feature.size() - 1 && featureTypeState) {
-                if (feature.get(i).getProperty().contains("33") && feature.get(i + 1).getProperty().contains("28")) {
-                    featureType.add(feature.get(i).getText() + "\t" + feature.get(i + 1).getText());
-                }
-            }
-        }
-        //将标准词中体征指标值（数字）与分词结果中体征指标值（数字）比较
-        for (String f : featureType) {
-            String[] features = f.split("\t");
-            if (standWords.containsKey(features[0])) {
-                List<Map<String, String>> standWordList = standWords.get(features[0]);
-                for (Map<String, String> standWordMap : standWordList) {
-                    if (standWordMap.containsKey("op") && standWordMap.containsKey("unit")
-                            && standWordMap.containsKey("value")) {
-                        if (features.length == 2) {
-                            judgment(sData, features, features[0], standWordMap);
-                        } else {
-                            if (standWordMap.get("unit").equals(features[2])) {
-                                judgment(sData, features, features[0], standWordMap);
-                            }
-                        }
-                    } else if (standWordMap.containsKey("op") && standWordMap.containsKey("value")) {
-                        if (features.length == 2) {
-                            judgment(sData, features, features[0], standWordMap);
-                        }
-                    }
-                }
-            }
-        }
-        return sData;
-    }
-
-    //将标准词中体征指标值（数字）与分词结果中体征指标值（数字）比较
-    private void judgment(SearchVo sData, String[] features, String standWordKey, Map<String, String> standWordMap) {
-        if (standWordMap.get("op").contains(">=") || standWordMap.get("op").contains("≥")
-                || standWordMap.get("op").contains(">") || standWordMap.get("op").contains("大于")
-                || standWordMap.get("op").contains("＞") || standWordMap.get("op").contains("大")) {
-            //单独处理  血压≥140/90mmHg   类似情况
-            if (features[1].contains("/")) {
-                if (standWordMap.get("value").contains("/")) {
-                    String[] feature = features[1].split("/");
-                    Integer featuresSBP = Integer.valueOf(feature[0]); //分词特征收缩压
-                    Integer featuresDBP = Integer.valueOf(feature[1]); //分词特征舒张压
-
-                    String[] values = standWordMap.get("value").split("/");
-                    Integer standWordSBP = Integer.valueOf(values[0]); //标准词收缩压
-                    Integer standWordDBP = Integer.valueOf(values[1]); //标准词舒张压
-                    if (featuresSBP > standWordSBP && featuresDBP > standWordDBP) {
-                        String standWord = standWordKey
-                                + standWordMap.get("op")
-                                + standWordMap.get("value")
-                                + standWordMap.get("unit") + "。";
-                        sData.setSymptom(sData.getSymptom() + standWord);
-                        System.out.println(sData.getSymptom());
-                    }
-                }
-            } else {
-                String num = getNum(standWordMap.get("value"));
-                if (Double.valueOf(getNum(features[1])) > Double.valueOf(num)) {
-                    String standWord = standWordKey
-                            + standWordMap.get("op")
-                            + standWordMap.get("value")
-                            + standWordMap.get("unit") + "。";
-                    sData.setSymptom(sData.getSymptom() + standWord);
-                    System.out.println(sData.getSymptom());
-
-                }
-            }
-        } else if (standWordMap.get("op").contains("<=") || standWordMap.get("op").contains("≤")
-                || standWordMap.get("op").contains("<") || standWordMap.get("op").contains("小于")
-                || standWordMap.get("op").contains("＜") || standWordMap.get("op").contains("少于")
-                || standWordMap.get("op").contains("小")) {
-            //单独处理  血压小于90/60mmHg   类似情况
-            if (standWordMap.get("value").contains("/")) {
-                if (features[1].contains("/")) {
-                    String[] feature = features[1].split("/");
-                    Integer featuresSBP = Integer.valueOf(feature[0]); //收缩压
-                    Integer featuresDBP = Integer.valueOf(feature[1]); //舒张压
-
-                    String[] values = standWordMap.get("value").split("/");
-                    Integer standWordSBP = Integer.valueOf(values[0]); //收缩压
-                    Integer standWordDBP = Integer.valueOf(values[1]); //舒张压
-                    if (featuresSBP < standWordSBP && featuresDBP < standWordDBP) {
-                        String standWord = standWordKey
-                                + standWordMap.get("op")
-                                + standWordMap.get("value")
-                                + standWordMap.get("unit") + "。";
-                        sData.setSymptom(sData.getSymptom() + standWord);
-                        System.out.println(sData.getSymptom());
-                    }
-                }
-            } else {
-                String num = getNum(standWordMap.get("value"));
-                if (Double.valueOf(getNum(features[1])) < Double.valueOf(num)) {
-                    String standWord = standWordKey
-                            + standWordMap.get("op")
-                            + standWordMap.get("value")
-                            + standWordMap.get("unit")
-                            + "。";
-                    sData.setSymptom(sData.getSymptom() + standWord);
-                    System.out.println(sData.getSymptom());
-                }
-            }
-        }
-    }
-
-    private String getNum(String standWord) {
-        StringBuffer sb = new StringBuffer();
-        try {
-            for (String num : standWord.replaceAll("[^0-9]", ",").split(",")) {
-                if (num.length() > 0) {
-                    sb.append(num);
-                }
-            }
-        } catch (NumberFormatException e) {
-            e.printStackTrace();
-            System.out.println(e.getMessage() + "不是标准数字");
-        }
-        return sb.toString();
-    }
-
-    private Map<String, List<Map<String, String>>> getStandWord() {
-        Map<String, List<Map<String, String>>> standWordObj = new HashMap<>();
-        List<List<Lexeme>> splitStandWords = new ArrayList<>();
-        List<Lexeme> data = null;
-        /*BufferedReader reader = null;
-        InputStream inputStream = null;
-        String line = "";
-        try {
-            //file = ResourceUtils.getFile("classpath:standword.txt");
-            //            Resource resource = new ClassPathResource("standword.txt");
-            ClassPathResource classPathResource = new ClassPathResource("standword.txt");
-            inputStream = classPathResource.getInputStream();
-            //            file = resource.getFile();
-            reader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
-            while ((line = reader.readLine()) != null) {
-                data = nlpServiceClient.split(line).getData();
-                splitStandWords.add(data);
-                //                standWord.add(line);
-            }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                reader.close();
-                inputStream.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }*/
-        List<String> standWords = conceptFacade.getStandWord();
-        for (String standWord : standWords) {
-            data = nlpServiceClient.split(standWord).getData();
-            splitStandWords.add(data);
-        }
-
-        List<Map<String, String>> standWordObjValList = null;
-        Map<String, String> standWordObjVal = null;
-        for (List<Lexeme> splitStandWord : splitStandWords) {
-            standWordObjValList = new ArrayList<>();
-            standWordObjVal = new HashMap<>();
-            int i = 0;
-            String standWordObjKey = "";
-            for (Lexeme lexeme : splitStandWord) {
-                i++;
-                //                if ("\uFEFF".equals(lexeme.getText()) || lexeme.getText().length() <= 0) {
-                //                    continue;
-                //                }
-                if (lexeme.getProperty().contains("1") || lexeme.getProperty().contains("5")
-                        || lexeme.getProperty().contains("33")) {
-                    if (!standWordObj.containsKey(lexeme.getText())) {
-                        standWordObj.put(lexeme.getText(), standWordObjValList);
-                    } else {
-                        standWordObjKey = lexeme.getText();
-                    }
-                } else if (lexeme.getProperty().contains("44")) {
-
-                    if (standWordObjVal.containsKey("op")) {
-                        standWordObjVal.put("op", standWordObjVal.get("op") + "," + lexeme.getText());
-                    } else {
-                        standWordObjVal.put("op", lexeme.getText());
-                    }
-                } else if (lexeme.getProperty().contains("13") || lexeme.getProperty().contains("28")) {
-                    if (standWordObjVal.containsKey("value")) {
-                        standWordObjVal.put("value", standWordObjVal.get("value") + "," + lexeme.getText());
-                    } else {
-                        standWordObjVal.put("value", lexeme.getText());
-                    }
-                } else if (lexeme.getProperty().contains("2") || lexeme.getProperty().contains("9")) {
-                    if (standWordObjVal.containsKey("unit")) {
-                        standWordObjVal.put("unit", standWordObjVal.get("unit") + "," + lexeme.getText());
-                    } else {
-                        standWordObjVal.put("unit", lexeme.getText());
-                    }
-                }
-                if (splitStandWord.size() == i) {
-                    if (standWordObj.containsKey(standWordObjKey)) {
-                        standWordObj.get(standWordObjKey).add(standWordObjVal);
-                    } else {
-                        standWordObjValList.add(standWordObjVal);
-                    }
-                }
-            }
-        }
-        return standWordObj;
-    }
 }

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

@@ -1,11 +1,11 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
+import com.diagbot.biz.push.entity.SearchData;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.service.impl.EvaluationServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.EvaluationDiseaseNameVO;
-import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,16 +21,16 @@ public class EvaluationFacade extends EvaluationServiceImpl {
     /**
      * 获取管理与评估模板接口
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    public List<EvaluationDTO> getEvaluationModule(SearchVo searchVo) {
+    public List<EvaluationDTO> getEvaluationModule(SearchData searchData) {
 
         EvaluationDiseaseNameVO evaluationdiseaseNameVO = new EvaluationDiseaseNameVO();
-        BeanUtil.copyProperties(searchVo, evaluationdiseaseNameVO);
+        BeanUtil.copyProperties(searchData, evaluationdiseaseNameVO);
         List<EvaluationDTO> evaluationList = this.getEvaluationModule(evaluationdiseaseNameVO);
 
-        Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVo);
+        Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchData);
         for (String key : jsonobject.keySet()) {
             for (EvaluationDTO evaluadata : evaluationList) {
                 if (key.equals(evaluadata.getRegionName())) {

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

@@ -1,15 +1,16 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
-import com.diagbot.client.bean.ResponseData;
-import com.diagbot.client.bean.Treat;
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.ResponseData;
+import com.diagbot.biz.push.entity.SearchData;
+import com.diagbot.biz.push.entity.Treat;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.enums.FeatureTypeEnum;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.StringUtil;
-import com.diagbot.vo.SearchVo;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -39,18 +40,18 @@ public class PushFacade {
     /**
      * 推理接口
      *
-     * @param searchVo
+     * @param searchData
      * @return ResponseData
      */
-    public PushDTO pushInner(SearchVo searchVo) {
+    public PushDTO pushInner(SearchData searchData) {
         PushDTO pushDTO = new PushDTO();
         //是否对接
-        Boolean isConnect = transferFacade.isConnect(searchVo.getHosCode(), searchVo.getSysType());
+        Boolean isConnect = transferFacade.isConnect(searchData.getHosCode(), searchData.getSysType());
         //入参预处理
-        searchVo = precSearchData(searchVo, isConnect);
-        ResponseData data = clinicalFacade.processClinicalData(searchVo);
+        searchData = precSearchData(searchData, isConnect);
+        ResponseData data = clinicalFacade.processClinicalData(searchData);
 
-        String featureType = searchVo.getFeatureType();
+        String featureType = searchData.getFeatureType();
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
@@ -59,25 +60,44 @@ public class PushFacade {
             invokeParams.put("featureTypeSet", featureTypeSet);
             invokeParams.put("data", data);
             invokeParams.put("isConnect", isConnect);
-            invokeParams.put("hosCode", searchVo.getHosCode());
+            invokeParams.put("hosCode", searchData.getHosCode());
             pushDTO
                     = dataBeanAggregateQueryFacade.get("setAll", invokeParams, PushDTO.class);
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
+
+        //治疗方案单独处理
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Treat.getKey()))) {
+            pushDTO.setTreat(getTreatment(data.getTreat(), searchData.getDiseaseName(), searchData.getDisType()));
+        }
         return pushDTO;
     }
 
     /**
-     * 获取管理评估大数据推理内容
+     * 获取治疗方案
+     *
+     * @param
+     * @return
+     */
+    public Treat getTreatment(Treat treat, Item diseaseName, Integer disType) {
+        if (StringUtil.isBlank(diseaseName.getUniqueName())) {
+            throw new CommonException(CommonErrorCode.PARAM_ERROR, "请输入需获取治疗方案的诊断名称");
+        }
+        treat = treatmentFacade.getTreatment(treat, diseaseName, disType);
+        return treat;
+    }
+
+    /**
+     * 获取管理评估动态推送内容（来源大数据）
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    public Map<String, JSONObject> getManagementEvaluationContent(SearchVo searchVo) {
-        ResponseData data = clinicalFacade.processClinicalData(searchVo);
+    public Map<String, JSONObject> getManagementEvaluationContent(SearchData searchData) {
+        ResponseData data = clinicalFacade.processClinicalData(searchData);
 
-        String featureType = searchVo.getFeatureType();
+        String featureType = searchData.getFeatureType();
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_ManagementEvaluation.getKey()))) {
@@ -88,60 +108,37 @@ public class PushFacade {
     }
 
     /**
-     * 获取量表推理内容
+     * 获取量表动态推理内容（来源大数据）
      *
-     * @param searchVo
+     * @param searchData
      * @return
      */
-    public Map<String, Object> scale(SearchVo searchVo) {
-        Map<String, Object> data = clinicalFacade.scale(searchVo);
+    public Map<String, Object> scale(SearchData searchData) {
+        Map<String, Object> data = clinicalFacade.scale(searchData);
         return data;
     }
 
-    /**
-     * 获取治疗方案
-     *
-     * @param searchVo
-     * @return
-     */
-    public Treat getTreatment(SearchVo searchVo) {
-        //记录外部诊断名称
-        String diseaseName = searchVo.getDiseaseName();
-        //是否对接
-        Boolean isConnect = transferFacade.isConnect(searchVo.getHosCode(), searchVo.getSysType());
-        //入参预处理
-        searchVo = precSearchData(searchVo, isConnect);
-        ResponseData data = clinicalFacade.processClinicalData(searchVo);
-        Treat treat = data.getTreat();
-        if (StringUtil.isBlank(searchVo.getDiseaseName())) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "请输入需获取治疗方案的诊断名称");
-        }
-        treat = treatmentFacade.getTreatment(treat, searchVo.getDiseaseName(), searchVo.getDisType());
-
-        //数据引擎模式下，诊断名称转换成外部名称
-        if (isConnect && searchVo.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
-            treat.setDiseaseName(diseaseName);
-        }
-        return treat;
-    }
-
     /**
      * searchData入参预处理
      *
-     * @param searchVo
+     * @param searchData
      * @param isConnect
      * @return
      */
-    public SearchVo precSearchData(SearchVo searchVo, Boolean isConnect) {
+    public SearchData precSearchData(SearchData searchData, Boolean isConnect) {
+        //未对接或非数据引擎模式，不做映射
+        if (!isConnect || (!searchData.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey()))) {
+            return searchData;
+        }
         try {
             Map<String, Object> inputParams = new HashMap<>();
-            inputParams.put("searchVo", searchVo);
+            inputParams.put("searchData", searchData);
             inputParams.put("isConnect", isConnect);
-            searchVo
-                    = dataBeanAggregateQueryFacade.get("assembleSearchData", inputParams, SearchVo.class);
+            searchData
+                    = dataBeanAggregateQueryFacade.get("assembleSearchData", inputParams, SearchData.class);
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
-        return searchVo;
+        return searchData;
     }
 }

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

@@ -1,11 +1,13 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Lis;
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.HosCodeVO;
-import com.diagbot.dto.LisResult;
-import com.diagbot.dto.PacsResult;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.FeatureTypeEnum;
 import com.diagbot.enums.LisSourceEnum;
 import com.diagbot.enums.SysTypeEnum;
@@ -76,70 +78,75 @@ public class TransferFacade {
     }
 
     /**
-     * 化验结果增肌公表名
+     * 化验结果增加公表名
      *
-     * @param lisResults
+     * @param lis
      * @param hosCode
      * @return
      */
-    public List<LisResult> addLisUniqueName(List<LisResult> lisResults, String hosCode) {
-        List<LisResult> retLisResults = Lists.newLinkedList();
+    public List<Lis> addLisUniqueName(List<Lis> lis, String hosCode) {
+        if (ListUtil.isEmpty(lis)) {
+            return null;
+        }
+        List<Lis> retLis = Lists.newLinkedList();
         //化验项转公表内容,参数处理
-        if (ListUtil.isNotEmpty(lisResults)) {
-            List<String> mealNameList = lisResults
-                    .stream()
-                    .map(lisResult -> lisResult.getName()).collect(Collectors.toList());
-            LisConfigVO lisConfigVO = new LisConfigVO();
-            lisConfigVO.setHosCode(hosCode);
-            lisConfigVO.setMealNameList(mealNameList);
-            RespDTO<Map<String, Map<String, List<String>>>> lisConfigRes
-                    = tranServiceClient.getLisConfigByMealNameAndHosCode(lisConfigVO);
-            Map<String, Map<String, List<String>>> lisConfigMap = new LinkedHashMap<>();
-            if (RespDTOUtil.respIsOK(lisConfigRes)) {
-                lisConfigMap = lisConfigRes.data;
+        List<String> mealNameList = lis
+                .stream()
+                .map(lisResult -> lisResult.getName()).collect(Collectors.toList());
+        LisConfigVO lisConfigVO = new LisConfigVO();
+        lisConfigVO.setHosCode(hosCode);
+        lisConfigVO.setMealNameList(mealNameList);
+        RespDTO<Map<String, Map<String, List<String>>>> lisConfigRes
+                = tranServiceClient.getLisConfigByMealNameAndHosCode(lisConfigVO);
+        Map<String, Map<String, List<String>>> lisConfigMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(lisConfigRes)) {
+            lisConfigMap = lisConfigRes.data;
+        }
+        for (Lis lisResult : lis) {
+            //内部数据，获取标签时映射， 不二次映射
+            if (lisResult.getSource().equals(LisSourceEnum.Inner.getKey())) {
+                retLis.add(lisResult);
+                continue;
             }
-            for (LisResult lisResult : lisResults) {
-                if (!lisResult.getSource().equals(LisSourceEnum.Outer.getKey())) {
-                    retLisResults.add(lisResult);
-                    continue;
-                }
-                if (lisResult.getDetailName() == null) {
-                    lisResult.setDetailName("");
-                }
-                Map<String, List<String>> itemMap = lisConfigMap.get(lisResult.getName());
-                if (itemMap != null) {
-                    List<String> uniqueNameList = itemMap.get(lisResult.getDetailName());
-                    if (ListUtil.isNotEmpty(uniqueNameList)) {
-                        //化验公表映射出多项时，拆分成多个公表项数据，指标值保持一致
-                        for (String uniqueName : uniqueNameList) {
-                            LisResult lisResult_new = new LisResult();
-                            BeanUtil.copyProperties(lisResult, lisResult_new);
-                            lisResult_new.setUniqueName(uniqueName);
-                            retLisResults.add(lisResult_new);
-                        }
-                    } else {
-                        retLisResults.add(lisResult);
+            if (lisResult.getDetailName() == null) {
+                lisResult.setDetailName("");
+            }
+            Map<String, List<String>> itemMap = lisConfigMap.get(lisResult.getName());
+            if (itemMap != null) {
+                List<String> uniqueNameList = itemMap.get(lisResult.getDetailName());
+                if (ListUtil.isNotEmpty(uniqueNameList)) {
+                    //化验公表映射出多项时，拆分成多个公表项数据，指标值保持一致
+                    for (String uniqueName : uniqueNameList) {
+                        Lis lisResult_new = new Lis();
+                        BeanUtil.copyProperties(lisResult, lisResult_new);
+                        lisResult_new.setUniqueName(uniqueName);
+                        retLis.add(lisResult_new);
                     }
+                } else {
+                    retLis.add(lisResult);
                 }
             }
         }
-        return retLisResults;
+        return retLis;
     }
 
 
     /**
      * 辅检结果增加公表名（辅检项目名称）
      *
-     * @param pacsArr
+     * @param pacs
      * @param hosCode
      * @return
      */
-    public List<PacsResult> addPacsUniqueName(List<PacsResult> pacsArr, String hosCode) {
-        Map<String, PacsResult> pacsOriginalMap = EntityUtil.makeEntityMap(pacsArr, "name");
-        List<PacsResult> convertPacsArr = Lists.newLinkedList();
+    public List<Pacs> addPacsUniqueName(List<Pacs> pacs, String hosCode) {
+        if (ListUtil.isEmpty(pacs)) {
+            return null;
+        }
+        Map<String, Pacs> pacsOriginalMap = EntityUtil.makeEntityMap(pacs, "name");
+        List<Pacs> convertPacs = Lists.newLinkedList();
         PacsConfigVO pacsConfigVO = new PacsConfigVO();
         pacsConfigVO.setHosCode(hosCode);
-        pacsConfigVO.setMealNameList(pacsArr
+        pacsConfigVO.setMealNameList(pacs
                 .stream()
                 .map(pacsResult -> pacsResult.getName())
                 .distinct()
@@ -147,20 +154,20 @@ public class TransferFacade {
         RespDTO<Map<String, List<String>>> pacsRespDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
         if (RespDTOUtil.respIsOK(pacsRespDTO)) {
             Map<String, List<String>> pacsMap = pacsRespDTO.data;
-            for (Map.Entry<String, PacsResult> entry : pacsOriginalMap.entrySet()) {
+            for (Map.Entry<String, Pacs> entry : pacsOriginalMap.entrySet()) {
                 if (ListUtil.isNotEmpty(pacsMap.get(entry.getKey()))) {
                     for (String uniqueName : pacsMap.get(entry.getKey())) {
-                        PacsResult pacsResult = new PacsResult();
+                        Pacs pacsResult = new Pacs();
                         BeanUtil.copyProperties(entry.getValue(), pacsResult);
                         pacsResult.setUniqueName(uniqueName);
-                        convertPacsArr.add(pacsResult);
+                        convertPacs.add(pacsResult);
                     }
                 } else {
-                    convertPacsArr.add(entry.getValue());
+                    convertPacs.add(entry.getValue());
                 }
             }
         }
-        return convertPacsArr;
+        return convertPacs;
     }
 
     /**
@@ -185,6 +192,48 @@ public class TransferFacade {
         return lisConfigMap;
     }
 
+    /**
+     * 其他类型增加公表名（诊断、药品、手术等）
+     *
+     * @param items
+     * @param hosCode
+     * @return
+     */
+    public List<Item> addItemUniqueName(List<Item> items, Integer type, String hosCode) {
+        if (ListUtil.isEmpty(items)) {
+            return null;
+        }
+        Map<String, Item> itemOriginalMap = EntityUtil.makeEntityMap(items, "name");
+        List<Item> convertItems = Lists.newLinkedList();
+        List<String> nameList = items
+                .stream().map(item -> item.getName())
+                .distinct()
+                .collect(Collectors.toList());
+        if (type.equals(ConceptTypeEnum.Disease.getKey())) {
+            DiseaseIcdVO diseaseIcdVO = new DiseaseIcdVO();
+            diseaseIcdVO.setHosCode(hosCode);
+            diseaseIcdVO.setDiseaseNameList(nameList);
+            Map<String, String> disMap = new LinkedHashMap<>();
+            RespDTO<Map<String, String>> disRespDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
+            if (RespDTOUtil.respIsOK(disRespDTO)) {
+                disMap = disRespDTO.data;
+                for (Map.Entry<String, Item> entry : itemOriginalMap.entrySet()) {
+                    if (disMap.containsKey(entry.getKey())) {
+                        entry.getValue().setUniqueName(disMap.get(entry.getKey()));
+                    }
+                    convertItems.add(entry.getValue());
+                }
+            }
+        } else if (type.equals(ConceptTypeEnum.Drug.getKey())) {
+            //暂无映射关系
+            convertItems.addAll(items);
+        } else if (type.equals(ConceptTypeEnum.OPERATION.getKey())) {
+            //暂无映射关系
+            convertItems.addAll(items);
+        }
+        return convertItems;
+    }
+
     /**
      * 外部项目名称转内部名称-字符串格式
      *

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

@@ -1,11 +1,12 @@
 package com.diagbot.facade;
 
-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.biz.push.entity.AdverseReaction;
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Medicition;
+import com.diagbot.biz.push.entity.MedicitionClass;
+import com.diagbot.biz.push.entity.MeditionDetail;
+import com.diagbot.biz.push.entity.Treat;
+import com.diagbot.biz.push.entity.TreatmentPlan;
 import com.diagbot.dto.ConceptRes;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptDetail;
@@ -50,12 +51,12 @@ public class TreatmentFacade {
      * @param
      * @return
      */
-    public Treat getTreatment(Treat treat, String diseaseName, Integer disType) {
+    public Treat getTreatment(Treat treat, Item diseaseName, Integer disType) {
         List<MedicitionClass> drugsList = Lists.newLinkedList();
         List<String> conceptNameList = Lists.newLinkedList();
-        conceptNameList.add(diseaseName);
+        conceptNameList.add(diseaseName.getUniqueName());
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
-        conceptBaseVO.setName(diseaseName);
+        conceptBaseVO.setName(diseaseName.getUniqueName());
         conceptBaseVO.setLibType(LexiconTypeEnum.DIAGNOSIS.getKey());
         Concept disease = conceptFacade.exist(conceptBaseVO);
         if (disease == null) {
@@ -141,7 +142,7 @@ public class TreatmentFacade {
             Concept chronicConcept = conceptFacade.exist(conceptBaseVO);
             ConceptWrapper conceptWrapper = new ConceptWrapper();
             conceptWrapper.setStartId(disease.getId());
-            conceptWrapper.setStartName(diseaseName);
+            conceptWrapper.setStartName(diseaseName.getUniqueName());
             conceptWrapper.setStartType(LexiconTypeEnum.DIAGNOSIS.getKey());
             conceptWrapper.setEndId(chronicConcept.getId());
             conceptWrapper.setEndName(chronicConcept.getLibName());

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

@@ -2,12 +2,12 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.biz.push.entity.SearchData;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.facade.ClinicalFacade;
-import com.diagbot.vo.SearchVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,25 +40,25 @@ public class ClinicalController {
     @ApiOperation(value = "知识库标准化-临床数据处理(只是用大数据推理)", notes = "")
     @PostMapping("/processData")
     @SysLogger("processData")
-    public RespDTO<ResponseData> processData(@Valid @RequestBody SearchVo searchVo) {
-        ResponseData data = clinicalFacade.processClinicalData(searchVo);
+    public RespDTO<ResponseData> processData(@Valid @RequestBody SearchData searchData) {
+        ResponseData data = clinicalFacade.processClinicalData(searchData);
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "获取量表", notes = "")
+    @ApiOperation(value = "获取量表动态结构", notes = "")
     @PostMapping("/scale")
     @SysLogger("scale")
     @ApiIgnore
-    public RespDTO<Map<String, Object>> scale(@RequestBody SearchVo searchVo) {
-        Map<String, Object> data = clinicalFacade.scale(searchVo);
+    public RespDTO<Map<String, Object>> scale(@RequestBody SearchData searchData) {
+        Map<String, Object> data = clinicalFacade.scale(searchData);
         return RespDTO.onSuc(data);
     }
 
     @ApiOperation(value = "知识库标准化-获取量表内容", notes = "")
     @PostMapping("/getScale")
     @SysLogger("getScale")
-    public RespDTO<List<ScaleContent>> getScale(@RequestBody SearchVo searchVo) {
-        List<ScaleContent> data = clinicalFacade.getScale(searchVo);
+    public RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData) {
+        List<ScaleContent> data = clinicalFacade.getScale(searchData);
         return RespDTO.onSuc(data);
     }
 

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

@@ -1,10 +1,10 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.biz.push.entity.SearchData;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.EvaluationFacade;
-import com.diagbot.vo.SearchVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +36,8 @@ public class EvaluationController {
     @ApiOperation(value = "获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
     @PostMapping("/getEvaluationModules")
     @SysLogger("getEvaluationModules")
-    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody SearchVo searchVo) {
-        List<EvaluationDTO> data = evaluationFacade.getEvaluationModule(searchVo);
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody SearchData searchData) {
+        List<EvaluationDTO> data = evaluationFacade.getEvaluationModule(searchData);
         return RespDTO.onSuc(data);
     }
 }

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

@@ -1,7 +1,6 @@
 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;

common/src/main/java/com/diagbot/biz/push/entity/AdverseReaction.java

@@ -13,11 +13,32 @@ import java.util.List;
 @Getter
 @Setter
 public class AdverseReaction {
+    /**
+     * 术语id
+     */
     private Long conceptId;
-    private String name;  //名称
+    /**
+     * 术语名称
+     */
+    private String name;
+    /**
+     * 词性
+     */
     private Integer libType;
+    /**
+     * 类型（10：不良反应）
+     */
     private Integer type;
-    private String showInfo = "0";//是否显示提示信息
-    private Integer controlType; //控件类型
+    /**
+     * 是否有提示信息（0：无，1：有）
+     */
+    private String showInfo = "0";
+    /**
+     * 控件类型（0：单选-radio，2：多选-checkbox，2：文本框-text，3：下拉列表-dropdownlist）
+     */
+    private Integer controlType;
+    /**
+     * 选项明细
+     */
     private List<AdverseReactionDetail> details;
 }

common/src/main/java/com/diagbot/biz/push/entity/AdverseReactionDetail.java

@@ -11,6 +11,12 @@ import lombok.Setter;
 @Getter
 @Setter
 public class AdverseReactionDetail {
+    /**
+     * 选项名称
+     */
     private String name;
-    private Integer value; //是否选中：0-未选中，1-选中
+    /**
+     * 是否选中（推荐值，0：未选中，1：选中）
+     */
+    private Integer value;
 }

common/src/main/java/com/diagbot/biz/push/entity/ConceptDetailDTO.java

@@ -0,0 +1,38 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:静态知识返回结构
+ * @Author:zhaops
+ * @time: 2019/12/11 9:38
+ */
+@Getter
+@Setter
+public class ConceptDetailDTO {
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 是否诊断依据（1-是，0-否）
+     */
+    private Integer isReason;
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

common/src/main/java/com/diagbot/biz/push/entity/Diag.java

@@ -1,19 +0,0 @@
-package com.diagbot.biz.push.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/12/6 16:21
- */
-@Getter
-@Setter
-public class Diag {
-    private String name; //his名称
-    private String uniqueName; //公表名
-    private Date dataValue; //结果时间
-}

common/src/main/java/com/diagbot/biz/push/entity/Drug.java

@@ -1,19 +0,0 @@
-package com.diagbot.biz.push.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/12/6 16:25
- */
-@Getter
-@Setter
-public class Drug {
-    private String name; //his药品名称
-    private String uniqueName; //公表名（药品通用名）
-    private Date dataValue; //结果时间
-}

common/src/main/java/com/diagbot/biz/push/entity/FeatureRate.java

@@ -0,0 +1,18 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:大数据推送通用结构
+ * @Author:zhaops
+ * @time: 2019/12/9 13:24
+ */
+@Getter
+@Setter
+public class FeatureRate {
+    private String featureName;
+    private String extraProperty;
+    private String desc;
+    private String rate;
+}

common/src/main/java/com/diagbot/biz/push/entity/Item.java

@@ -0,0 +1,28 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:诊断、药品等对接项目通用结构
+ * @Author:zhaops
+ * @time: 2019/12/10 14:29
+ */
+@Getter
+@Setter
+public class Item {
+    /**
+     * HIS名称
+     */
+    private String name;
+    /**
+     * 内部名称（公表名）
+     */
+    private String uniqueName;
+    /**
+     * 结果时间
+     */
+    private Date dataValue;
+}

common/src/main/java/com/diagbot/biz/push/entity/Lis.java

@@ -6,21 +6,55 @@ import lombok.Setter;
 import java.util.Date;
 
 /**
- * @Description:
+ * @Description:化验结构
  * @Author:zhaops
  * @time: 2019/12/6 11:11
  */
 @Getter
 @Setter
 public class Lis {
-    private String name;//套餐名称
-    private String detailName;//化验明细项
-    private String uniqueName;//公表名
-    private Double value;//化验结果值
-    private String units;//单位
-    private Double minValue;//最小值
-    private Double maxValue;//最大值
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
-    private Date dataValue;//出结果时间
-    private Integer source;//0：内部数据，1：外部数据
+    /**
+     * 套餐名称
+     */
+    private String name;
+    /**
+     * 化验明细项
+     */
+    private String detailName;
+    /**
+     * 化验公表名
+     */
+    private String uniqueName;
+    /**
+     * 化验结果值
+     */
+    private Double value;
+    /**
+     * 单位
+     */
+    private String units;
+    /**
+     * 最小值
+     */
+    private Double minValue;
+    /**
+     * 最大值
+     */
+    private Double maxValue;
+    /**
+     * 其他非数值结果，包括阴性阳性，文字描述等
+     */
+    private String otherValue;
+    /**
+     * 结果时间
+     */
+    private Date dataValue;
+    /**
+     * 数据来源（0：内部数据，1：外部数据）
+     */
+    private Integer source;
+    /**
+     * HIS比较结果
+     */
+    private String result;
 }

common/src/main/java/com/diagbot/biz/push/entity/MedicalIndication.java

@@ -7,16 +7,31 @@ import java.util.List;
 
 
 /**
- * @Description:推送指标
+ * @Description:病情提示
  * @Author:zhaops
  * @time: 2019/3/14 14:40
  */
 @Getter
 @Setter
 public class MedicalIndication {
+    /**
+     * 术语id
+     */
     private Long conceptId;
+    /**
+     * 词性
+     */
     private Integer libType;
+    /**
+     * 类型
+     */
     private Integer type;
+    /**
+     * 名称（术语、描述等）
+     */
     private String name;
+    /**
+     * 病情提示明细
+     */
     private List<MedicalIndicationDetail> details;
 }

common/src/main/java/com/diagbot/biz/push/entity/MedicalIndicationDetail.java

@@ -5,13 +5,20 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description:推送指标明细
+ * @Description:病情提示明细
  * @Author:zhaops
  * @time: 2019/4/11 10:15
  */
 @Getter
 @Setter
 public class MedicalIndicationDetail {
-    private Integer type; //1-量表，2-公式，3-其他指标，4-危机值
-    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""} ,controlType:0-radio,1-checkbox,2-text,3-dropdownlist
+    /**
+     * 类型（1：量表，2：计算公式，3：其他指标，可能结果等，4：危急值、开单合理项、异常值等规则推送结果）
+     */
+    private Integer type;
+    /**
+     * 动态内容（量表不返回具体结构，只提供名称，具体内容单独获取）
+     * 返回结构包含以下控件类型controlType（0：单选-radio，2：多选-checkbox，2：文本框-text，3：下拉列表-dropdownlist）
+     */
+    private JSONObject content;
 }

common/src/main/java/com/diagbot/biz/push/entity/Medicition.java

@@ -11,18 +11,36 @@ import lombok.Setter;
 @Getter
 @Setter
 public class Medicition {
+    /**
+     * 术语id
+     */
     private Long conceptId;
+    /**
+     * 药品名称
+     */
     private String medicitionName;
+    /**
+     * 词性（10：药品通用名）
+     */
     private Integer libType;
     /**
-     * 1-显示，0-隐藏
+     * 是否显示（0：隐藏，1：显示）
      */
     private String isShow;
+    /**
+     * 药品慎用禁忌标志（0：正常，1：慎用，2：禁忌）
+     */
     private String forbidden;
     /**
-     * 1-有提示信息，0-没有提示信息
+     * 是否有药品说明书（0：无，1：有）
      */
     private String showInfo = "0";
+    /**
+     * 使用率
+     */
     private String rate;
+    /**
+     * 类型
+     */
     private Integer type;
 }

common/src/main/java/com/diagbot/biz/push/entity/MedicitionClass.java

@@ -13,15 +13,48 @@ import java.util.LinkedList;
 @Getter
 @Setter
 public class MedicitionClass {
+    /**
+     * 是否有静态知识（0：无，1：有）
+     */
     private String showInfo = "0";
+    /**
+     * 药品分类禁用慎用标志（0：正常，1：慎用，2：禁用）
+     */
     private String drugsForbidden;
-    private Long bigdrugsConceptId;//药品分类概念id-大类
-    private String bigdrugsName;//药类名
+    /**
+     * 药品大类术语id
+     */
+    private Long bigdrugsConceptId;
+    /**
+     * 药品大类名称
+     */
+    private String bigdrugsName;
+    /**
+     * 药品大类词性
+     */
     private Integer bigdrgusLibType;
+    /**
+     * 药品大类类型
+     */
     private Integer bigdrugsType;
-    private Long subdrugsConceptId;//药品分类概念id-小类
-    private String subdrugsName;//药类名-小类
+    /**
+     * 药品小类术语id
+     */
+    private Long subdrugsConceptId;
+    /**
+     * 药品小类名称
+     */
+    private String subdrugsName;
+    /**
+     * 药品小类词性
+     */
     private Integer subdrugsLibType;
+    /**
+     * 药品小类类型
+     */
     private Integer subdrugsType;
+    /**
+     * 药品列表
+     */
     private LinkedList<Medicition> medicitionsList;
 }

common/src/main/java/com/diagbot/biz/push/entity/MeditionDetail.java

@@ -6,13 +6,19 @@ import lombok.Setter;
 import java.util.List;
 
 /**
- * @Description:
+ * @Description:药品推荐（子模块）
  * @Author:zhaops
  * @time: 2019/11/21 11:15
  */
 @Getter
 @Setter
 public class MeditionDetail {
+    /**
+     * 标题（二级标题）
+     */
     private String description;
+    /**
+     * 药品分类列表
+     */
     private List<MedicitionClass> treatment;
 }

common/src/main/java/com/diagbot/biz/push/entity/Pacs.java

@@ -6,15 +6,31 @@ import lombok.Setter;
 import java.util.Date;
 
 /**
- * @Description:
+ * @Description:辅检结构
  * @Author:zhaops
  * @time: 2019/12/6 11:13
  */
 @Getter
 @Setter
 public class Pacs {
-    private String name;//检查项目
-    private String uniqueName;//公表名
+    /**
+     * HIS项目
+     */
+    private String name;
+    /**
+     * 内部检查项目（公表名）
+     */
+    private String uniqueName;
+    /**
+     * 描述信息
+     */
+    private String desc;
+    /**
+     * 检查结果（结果非描述信息）
+     */
     private String result;
+    /**
+     * 结果时间
+     */
     private Date dataValue;
 }

common/src/main/java/com/diagbot/biz/push/entity/PushDTO.java

@@ -1,14 +0,0 @@
-package com.diagbot.biz.push.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/12/6 10:03
- */
-@Getter
-@Setter
-public class PushDTO {
-}

common/src/main/java/com/diagbot/biz/push/entity/PushVO.java

@@ -1,53 +0,0 @@
-package com.diagbot.biz.push.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:推理相关入参
- * @Author:zhaops
- * @time: 2019/12/6 10:03
- */
-@Getter
-@Setter
-public class PushVO {
-
-    private String hosCode;
-    private String featureType;
-    private String ruleType;
-    private Integer age;
-    private String sex;
-    private String marriage;
-    private String chief;
-    private String symptom;
-    private String vital;
-    private String pasts;
-    private String infectious;
-    private String operation;
-    private String allergy;
-    private String vaccination;
-    private String personal;
-    private String marital;
-    private String family;
-    private String menstrual;
-    private String other;
-    private String lisString;  //化验纯文本
-    private String pacsString;
-    private String diagString;
-    private String drugString;
-    private List<Lis> lis;
-    private List<Pacs> pacs;
-    private List<Diag> diag;
-    private List<Drug> drug;
-    private String lisOrder;   //当前正在下单化验
-    private String pacsOrder;   //当前正在下单辅检
-    private String diagOrder;
-    private String drugOrder;
-    private String operationOrder;
-    private String otherOrder; //其他
-    private String diseaseName;
-    private String disType;//0-普通病（默认不填），1-慢病，2-急诊
-    private String scaleName;
-}

common/src/main/java/com/diagbot/biz/push/entity/ResponseData.java

@@ -0,0 +1,62 @@
+package com.diagbot.biz.push.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:大数据返回结构
+ * @Author:zhaops
+ * @time: 2019/12/9 13:21
+ */
+@Getter
+@Setter
+public class ResponseData {
+    /**
+     * 症状
+     */
+    private List<FeatureRate> symptom = new ArrayList<>(10);
+    /**
+     * 病史
+     */
+    private List<FeatureRate> history = new ArrayList<>(10);
+    /**
+     * 查体（体征）
+     */
+    private List<FeatureRate> vitals = new ArrayList<>(10);
+    /**
+     * 化验
+     */
+    private List<FeatureRate> labs = new ArrayList<>(10);
+    /**
+     * 辅检
+     */
+    private List<FeatureRate> pacs = new ArrayList<>(10);
+    /**
+     * 诊断
+     */
+    private List<FeatureRate> dis = new ArrayList<>(10);
+    /**
+     * 治疗方案
+     */
+    private Treat treat;
+    /**
+     * 量表动态内容
+     */
+    private Map<String, JSONObject> scale;
+    /**
+     * 管理评估动态内容
+     */
+    private Map<String, JSONObject> managementEvaluation;
+    /**
+     * 病情提示（1：量表，2：计算公式，3：可能结果，4：危机值、开单合理项、异常值等规则推送内容）
+     */
+    private List<MedicalIndication> medicalIndications;
+
+    private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
+}

common/src/main/java/com/diagbot/biz/push/entity/SearchData.java

@@ -3,12 +3,180 @@ package com.diagbot.biz.push.entity;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
- * @Description:
+ * @Description:推理相关入参
  * @Author:zhaops
  * @time: 2019/12/6 10:02
  */
 @Getter
 @Setter
 public class SearchData {
-}
+    private int age_start = 0;
+    private int age_end = 200;
+    /**
+     * 搜索结果的贝叶斯阈值
+     */
+    private String threshold = "0";
+    /**
+     * 外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
+     */
+    private String sysCode;
+    /**
+     * 大数据返回内容截取长度
+     */
+    private Integer length;
+    /**
+     * 医院编码
+     */
+    private String hosCode;
+    /**
+     * 推理类型（1：症状，4：查体结果，41：查体模板，42：查体指标，5：化验，6：辅检，7：诊断，8：治疗方案，11：管理评估，21：量表，22：病情提示-量表、计算公式、可能结果、危急值、开单合理性、异常值等）
+     */
+    private String featureType;
+    /**
+     * 规则类型（1:危机值提醒，2：开单合理性，3：管理评估，4：不良反应，5：药物推荐，6：异常值）
+     */
+    private String ruleType;
+    /**
+     * 年龄
+     */
+    private Integer age;
+    /**
+     * 性别
+     */
+    private String sex;
+    /**
+     * 婚姻
+     */
+    private String marriage;
+    /**
+     * 主诉
+     */
+    private String chief;
+    /**
+     * 现病史
+     */
+    private String symptom;
+    /**
+     * 查体
+     */
+    private String vital;
+    /**
+     * 既往史
+     */
+    private String pasts;
+    /**
+     * 传染病史
+     */
+    private String infectious;
+    /**
+     * 手术外伤史
+     */
+    private String operation;
+    /**
+     * 过敏史
+     */
+    private String allergy;
+    /**
+     * 接种史
+     */
+    private String vaccination;
+    /**
+     * 个人史
+     */
+    private String personal;
+    /**
+     * 婚育史
+     */
+    private String marital;
+    /**
+     * 家族史
+     */
+    private String family;
+    /**
+     * 月经史
+     */
+    private String menstrual;
+    /**
+     * 其他史
+     */
+    private String other;
+    /**
+     * 化验文本数据
+     */
+    private String lisString;
+    /**
+     * 辅检文本数据
+     */
+    private String pacsString;
+    /**
+     * 诊断文本数据
+     */
+    private String diagString;
+    /**
+     * 药品文本数据
+     */
+    private String drugString;
+    /**
+     * 化验项目和结果
+     */
+    private List<Lis> lis;
+    /**
+     * 辅检项目和结果
+     */
+    private List<Pacs> pacs;
+    /**
+     * 诊断
+     */
+    private List<Item> diag;
+    /**
+     * 药品
+     */
+    private List<Item> drug;
+    /**
+     * 当前化验开单项
+     */
+    private List<Lis> lisOrder;
+    /**
+     * 当前辅检开单项
+     */
+    private List<Pacs> pacsOrder;
+    /**
+     * 当前诊断开单项
+     */
+    private List<Item> diagOrder;
+    /**
+     * 当前药品开单项
+     */
+    private List<Item> drugOrder;
+    /**
+     * 当前手术开单项
+     */
+    private List<Item> operationOrder;
+    /**
+     * 其他开单项
+     */
+    private List<Item> otherOrder;
+    /**
+     * 选中诊断
+     */
+    private Item diseaseName;
+    /**
+     * 诊断类型（0-普通病（默认不填），1-慢病，2-急诊）
+     */
+    private Integer disType;
+    /**
+     * 量表名称
+     */
+    private String scaleName;
+    /**
+     * 是否映射（0：否，1：是）
+     */
+    private Integer isMapping;
+    /**
+     * 系统类型
+     */
+    private Integer sysType;
+}

common/src/main/java/com/diagbot/biz/push/entity/Treat.java

@@ -0,0 +1,49 @@
+package com.diagbot.biz.push.entity;
+
+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 Item diseaseName;
+    /**
+     * 一般治疗
+     */
+    private ConceptDetailDTO commonTreatment;
+    /**
+     * 手术治疗
+     */
+    private ConceptDetailDTO surgeryTreatment;
+    /**
+     * 随访时间
+     */
+    private Object followUp;
+    /**
+     * 上次用药
+     */
+    private Map<String, List<Medicition>> drugHistory;
+    /**
+     * 不良反应
+     */
+    private List<AdverseReaction> adverseEvent;
+    /**
+     * 药品推荐
+     */
+    private List<TreatmentPlan> treatmentPlan;
+}

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

@@ -1,4 +1,4 @@
-package com.diagbot.client.bean;
+package com.diagbot.biz.push.entity;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -6,13 +6,19 @@ import lombok.Setter;
 import java.util.List;
 
 /**
- * @Description:
+ * @Description:药品推荐（大模块）
  * @Author:zhaops
  * @time: 2019/11/21 11:14
  */
 @Getter
 @Setter
 public class TreatmentPlan {
+    /**
+     * 标题（一级标题）
+     */
     private String title;
+    /**
+     * 子模块列表
+     */
     private List<MeditionDetail> meditionDetails;
 }

common/src/main/java/com/diagbot/biz/push/enums/FeatureTypeEnum.java

@@ -0,0 +1,60 @@
+package com.diagbot.biz.push.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 推送类型
+ * @Author:zhaops
+ * @time: 2019/3/14 11:28
+ */
+public enum FeatureTypeEnum implements KeyedNamed {
+    Feature_Type_Symptom(1, "症状"),
+    Feature_Type_Past(1, "既往史"),
+    Feature_Type_Other(3, "其他史"),
+    Feature_Type_Vital_Result(4, "查体结果"),
+    Feature_Type_Vital_Index(42, "查体指标"),
+    Feature_Type_Lis(5, "化验"),
+    Feature_Type_Pacs(6, "辅检"),
+    Feature_Type_Disease(7, "诊断"),
+    Feature_Type_Treat(8, "治疗"),
+    Feature_Type_ManagementEvaluation(11, "管理评估"),
+    Feature_Type_Scale(21, "量表"),
+    Feature_Type_Indication(22, "指标"),
+    Feature_Type_Operation(25, "手术");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    FeatureTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static FeatureTypeEnum getEnum(int key) {
+        for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        FeatureTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

common/src/main/java/com/diagbot/biz/push/facade/AssembleFacade.java

@@ -1,7 +1,13 @@
 package com.diagbot.biz.push.facade;
 
+import com.diagbot.biz.push.entity.SearchData;
+import com.diagbot.biz.push.enums.FeatureTypeEnum;
+import com.diagbot.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -9,4 +15,48 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class AssembleFacade {
-}
+    /**
+     * 拼装数据
+     *
+     * @param pushVO
+     * @return SearchData
+     */
+    public SearchData assembleData(SearchData searchData, Integer sysType) {
+        searchData.setSysCode("1");
+        searchData.setLength(10);
+        searchData.setSysType(sysType);
+
+        //规则过滤
+        String ruleType = searchData.getRuleType();
+        if (StringUtil.isBlank(ruleType)) {
+            String[] featureTypes = searchData.getFeatureType().split(",|，");
+            List<String> featureTypeList = Arrays.asList(featureTypes);
+            if (featureTypeList.contains(FeatureTypeEnum.Feature_Type_Indication.getKey())) {
+                ruleType += "1,2,6";
+            } else if (featureTypeList.contains(FeatureTypeEnum.Feature_Type_ManagementEvaluation.getKey())) {
+                if (StringUtil.isNotBlank(ruleType)) {
+                    ruleType += ",";
+                }
+                ruleType += "3";
+            } else if (featureTypeList.contains(FeatureTypeEnum.Feature_Type_Treat.getKey())) {
+                if (StringUtil.isNotBlank(ruleType)) {
+                    ruleType += ",";
+                }
+                ruleType += "4,5";
+            }
+            searchData.setRuleType(ruleType);
+        }
+
+        switch (searchData.getSex()) {
+            case "1":
+                searchData.setSex("M");
+                break;
+            case "2":
+                searchData.setSex("F");
+                break;
+            default:
+                searchData.setSex("A");
+                break;
+        }
+        return searchData;
+    }}

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

@@ -1,11 +1,11 @@
 package com.diagbot.client;
 
+import com.diagbot.biz.push.entity.ResponseData;
+import com.diagbot.biz.push.entity.SearchData;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;
 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;
@@ -61,14 +61,60 @@ import java.util.Map;
  */
 @FeignClient(value = "aipt-service", fallback = AiptServiceHystrix.class)
 public interface AiptServiceClient {
+    /**
+     * 推理接口，大数据返回格式
+     *
+     * @param searchData
+     * @return
+     */
     @PostMapping(value = "/clinicaldata/processData")
     RespDTO<ResponseData> aiptData(@RequestBody SearchData searchData);
 
+    /**
+     * 计算接口（量表、计算公式）
+     *
+     * @param calculateData
+     * @return
+     */
+    @PostMapping(value = "/clinicaldata/scaleCalc")
+    RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData);
+
+    /**
+     * 获取量表全文接口
+     *
+     * @param searchData
+     * @return
+     */
+    @PostMapping(value = "/clinicaldata/getScale")
+    RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData);
+
+    /**
+     * 症状特征提取
+     *
+     * @param text
+     * @return
+     */
     @PostMapping(value = "/feature/symptomFeature")
     RespDTO<List<FeatureConceptDTO>> symptomFeature(@RequestParam("text") String text);
 
-    @PostMapping(value = "/clinicaldata/scaleCalc")
-    RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData);
+    /**
+     * 获取治疗方案
+     *
+     * @param searchData
+     * @return
+     */
+    @PostMapping("/push/treatment")
+    RespDTO<Treat> getTreatment(@RequestBody SearchData searchData);
+
+    /**
+     * 推理
+     *
+     * @param searchData
+     * @return
+     */
+    @PostMapping("/push/pushInner")
+    RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData);
+
 
     @PostMapping(value = "/scale/getList")
     RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO);
@@ -79,8 +125,6 @@ public interface AiptServiceClient {
     @PostMapping(value = "/disType/getDisType")
     RespDTO<DisTypeDTO> getDisType();
 
-    @PostMapping(value = "/clinicaldata/getScale")
-    RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData);
 
     @PostMapping(value = "/conceptDetail/getConceptDetail")
     RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO);
@@ -149,23 +193,6 @@ public interface AiptServiceClient {
     @PostMapping("/concept/getConceptCondMap")
     RespDTO<Map<Long, String>> getConceptCondMap(@RequestBody ConceptFindVO conceptFindVO);
 
-    /**
-     * 获取治疗方案
-     *
-     * @param searchData
-     * @return
-     */
-    @PostMapping("/push/treatment")
-    RespDTO<Treat> getTreatment(@RequestBody SearchData searchData);
-
-    /**
-     * 推理
-     *
-     * @param searchData
-     * @return
-     */
-    @PostMapping("/push/pushInner")
-    RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData);
 
     /**
      * 是否有提示信息

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

@@ -1,53 +0,0 @@
-package com.diagbot.client.bean;
-
-/**
- * @Auther: fyeman
- * @Date: 2018/7/19/019 10:37
- * @Description:
- */
-public enum AlgorithmClassify {
-    NEURAL("0"), BAYES("1"), EMERGENCY_NEURAL("2"), OUTPATIENT_NEURAL("3"),
-    NEURAL_SYMPTOM("11"),
-    NEURAL_DIAG("21"),
-    NEURAL_VITAL("31"),
-    NEURAL_LIS("41"),
-    NEURAL_PACS("51"),
-    NEURAL_DIAG_SYMPTOM("111"),
-    NEURAL_DIAG_VITAL("131"),
-    NEURAL_DIAG_LIS("141"),
-    NEURAL_DIAG_PACS("151");
-
-    private String value;
-
-    AlgorithmClassify(String value) {
-        this.value = value;
-    }
-
-    public String toString() {
-        return value;
-    }
-
-    public static AlgorithmClassify parse(String value) {
-        switch (value) {
-            case "11":
-                return AlgorithmClassify.NEURAL_SYMPTOM;
-            case "21":
-                return AlgorithmClassify.NEURAL_DIAG;
-            case "31":
-                return AlgorithmClassify.NEURAL_VITAL;
-            case "41":
-                return AlgorithmClassify.NEURAL_LIS;
-            case "51":
-                return AlgorithmClassify.NEURAL_PACS;
-            case "111":
-                return AlgorithmClassify.NEURAL_DIAG_SYMPTOM;
-            case "131":
-                return AlgorithmClassify.NEURAL_DIAG_VITAL;
-            case "141":
-                return AlgorithmClassify.NEURAL_DIAG_LIS;
-            case "151":
-                return AlgorithmClassify.NEURAL_DIAG_PACS;
-        }
-        return AlgorithmClassify.NEURAL_DIAG;
-    }
-}

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

@@ -1,32 +0,0 @@
-package com.diagbot.client.bean;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by fyeman on 2018/2/2.
- */
-@Getter
-@Setter
-public class ResponseData {
-    private String participleSymptom = "";
-
-    private List<FeatureRate> symptom = new ArrayList<>(10);
-    private List<FeatureRate> vitals = new ArrayList<>(10);
-    private List<FeatureRate> dis = new ArrayList<>(10);
-    private List<FeatureRate> labs = new ArrayList<>(10);
-    private List<FeatureRate> pacs = new ArrayList<>(10);
-    private List<FeatureRate> history = new ArrayList<>(10);
-    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);
-}

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

@@ -1,47 +0,0 @@
-package com.diagbot.client.bean;
-
-import com.diagbot.vo.LisResult;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * Created by fyeman on 2018/1/31.
- */
-@Getter
-@Setter
-public class SearchData {
-    private int length;
-    private int age;
-    private String sex;
-    //特征类别
-    private String featureType;
-    //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
-    private String sysCode;
-    private String symptom;
-    private String pasts;
-    private String other;
-    private String vital;
-    private String lis;
-    private List<LisResult> lisArr;
-    private String pacs;
-    private String diag;
-    private String diseaseName; //指定诊断，例如取治疗方案
-    private String scaleName;   //量表名称
-    private String indications; //指标结果
-    private String adverseReactions; //不良反应
-    private Integer disType;    //诊断类型
-    private String adverseEvent;
-    private String hosCode;    //医院编码
-    @ApiModelProperty(hidden = true)
-    private Integer sysType;   //系统类型
-
-    private String lisString;  //化验纯文本
-    private String lisOrder;   //当前正在下单化验
-    private String pacsOrder;   //当前正在下单辅检
-    private String otherOrder; //其他
-
-    private String ruleType;   //规则类型
-}

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

@@ -47,6 +47,7 @@ import com.diagbot.vo.ScaleIndexVO;
 import com.diagbot.vo.VersionVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -62,24 +63,80 @@ import java.util.Map;
 @Component
 @Slf4j
 public class AiptServiceHystrix implements AiptServiceClient {
+
+    /**
+     * 推理接口，大数据返回格式
+     *
+     * @param searchData
+     * @return
+     */
     @Override
-    public RespDTO<ResponseData> aiptData(SearchData searchData) {
+    public RespDTO<ResponseData> aiptData(@RequestBody SearchData searchData) {
         log.error("【hystrix】调用{}异常", "aiptData");
         return null;
     }
 
+    /**
+     * 计算接口（量表、计算公式）
+     *
+     * @param calculateData
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {
+        log.error("【hystrix】调用{}异常", "scaleCalc");
+        return null;
+    }
+
+    /**
+     * 获取量表全文接口
+     *
+     * @param searchData
+     * @return
+     */
+    @Override
+    public RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData) {
+        log.error("【hystrix】调用{}异常", "getScale");
+        return null;
+    }
+
+    /**
+     * 症状特征提取
+     *
+     * @param text
+     * @return
+     */
     @Override
     public RespDTO<List<FeatureConceptDTO>> symptomFeature(@RequestParam("text") String text) {
-        log.error("【hystrix】调用{}异常", "symptomFeaturePageData");
+        log.error("【hystrix】调用{}异常", "symptomFeature");
         return null;
     }
 
+    /**
+     * 获取治疗方案
+     *
+     * @param searchData
+     * @return
+     */
     @Override
-    public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {
-        log.error("【hystrix】调用{}异常", "scaleCalc");
+    public RespDTO<Treat> getTreatment(@RequestBody SearchData searchData) {
+        log.error("【hystrix】调用{}异常", "getTreatment");
         return null;
     }
 
+    /**
+     * 推理
+     *
+     * @param searchData
+     * @return
+     */
+    @Override
+    public RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData) {
+        log.error("【hystrix】调用{}异常", "pushInner");
+        return null;
+    }
+
+
     @Override
     public RespDTO<List<DisScaleDTO>> getList(DisScaleVO scaleVO) {
         log.error("【hystrix】调用{}异常", "getList");
@@ -99,11 +156,6 @@ public class AiptServiceHystrix implements AiptServiceClient {
         return null;
     }
 
-    @Override
-    public RespDTO<List<ScaleContent>> getScale(SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "getScale");
-        return null;
-    }
 
     @Override
     public RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO) {
@@ -183,29 +235,6 @@ public class AiptServiceHystrix implements AiptServiceClient {
         return null;
     }
 
-    /**
-     * 获取治疗方案
-     *
-     * @param searchData
-     * @return
-     */
-    @Override
-    public RespDTO<Treat> getTreatment(@RequestBody SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "getTreatment");
-        return null;
-    }
-
-    /**
-     * 推理
-     *
-     * @param searchData
-     * @return
-     */
-    @Override
-    public RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "pushInner");
-        return null;
-    }
 
     /**
      * 是否有提示信息

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

@@ -1,19 +1,17 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.entity.SearchData;
+import com.diagbot.biz.push.facade.AssembleFacade;
 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;
 import com.diagbot.enums.FeatureTypeEnum;
-import com.diagbot.enums.LisSourceEnum;
+import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.RespDTOUtil;
-import com.diagbot.vo.LisResult;
-import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +20,6 @@ import org.springframework.stereotype.Component;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -42,19 +39,6 @@ public class PushFacade {
     @Autowired
     private AssembleFacade assembleFacade;
 
-
-    /**
-     * 中间层接口
-     *
-     * @param searchData
-     * @return ResponseData
-     */
-    public ResponseData pushAipt(SearchData searchData) {
-        RespDTO<ResponseData> res = aiptServiceClient.aiptData(searchData);
-        RespDTOUtil.respNGDeal(res, "中间层没有返回结果");
-        return res.data;
-    }
-
     /**
      * 中间层推理-症状……诊断、核心指标
      *
@@ -87,8 +71,12 @@ public class PushFacade {
      */
     public PushDTO pushInner(PushVO pushVO) {
         PushDTO pushDTO = new PushDTO();
-        SearchData aiSearchData = assembleFacade.assembleData(pushVO);
-        PushDTO data = pushInnerAipt(aiSearchData);
+        SearchData searchData = new SearchData();
+        BeanUtil.copyProperties(pushVO, searchData);
+        searchData = assembleFacade.assembleData(searchData, SysTypeEnum.ICSS_SERVICE.getKey());
+        BeanUtil.copyProperties(searchData, pushVO);
+
+        PushDTO data = pushInnerAipt(searchData);
 
         String featureType = pushVO.getFeatureType();
         String[] featureTypes = featureType.split(",|，");
@@ -139,36 +127,12 @@ public class PushFacade {
      * @return
      */
     public Treat pushTreatment(PushVO pushVO) {
-        SearchData searchData = assembleFacade.assembleData(pushVO);
+        SearchData searchData = new SearchData();
+        BeanUtil.copyProperties(pushVO, searchData);
+        searchData = assembleFacade.assembleData(searchData, SysTypeEnum.ICSS_SERVICE.getKey());
+        BeanUtil.copyProperties(searchData, pushVO);
         Treat data = getTreatment(searchData);
         data = treatmentFacade.getTreatment(data, pushVO.getPatientId());
         return data;
     }
-
-    /**
-     * 推理接口-快易检
-     *
-     * @param pushKYJVO
-     * @return
-     */
-    public PushKYJDTO pushKYJ(PushKYJVO pushKYJVO) {
-        PushVO pushVO = new PushVO();
-        pushVO.setAge(pushKYJVO.getAge());
-        pushVO.setSex(pushKYJVO.getSex());
-        pushVO.setFeatureType(pushKYJVO.getFeatureType());
-
-        //化验结果
-        List<LisResult> lisResultList = pushKYJVO.getLisResultList();
-        for (LisResult lisResult : lisResultList) {
-            lisResult.setSource(LisSourceEnum.Outer.getKey());
-        }
-        pushVO.setLis(lisResultList);
-
-        SearchData searchData = assembleFacade.assembleData(pushVO);
-        ResponseData responseData = pushAipt(searchData);
-        PushKYJDTO pushKYJDTO = new PushKYJDTO();
-        pushKYJDTO.setLabs(responseData.getLabs());
-        pushKYJDTO.setDis(responseData.getDis());
-        return pushKYJDTO;
-    }
 }

icss-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,28 +1,20 @@
 package com.diagbot.vo;
 
+import com.diagbot.biz.push.entity.SearchData;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description:
+ * @Description:ICSS推理入参结构
  * @Author:zhaops
  * @time: 2018/11/20 13:38
  */
+
 @Getter
 @Setter
-public class PushVO  extends PushBaseVO {
-    private String diseaseName;
-    private Long patientId;   //病人id
-    private String scaleName; //量表名称
-    private Integer disType;  //0-普通病（默认不填），1-慢病，2-急诊
-    private String adverseReactions; //不良反应
-    private String indications;   //推理指标
-    private String hosCode; //医院编码
-
-    private String lisString;  //化验纯文本
-    private String lisOrder;   //当前正在下单化验
-    private String pacsOrder;   //当前正在下单辅检
-    private String otherOrder; //其他
-
-    private String ruleType;   //规则类型
+public class PushVO extends SearchData {
+    /**
+     * 病人id
+     */
+    private Long patientId;
 }

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

@@ -3,11 +3,9 @@ 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;
 import com.diagbot.facade.AssembleFacade;
 import com.diagbot.facade.PushFacade;
-import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,7 +14,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 
@@ -108,16 +105,4 @@ public class PushController {
     public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
     }
-
-    @ApiIgnore
-    @ApiOperation(value = "推理接口(快易检）[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，1：男，2：女<br>" +
-                    "lisKYJVOList：化验项列表(必填)<br>" +
-                    "featureType(必填)：类型，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断，8：治疗方案,String<br>")
-    @PostMapping("/pushKYJ")
-    @SysLogger("pushKYJ")
-    public RespDTO<PushKYJDTO> pushKYJ(@RequestBody @Valid PushKYJVO pushKYJVO) {
-        return RespDTO.onSuc(pushFacade.pushKYJ(pushKYJVO));
-    }
 }