Merge branch 'dev/mix20191205_push' into dev/triage20191218_deptshow

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

@@ -2,19 +2,19 @@ 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.biz.push.enums.FeatureTypeEnum;
 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;
 import com.diagbot.entity.Concept;
 import com.diagbot.enums.ConceptTypeEnum;
-import com.diagbot.enums.FeatureTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.facade.ClinicalFacade;
 import com.diagbot.facade.ConceptFacade;
@@ -61,7 +61,7 @@ public class PushItemAggregate {
             @DataConsumer("setSymptom") List<ConceptPushDTO> symptom,
             @DataConsumer("setVital") List<ConceptPushDTO> vital,
             @DataConsumer("setLab") List<ConceptPushDTO> lab,
-            @DataConsumer("setPacs") List<ConceptPushDTO> pacs,
+            @DataConsumer("setRetPacs") List<ConceptPushDTO> pacs,
             @DataConsumer("setDis") Map<String, List<ConceptPushDTO>> dis,
             @DataConsumer("setMedicalIndications") List<MedicalIndication> medicalIndications) {
         PushDTO pushDTO = new PushDTO();
@@ -211,8 +211,8 @@ public class PushItemAggregate {
         return labRes;
     }
 
-    @DataProvider("setPacs")
-    public List<ConceptPushDTO> setPacs(@InvokeParameter("featureTypeSet") Set<String> featureTypeSet,
+    @DataProvider("setRetPacs")
+    public List<ConceptPushDTO> setRetPacs(@InvokeParameter("featureTypeSet") Set<String> featureTypeSet,
                                         @InvokeParameter("data") ResponseData data,
                                         @InvokeParameter("isConnect") Boolean isConnect,
                                         @InvokeParameter("hosCode") String hosCode) {

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.vo.SearchVO;
+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,194 @@ public class SearchItemAggregate {
     private TransferFacade transferFacade;
 
     @DataProvider("assembleSearchData")
-    public SearchVo assembleSearchData(@InvokeParameter("searchVo") SearchVo searchVo,
+    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) {
+                                       @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);
-            }
+            //化验数据映射公表（化验公表项）
+            searchVO.setLis(lis);
+            //辅检数据映射公表（辅检项目）
+            searchVO.setPacs(pacs);
+            //诊断数据映射公表（诊断）
+            searchVO.setDiag(diag);
+            //药品数据映射公表（药品通用名）
+            searchVO.setDrug(drug);
+            //化验开单项映射
+            searchVO.setLisOrder(lisOrder);
+            //辅检开单项映射
+            searchVO.setPacsOrder(pacsOrder);
+            //诊断开单项映射
+            searchVO.setDiagOrder(diagOrder);
+            //药品开单项映射
+            searchVO.setDrugOrder(drugOrder);
+            //手术开单项映射
+            searchVO.setOperationOrder(operationOrder);
+            //其他开单项映射
+            searchVO.setOtherOrder(otherOrder);
+            //选中诊断映射
+            searchVO.setDiseaseName(diseaseName);
         }
-        return searchVo;
+        return searchVO;
     }
 
     /**
      * 化验增加公表项
      *
-     * @param searchVo
+     * @param searchVO
      * @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("searchVO") SearchVO searchVO) {
+        List<Lis> lis = searchVO.getLis();
+        lis = transferFacade.addLisUniqueName(lis, searchVO.getHosCode());
+        return lis;
     }
 
     /**
-     * 辅检转内部项目名称
+     * 辅检增加公表项
      *
-     * @param searchVo
+     * @param searchVO
      * @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("searchVO") SearchVO searchVO) {
+        List<Pacs> pacs = searchVO.getPacs();
+        pacs = transferFacade.addPacsUniqueName(pacs, searchVO.getHosCode());
         return pacs;
     }
 
     /**
-     * 诊断转内部名称
+     * 诊断增加公表项
      *
-     * @param searchVo
+     * @param searchVO
      * @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("searchVO") SearchVO searchVO) {
+        List<Item> diag = searchVO.getDiag();
+        diag = transferFacade.addItemUniqueName(diag, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
         return diag;
     }
 
     /**
-     * 获取治疗方案诊断转内部名称
+     * 药品增加公表项
      *
-     * @param searchVo
+     * @param searchVO
      * @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("searchVO") SearchVO searchVO) {
+        List<Item> drug = searchVO.getDrug();
+        drug = transferFacade.addItemUniqueName(drug, ConceptTypeEnum.Drug.getKey(), searchVO.getHosCode());
+        return drug;
     }
 
     /**
-     * 化验开单项映射公表名称
+     * 化验开单项增加公表名称
      *
-     * @param searchVo
+     * @param searchVO
      * @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("searchVO") SearchVO searchVO) {
+        List<Lis> lisOrder = searchVO.getLisOrder();
+        lisOrder = transferFacade.addLisUniqueName(lisOrder, searchVO.getHosCode());
         return lisOrder;
     }
 
     /**
-     * 辅检开单项转内部项目名称
+     * 辅检开单项增加公表项
      *
-     * @param searchVo
+     * @param searchVO
      * @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("searchVO") SearchVO searchVO) {
+        List<Pacs> pacsOrder = searchVO.getPacsOrder();
+        pacsOrder = transferFacade.addPacsUniqueName(pacsOrder, searchVO.getHosCode());
         return pacsOrder;
     }
+
+    /**
+     * 诊断开单项增加公表项
+     *
+     * @param searchVO
+     * @return
+     */
+    @DataProvider("setDiagOrder")
+    public List<Item> setDiagOrder(@InvokeParameter("searchVO") SearchVO searchVO) {
+        List<Item> diagOrder = searchVO.getDiagOrder();
+        diagOrder = transferFacade.addItemUniqueName(diagOrder, ConceptTypeEnum.Disease.getKey(), searchVO.getHosCode());
+        return diagOrder;
+    }
+
+    /**
+     * 药品开单项增加公表项
+     *
+     * @param searchVO
+     * @return
+     */
+    @DataProvider("setDrugOrder")
+    public List<Item> setDrugOrder(@InvokeParameter("searchVO") SearchVO searchVO) {
+        List<Item> drugOrder = searchVO.getDrugOrder();
+        drugOrder = transferFacade.addItemUniqueName(drugOrder, ConceptTypeEnum.Drug.getKey(), searchVO.getHosCode());
+        return drugOrder;
+    }
+
+    /**
+     * 手术开单项增加公表项
+     *
+     * @param searchVO
+     * @return
+     */
+    @DataProvider("setOperationOrder")
+    public List<Item> setOperationOrder(@InvokeParameter("searchVO") SearchVO searchVO) {
+        List<Item> operationOrder = searchVO.getOperationOrder();
+        operationOrder = transferFacade.addItemUniqueName(operationOrder, ConceptTypeEnum.OPERATION.getKey(), searchVO.getHosCode());
+        return operationOrder;
+    }
+
+    /**
+     * 其他开单项增加公表项（暂未处理）
+     *
+     * @param searchVO
+     * @return
+     */
+    @DataProvider("setOtherOrder")
+    public List<Item> setOtherOrder(@InvokeParameter("searchVO") SearchVO searchVO) {
+        List<Item> operationOrder = searchVO.getOperationOrder();
+        return operationOrder;
+    }
+
+    /**
+     * 诊断开单项增加公表项
+     *
+     * @param searchVO
+     * @return
+     */
+    @DataProvider("setDiseaseName")
+    public Item setDiseaseName(@InvokeParameter("searchVO") SearchVO searchVO) {
+        if (searchVO.getDiseaseName() == null) {
+            return null;
+        }
+        List<Item> diseaseItem = Lists.newLinkedList();
+        diseaseItem.add(searchVO.getDiseaseName());
+        diseaseItem = transferFacade.addItemUniqueName(diseaseItem, ConceptTypeEnum.Disease.getKey(), searchVO.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.dto.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,11 +1,10 @@
 package com.diagbot.client;
 
+import com.diagbot.biz.push.entity.ResponseData;
 import com.diagbot.client.bean.CalculateData;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
+import com.diagbot.client.bean.SearchData;
 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;
@@ -22,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 +0,0 @@
-package com.diagbot.client.bean;
-
-/**
- * Created by fyeman on 2018/1/17.
- */
-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/GdbResponse.java

@@ -1,18 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 图形数据库数据返回结构
- * Created by Mark Huang on 2018/10/26.
- */
-@Getter
-@Setter
-public class GdbResponse {
-    private String status = "";
-    private Map<String, String> Result = new HashMap<>();
-}

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,33 +0,0 @@
-package com.diagbot.client.bean;
-
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.eventbus.AllowConcurrentEvents;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-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);
-}

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

@@ -1,67 +1,25 @@
 package com.diagbot.client.bean;
 
-import com.diagbot.dto.LisResult;
+import com.diagbot.biz.push.entity.SearchBaseData;
 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/1/31.
+ * @Description:推理相关入参
+ * @Author:zhaops
+ * @time: 2019/12/6 10:02
  */
 @Getter
 @Setter
-public class SearchData {
-    private int length = 10;
+public class SearchData extends SearchBaseData {
     private int age_start = 0;
     private int age_end = 200;
-    private int age = 0;
-    private String sex;
-    // 搜索结果的贝叶斯阈值
+    /**
+     * 搜索结果的贝叶斯阈值
+     */
     private String threshold = "0";
-
-    private String symptom = "";
-    private String vital = "";
-    private String lis = "";
-    private String pacs = "";
-    private String diag = "";
-    private String pasts = "";
-    private String other = "";
-    private List<LisResult> lisArr;
-    private Integer disType; //0-普通病（默认不填），1-慢病，2-急诊
-    private String scaleName;
-    private String indications;
-
-    private String lisString;  //化验纯文本
-    private String lisOrder;   //当前正在下单化验
-    private String pacsOrder;   //当前正在下单辅检
-    private String otherOrder; //其他
-
-    private String ruleType;   //规则类型
-
-    //特征类别
-    private String featureType;
-    //特征类别对","进行分割后数据
-    private String[] featureTypes;
-    //门诊 住院分类
-    private String resourceType;
-    //模型
-    private AlgorithmClassify algorithmClassify[];
-    //模型
-    private String algorithmClassifyValue;
-    //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
-    private String sysCode;
-
-    private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.8f);
-
-
-    private List<Feature> symptomFeatureList = new ArrayList<>();
-    private List<Feature> vitalFeatureList = new ArrayList<>();
-    private List<Feature> lisFeatureList = new ArrayList<>();
-    private List<Feature> pacsFeatureList = new ArrayList<>();
-    private List<Feature> diagFeatureList = new ArrayList<>();
-    private List<Feature> symptompropertyFeatureList = new ArrayList<>();
+    /**
+     * 性别（M：男，F：女，A：通用）
+     */
+    private String sex;
 }

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/bean/TreatmentPlan.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:14
- */
-@Getter
-@Setter
-public class TreatmentPlan {
-    private String title;
-    private List<MeditionDetail> meditionDetails;
-}

aipt-service/src/main/java/com/diagbot/client/hystrix/AIServiceHystrix.java

@@ -1,11 +1,10 @@
 package com.diagbot.client.hystrix;
 
+import com.diagbot.biz.push.entity.ResponseData;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.bean.CalculateData;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
-import com.diagbot.vo.SearchVo;
+import com.diagbot.client.bean.SearchData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,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;
     }
@@ -35,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/LisResult.java

@@ -1,26 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:化验信息
- * @Author:zhaops
- * @time: 2018/12/19 14:03
- */
-@Getter
-@Setter
-public class LisResult {
-    private String name;//套餐名称
-    private String detailName;//化验项名称
-    private String uniqueName;//公表名称
-    private Double value;//值
-    private Double maxValue;//最大值
-    private Double minValue;//最小值
-    private String units;//单位
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
-    @NotNull(message = "请输入数据来源")
-    private Integer source;
-}

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

@@ -1,19 +0,0 @@
-package com.diagbot.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/11/7 15:02
- */
-@Getter
-@Setter
-public class PacsResult {
-    private String name;
-    @ApiModelProperty(hidden = true)
-    private String uniqueName;
-    private String result;
-}

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,9 @@ public class PushDTO {
     private Map<String, List<ConceptPushDTO>> dis;
     private ConceptPushDTO dept;
     private List<MedicalIndication> medicalIndications;
+    private Treat treat;
+    /**
+     * 有无病情提示标志（0：无，1：有）
+     */
+    private String hasIndications;
 }

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

@@ -0,0 +1,37 @@
+package com.diagbot.facade;
+
+import com.diagbot.biz.push.vo.SearchVO;
+import com.diagbot.client.bean.SearchData;
+import com.diagbot.util.BeanUtil;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:入参拼装
+ * @Author:zhaops
+ * @time: 2019/12/6 10:02
+ */
+@Component
+public class AssembleFacade {
+    /**
+     * 拼装数据
+     *
+     * @param searchVO
+     * @return
+     */
+    public SearchData assembleData(SearchVO searchVO) {
+        SearchData searchData = new SearchData();
+        BeanUtil.copyProperties(searchVO, searchData);
+        switch (searchVO.getSex()) {
+            case 1:
+                searchData.setSex("M");
+                break;
+            case 2:
+                searchData.setSex("F");
+                break;
+            default:
+                searchData.setSex("A");
+                break;
+        }
+        return searchData;
+    }
+}

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

@@ -1,26 +1,21 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
+import com.diagbot.biz.push.entity.ResponseData;
+import com.diagbot.biz.push.vo.SearchVO;
 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.client.bean.SearchData;
 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;
 
@@ -40,112 +35,46 @@ public class ClinicalFacade {
     @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;
+    private AssembleFacade assembleFacade;
 
     /**
      * 处理临床数据
      *
-     * @param searchVo
+     * @param searchVO
      * @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 SearchVO searchVO) {
+        SearchData searchData = assembleFacade.assembleData(searchVO);
+        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 searchVO
      * @return
      */
-    public Map<String, Object> scale(SearchVo searchVo) {
-        Map<String, Object> response = aiServiceClient.scale(searchVo);
+    public List<ScaleContent> getScale(SearchVO searchVO) {
+        SearchData searchData = assembleFacade.assembleData(searchVO);
+        Map<String, Object> response = aiServiceClient.scale(searchData);
         if (null == response) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "量表没有返回结果");
         }
-        return response;
+        List<ScaleContent> list = getContent(searchData.getScaleName(), JSON.toJSONString(response));
+        return list;
     }
 
-
     /**
      * 获取量表内容
      *
-     * @param searchVo
+     * @param scaleName
+     * @param pushContent
      * @return
      */
-    public List<ScaleContent> getScale(SearchVo searchVo) {
-        Map<String, Object> response = aiServiceClient.scale(searchVo);
-        if (null == response) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "量表没有返回结果");
-        }
-        List<ScaleContent> list = getContent(searchVo.getScaleName(), JSON.toJSONString(response));
-        return list;
-    }
-
     public List<ScaleContent> getContent(String scaleName, String pushContent) {
         List<ScaleContent> list = scaleContentService.getContentByName(scaleName);
         for (ScaleContent scaleContent : list) {
@@ -170,237 +99,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,13 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.service.impl.EvaluationServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.EvaluationDiseaseNameVO;
-import com.diagbot.vo.SearchVo;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,16 +23,19 @@ public class EvaluationFacade extends EvaluationServiceImpl {
     /**
      * 获取管理与评估模板接口
      *
-     * @param searchVo
+     * @param searchVO
      * @return
      */
-    public List<EvaluationDTO> getEvaluationModule(SearchVo searchVo) {
+    public List<EvaluationDTO> getEvaluationModule(SearchVO searchVO) {
+        if (searchVO.getDiseaseName() == null || StringUtil.isBlank(searchVO.getDiseaseName().getUniqueName())) {
+            return Lists.newArrayList();
+        }
 
         EvaluationDiseaseNameVO evaluationdiseaseNameVO = new EvaluationDiseaseNameVO();
-        BeanUtil.copyProperties(searchVo, evaluationdiseaseNameVO);
+        BeanUtil.copyProperties(searchVO, evaluationdiseaseNameVO);
         List<EvaluationDTO> evaluationList = this.getEvaluationModule(evaluationdiseaseNameVO);
 
-        Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVo);
+        Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVO);
         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.vo.SearchVO;
+import com.diagbot.biz.push.entity.Treat;
+import com.diagbot.biz.push.enums.FeatureTypeEnum;
 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,21 @@ public class PushFacade {
     /**
      * 推理接口
      *
-     * @param searchVo
+     * @param searchVO
      * @return ResponseData
      */
-    public PushDTO pushInner(SearchVo searchVo) {
+    public PushDTO pushInner(SearchVO searchVO) {
         PushDTO pushDTO = new PushDTO();
         //是否对接
-        Boolean isConnect = transferFacade.isConnect(searchVo.getHosCode(), searchVo.getSysType());
+        Boolean isConnect = transferFacade.isConnect(searchVO.getHosCode(), searchVO.getSysType());
         //入参预处理
-        searchVo = precSearchData(searchVo, isConnect);
-        ResponseData data = clinicalFacade.processClinicalData(searchVo);
+        searchVO = precSearchData(searchVO, isConnect);
+        ResponseData data = clinicalFacade.processClinicalData(searchVO);
 
-        String featureType = searchVo.getFeatureType();
+        //是否有病情提示标志
+        pushDTO.setHasIndications(data.getHasIndications());
+
+        String featureType = searchVO.getFeatureType();
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
@@ -59,89 +63,74 @@ public class PushFacade {
             invokeParams.put("featureTypeSet", featureTypeSet);
             invokeParams.put("data", data);
             invokeParams.put("isConnect", isConnect);
-            invokeParams.put("hosCode", searchVo.getHosCode());
+            invokeParams.put("hosCode", searchVO.getHosCode());
             pushDTO
                     = dataBeanAggregateQueryFacade.get("setAll", invokeParams, PushDTO.class);
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
-        return pushDTO;
-    }
-
-    /**
-     * 获取管理评估大数据推理内容
-     *
-     * @param searchVo
-     * @return
-     */
-    public Map<String, JSONObject> getManagementEvaluationContent(SearchVo searchVo) {
-        ResponseData data = clinicalFacade.processClinicalData(searchVo);
 
-        String featureType = searchVo.getFeatureType();
-        String[] featureTypes = featureType.split(",|，");
-        Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_ManagementEvaluation.getKey()))) {
-            return data.getManagementEvaluation();
-        } else {
-            return null;
+        //治疗方案单独处理
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Treat.getKey()))) {
+            pushDTO.setTreat(getTreatment(data.getTreat(), searchVO.getDiseaseName(), searchVO.getDisType()));
         }
+        return pushDTO;
     }
 
     /**
-     * 获取量表推理内容
+     * 获取治疗方案
      *
-     * @param searchVo
+     * @param
      * @return
      */
-    public Map<String, Object> scale(SearchVo searchVo) {
-        Map<String, Object> data = clinicalFacade.scale(searchVo);
-        return data;
+    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 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());
+    public Map<String, JSONObject> getManagementEvaluationContent(SearchVO searchVO) {
+        ResponseData data = clinicalFacade.processClinicalData(searchVO);
 
-        //数据引擎模式下，诊断名称转换成外部名称
-        if (isConnect && searchVo.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
-            treat.setDiseaseName(diseaseName);
+        String featureType = searchVO.getFeatureType();
+        String[] featureTypes = featureType.split(",|，");
+        Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_ManagementEvaluation.getKey()))) {
+            return data.getManagementEvaluation();
+        } else {
+            return null;
         }
-        return treat;
     }
 
     /**
      * searchData入参预处理
      *
-     * @param searchVo
+     * @param searchVO
      * @param isConnect
      * @return
      */
-    public SearchVo precSearchData(SearchVo searchVo, Boolean isConnect) {
+    public SearchVO precSearchData(SearchVO searchVO, Boolean isConnect) {
+        //未对接或非数据引擎模式，不做映射
+        if (!isConnect || (!searchVO.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey()))) {
+            return searchVO;
+        }
         try {
             Map<String, Object> inputParams = new HashMap<>();
-            inputParams.put("searchVo", searchVo);
+            inputParams.put("searchVO", searchVO);
             inputParams.put("isConnect", isConnect);
-            searchVo
-                    = dataBeanAggregateQueryFacade.get("assembleSearchData", inputParams, SearchVo.class);
+            searchVO
+                    = dataBeanAggregateQueryFacade.get("assembleSearchData", inputParams, SearchVO.class);
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
-        return searchVo;
+        return searchVO;
     }
 }

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

@@ -1,12 +1,14 @@
 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.biz.push.enums.FeatureTypeEnum;
 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.FeatureTypeEnum;
+import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.LisSourceEnum;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
@@ -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());
@@ -154,7 +155,7 @@ public class TreatmentFacade {
         try {
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("treat", treat);
-            invokeParams.put("diseaseName", diseaseName);
+            invokeParams.put("diseaseName", diseaseName.getUniqueName());
             invokeParams.put("drugsList", drugsList);
             invokeParams.put("treatmentPlan", treatmentPlanList);
             invokeParams.put("conceptMap", conceptMap);

aipt-service/src/main/java/com/diagbot/vo/EvaluationDiseaseNameVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.biz.push.vo.SearchVO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,8 +12,5 @@ import lombok.Setter;
  */
 @Setter
 @Getter
-public class EvaluationDiseaseNameVO extends SearchVo{
-
-	//private String diseaseName;
-	
+public class EvaluationDiseaseNameVO extends SearchVO {
 }

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -1,52 +0,0 @@
-package com.diagbot.vo;
-
-import com.diagbot.dto.LisResult;
-import com.diagbot.dto.PacsResult;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/3/4 16:35
- */
-@Getter
-@Setter
-public class SearchVo {
-    @ApiModelProperty(hidden = true)
-    private int length = 10;
-    //外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
-    @ApiModelProperty(hidden = true)
-    private String sysCode = "1";
-    private int age;
-    private String sex;
-    //特征类别
-    private String featureType;
-    private String symptom;
-    private String pasts;
-    private String other;
-    private String vital;
-    @ApiModelProperty(hidden = true)
-    private String lis;
-    private List<LisResult> lisArr;
-    private String pacs;
-    private List<PacsResult> pacsArr;
-    private String diag;
-    private String diseaseName; //指定诊断，例如取治疗方案
-    private String scaleName;   //量表名称
-    private String indications; //指标结果
-    private String adverseReactions; //不良反应
-    private Integer disType;    //诊断类型
-    private String hosCode;  // 对接时，hosCode必填
-    private Integer sysType; //系统类型
-
-    private String lisString;  //化验纯文本
-    private String lisOrder;   //当前正在下单化验
-    private String pacsOrder;   //当前正在下单辅检
-    private String otherOrder; //其他
-
-    private String ruleType;   //规则类型
-}

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.ResponseData;
+import com.diagbot.biz.push.vo.SearchVO;
 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;
@@ -15,7 +15,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;
 import java.util.List;
@@ -40,25 +39,16 @@ public class ClinicalController {
     @ApiOperation(value = "知识库标准化-临床数据处理(只是用大数据推理)", notes = "")
     @PostMapping("/processData")
     @SysLogger("processData")
-    public RespDTO<ResponseData> processData(@Valid @RequestBody SearchVo searchVo) {
-        ResponseData data = clinicalFacade.processClinicalData(searchVo);
-        return RespDTO.onSuc(data);
-    }
-
-    @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<ResponseData> processData(@Valid @RequestBody SearchVO searchVO) {
+        ResponseData data = clinicalFacade.processClinicalData(searchVO);
         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 SearchVO searchVO) {
+        List<ScaleContent> data = clinicalFacade.getScale(searchVO);
         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.vo.SearchVO;
 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 SearchVO searchVO) {
+        List<EvaluationDTO> data = evaluationFacade.getEvaluationModule(searchVO);
         return RespDTO.onSuc(data);
     }
 }

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

@@ -1,11 +1,10 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.client.bean.Treat;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
-import com.diagbot.vo.SearchVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,82 +28,63 @@ public class PushController {
     @Autowired
     private PushFacade pushFacade;
 
-    @ApiOperation(value = "知识库标准化-治疗方案[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，M：男，F：女<br>" +
-                    "symptom：症状,String<br>" +
-                    "pasts：既往史,String<br>" +
-                    "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
-                    "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "pacsArr：辅检结构化输入,Array<br>" +
-                    "pacsArr:name：辅检项目,String<br>" +
-                    "pacsArr:uniqueName：辅检项目（标准术语名）,String<br>" +
-                    "pacsArr：result：辅检结果,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，8：治疗方案,String<br>" +
-                    "diseaeName：取治疗方案的诊断,String<br>" +
-                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
-                    "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>" +
-                    "lisString：化验纯文本,String<br>" +
-                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
-                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
-                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>")
-    @PostMapping("/treatment")
-    @SysLogger("treatment")
-    public RespDTO<Treat> getTreatment(@Valid @RequestBody SearchVo searchVo) {
-        Treat data = pushFacade.getTreatment((searchVo));
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "知识库标准化-推理接口[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，M：男，F：女<br>" +
-                    "symptom：症状,String<br>" +
+            notes = "hosCode： 医院编码<br>" +
+                    "featureType：类型(必填多选)，1：症状，4：查体结果，41：查体模板，42：查体指标，5：化验，6：辅检，7：诊断，8：治疗方案，22：病情提示（核心指标、危急值、开单合理项、异常值等）,多项用逗号分开，String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>" +
+                    "age： 年龄(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女，Integer<br>" +
+                    "chief：主诉,String<br>" +
+                    "symptom：现病史,String<br>" +
+                    "vital：查体,String<br>" +
                     "pasts：既往史,String<br>" +
+                    "infectious：传染病史,String<br>" +
+                    "operation：手术外伤史,String<br>" +
+                    "allergy：过敏史,String<br>" +
+                    "vaccination：接种史,String<br>" +
+                    "personal：个人史,String<br>" +
+                    "marital：婚育史,String<br>" +
+                    "family：家族史,String<br>" +
+                    "menstrual：月经史,String<br>" +
                     "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
+                    "lisString：化验文本输入,String<br>" +
+                    "pacsString：辅检文本输入,String<br>" +
+                    "diagString：诊断文本输入,String<br>" +
+                    "drugString：药品文本输入,String<br>" +
+                    "lis：化验,ArrayList<br>" +
+                    "lis.name：套餐名称(必填),String<br>" +
+                    "lis.detailName：化验项名称(必填),String<br>" +
+                    "lis.uniqueName：公表名称,String<br>" +
+                    "lis.value：值,Double<br>" +
+                    "lis.otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
                     "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "pacsArr：辅检结构化输入,Array<br>" +
-                    "pacsArr:name：辅检项目,String<br>" +
-                    "pacsArr:uniqueName：辅检项目（标准术语名）,String<br>" +
-                    "pacsArr：result：辅检结果,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，42：查体指标，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
-                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
-                    "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>" +
-                    "lisString：化验纯文本,String<br>" +
-                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
-                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
-                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>")
+                    "lis.minValue：最小值,Double<br>" +
+                    "lis.maxValue：最大值,Double<br>" +
+                    "lis.result：HIS比较结果,String<br>" +
+                    "lis.dateValue：结果时间,String<br>" +
+                    "lis：source：数据来源（必填）,0：内部来源，1：外部来源,Integer<br>" +
+                    "pacs：辅检,ArrayList<br>" +
+                    "pacs.name：辅检项目(外部),String<br>" +
+                    "pacs.uniqueName：公表名辅检项目（内部）,String<br>" +
+                    "pacs.desc：检查描述（描述信息）,String<br>" +
+                    "pacs.result：检查结果（非描述信息）,String<br>" +
+                    "pacs.dateValue：结果时间,String<br>" +
+                    "diag：诊断,ArrayList<br>" +
+                    "item.name：外部项目名称（诊断、药品等）,String<br>" +
+                    "item.uniqueName：内部项目名称（诊断、药品等）,String<br>" +
+                    "item.dateValue：结果时间，String<br>" +
+                    "lisOrder：当前化验开单项，参考lis结构<br>" +
+                    "pacsOrder：当前辅检开单项，参考pacs结构<br>" +
+                    "diagOrder：当前诊断开单项，参考item结构<br>" +
+                    "drugOrder：当前药品开单项，参考item结构<br>" +
+                    "operationOrder：当前手术开单项，参考item结构<br>" +
+                    "otherOrder：其他开单项，参考item结构<br>" +
+                    "diseaseName：选中诊断，参考item结构<br>" +
+                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
-    public RespDTO<PushDTO> pushInner(@Valid @RequestBody SearchVo searchVo) {
-        PushDTO data = pushFacade.pushInner(searchVo);
+    public RespDTO<PushDTO> pushInner(@Valid @RequestBody SearchVO searchVO) {
+        PushDTO data = pushFacade.pushInner(searchVO);
         return RespDTO.onSuc(data);
     }
 }

aipt-service/src/main/resources/mapper/EvaluationMapper.xml

@@ -31,7 +31,7 @@
 		WHERE a.is_deleted = "N"
 		AND b.lib_type = 18
 		<if test="evaluationModule.diseaseName != null">
-		AND b.lib_name = #{evaluationModule.diseaseName}
+		AND b.lib_name = #{evaluationModule.diseaseName.uniqueName}
 		</if>
 	</select>
 </mapper>

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

@@ -0,0 +1,38 @@
+package com.diagbot.biz.push.dto;
+
+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/AdverseReaction.java

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

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

@@ -1,4 +1,4 @@
-package com.diagbot.client.bean;
+package com.diagbot.biz.push.entity;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -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;
 }

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

@@ -1,11 +1,8 @@
-package com.diagbot.client.bean;
+package com.diagbot.biz.push.entity;
 
-import com.diagbot.dto.HospitalDeptDTO;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 /**
  * Created by fyeman on 2018/1/17.
  */
@@ -16,5 +13,4 @@ public class FeatureRate {
     private String extraProperty;
     private String desc;
     private String rate;
-    private List<HospitalDeptDTO> hospitalDepts;
 }

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

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

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

@@ -0,0 +1,58 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @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 String dateValue;
+    /**
+     * 数据来源（0：内部数据，1：外部数据）
+     */
+    private Integer source;
+    /**
+     * HIS比较结果
+     */
+    private String result;
+}

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

@@ -0,0 +1,150 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:病历基本信息
+ * @Author:zhaops
+ * @time: 2019/12/16 16:22
+ */
+@Getter
+@Setter
+public class MRBaseData {
+    /**
+     * 医院编码
+     */
+    private String hosCode = "";
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 婚姻
+     */
+    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 = new ArrayList<>();
+    /**
+     * 辅检项目和结果
+     */
+    private List<Pacs> pacs = new ArrayList<>();
+    /**
+     * 诊断
+     */
+    private List<Item> diag = new ArrayList<>();
+    /**
+     * 药品
+     */
+    private List<Item> drug = new ArrayList<>();
+    /**
+     * 当前化验开单项
+     */
+    private List<Lis> lisOrder = new ArrayList<>();
+    /**
+     * 当前辅检开单项
+     */
+    private List<Pacs> pacsOrder = new ArrayList<>();
+    /**
+     * 当前诊断开单项
+     */
+    private List<Item> diagOrder = new ArrayList<>();
+    /**
+     * 当前药品开单项
+     */
+    private List<Item> drugOrder = new ArrayList<>();
+    /**
+     * 当前手术开单项
+     */
+    private List<Item> operationOrder = new ArrayList<>();
+    /**
+     * 其他开单项
+     */
+    private List<Item> otherOrder = new ArrayList<>();
+    /**
+     * 选中诊断
+     */
+    private Item diseaseName;
+    /**
+     * 诊断类型（0-普通病（默认不填），1-慢病，2-急诊）
+     */
+    private Integer disType = 0;
+    /**
+     * 量表名称
+     */
+    private String scaleName = "";
+}

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

@@ -1,4 +1,4 @@
-package com.diagbot.client.bean;
+package com.diagbot.biz.push.entity;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -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

@@ -0,0 +1,24 @@
+package com.diagbot.biz.push.entity;
+
+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 {
+    /**
+     * 类型（1：量表，2：计算公式，3：其他指标，可能结果等，4：危急值、开单合理项、异常值等规则推送结果）
+     */
+    private Integer type;
+    /**
+     * 动态内容（量表不返回具体结构，只提供名称，具体内容单独获取）
+     * 返回结构包含以下控件类型controlType（0：单选-radio，2：多选-checkbox，2：文本框-text，3：下拉列表-dropdownlist）
+     */
+    private JSONObject content;
+}

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

@@ -1,4 +1,4 @@
-package com.diagbot.client.bean;
+package com.diagbot.biz.push.entity;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -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

@@ -0,0 +1,60 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.LinkedList;
+
+/**
+ * @Description:药品分类
+ * @Author:zhaops
+ * @time: 2018/12/17 13:32
+ */
+@Getter
+@Setter
+public class MedicitionClass {
+    /**
+     * 是否有静态知识（0：无，1：有）
+     */
+    private String showInfo = "0";
+    /**
+     * 药品分类禁用慎用标志（0：正常，1：慎用，2：禁用）
+     */
+    private String drugsForbidden;
+    /**
+     * 药品大类术语id
+     */
+    private Long bigdrugsConceptId;
+    /**
+     * 药品大类名称
+     */
+    private String bigdrugsName;
+    /**
+     * 药品大类词性
+     */
+    private Integer bigdrgusLibType;
+    /**
+     * 药品大类类型
+     */
+    private Integer bigdrugsType;
+    /**
+     * 药品小类术语id
+     */
+    private Long subdrugsConceptId;
+    /**
+     * 药品小类名称
+     */
+    private String subdrugsName;
+    /**
+     * 药品小类词性
+     */
+    private Integer subdrugsLibType;
+    /**
+     * 药品小类类型
+     */
+    private Integer subdrugsType;
+    /**
+     * 药品列表
+     */
+    private LinkedList<Medicition> medicitionsList;
+}

data-service/src/main/java/com/diagbot/client/bean/MeditionDetail.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:15
  */
 @Getter
 @Setter
 public class MeditionDetail {
+    /**
+     * 标题（二级标题）
+     */
     private String description;
+    /**
+     * 药品分类列表
+     */
     private List<MedicitionClass> treatment;
 }

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

@@ -0,0 +1,34 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:辅检结构
+ * @Author:zhaops
+ * @time: 2019/12/6 11:13
+ */
+@Getter
+@Setter
+public class Pacs {
+    /**
+     * HIS项目
+     */
+    private String name;
+    /**
+     * 内部检查项目（公表名）
+     */
+    private String uniqueName;
+    /**
+     * 描述信息
+     */
+    private String desc;
+    /**
+     * 检查结果（结果非描述信息）
+     */
+    private String result;
+    /**
+     * 结果时间
+     */
+    private String dateValue;
+}

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

@@ -0,0 +1,66 @@
+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;
+    /**
+     * 有无病情提示标志（0：无，1：有）
+     */
+    private String hasIndications;
+
+    private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
+}

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

@@ -0,0 +1,39 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推理通用入参
+ * @Author:zhaops
+ * @time: 2019/12/11 14:16
+ */
+@Getter
+@Setter
+public class SearchBaseData extends MRBaseData {
+    /**
+     * 外部系统编码 用于返回映射数据，如果sysCode为空或null，则返回kl_standard_info标准名称
+     */
+    private String sysCode = "1";
+    /**
+     * 大数据返回内容截取长度
+     */
+    private Integer length = 10;
+
+    /**
+     * 推理类型（1：症状，4：查体结果，41：查体模板，42：查体指标，5：化验，6：辅检，7：诊断，8：治疗方案，11：管理评估，21：量表，22：病情提示-量表、计算公式、可能结果、危急值、开单合理性、异常值等）
+     */
+    private String featureType = "";
+    /**
+     * 规则类型（1:危机值提醒，2：开单合理性，3：管理评估，4：不良反应，5：药物推荐，6：异常值）
+     */
+    private String ruleType = "";
+    /**
+     * 是否映射（0：否，1：是）
+     */
+    private Integer isMapping;
+    /**
+     * 系统类型
+     */
+    private Integer sysType;
+}

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

@@ -0,0 +1,50 @@
+package com.diagbot.biz.push.entity;
+
+import com.diagbot.biz.push.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 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;
+}

icss-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;
 }

aipt-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -1,4 +1,4 @@
-package com.diagbot.enums;
+package com.diagbot.biz.push.enums;
 
 import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
@@ -13,6 +13,7 @@ public enum FeatureTypeEnum implements KeyedNamed {
     Feature_Type_Past(1, "既往史"),
     Feature_Type_Other(3, "其他史"),
     Feature_Type_Vital_Result(4, "查体结果"),
+    Feature_Type_Vital_Module(42, "查体模板"),
     Feature_Type_Vital_Index(42, "查体指标"),
     Feature_Type_Lis(5, "化验"),
     Feature_Type_Pacs(6, "辅检"),
@@ -20,7 +21,8 @@ public enum FeatureTypeEnum implements KeyedNamed {
     Feature_Type_Treat(8, "治疗"),
     Feature_Type_ManagementEvaluation(11, "管理评估"),
     Feature_Type_Scale(21, "量表"),
-    Feature_Type_Indication(22, "指标");
+    Feature_Type_Indication(22, "指标"),
+    Feature_Type_Operation(25, "手术");
 
     @Setter
     private int key;

common/src/main/java/com/diagbot/biz/push/vo/SearchVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.biz.push.vo;
+
+import com.diagbot.biz.push.entity.SearchBaseData;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推理个性化入参
+ * @Author:zhaops
+ * @time: 2019/12/11 14:18
+ */
+@Getter
+@Setter
+public class SearchVO extends SearchBaseData {
+    /**
+     * 性别（1：男，2：女，3：通用）
+     */
+    private Integer sex;
+}

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

@@ -1,9 +1,8 @@
 package com.diagbot.client;
 
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
-import com.diagbot.client.bean.SearchData;
-import com.diagbot.client.bean.Treat;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DictionaryInfoDTO;
@@ -36,20 +35,12 @@ public interface AiptServiceClient {
     /**
      * 推理
      *
-     * @param searchData
+     * @param searchVO
      * @return
      */
     @PostMapping("/push/pushInner")
-    RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData);
+    RespDTO<PushDTO> pushInner(@RequestBody SearchVO searchVO);
 
-    /**
-     * 获取治疗方案
-     *
-     * @param searchData
-     * @return
-     */
-    @PostMapping("/push/treatment")
-    RespDTO<Treat> getTreatment(@RequestBody SearchData searchData);
 
     @PostMapping("/disclaimerInformation/getDisclaimerInformations")
     RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
@@ -66,11 +57,11 @@ public interface AiptServiceClient {
     /**
      * 获取量表接口
      *
-     * @param searchData
+     * @param searchVO
      * @return
      */
     @PostMapping(value = "/clinicaldata/getScale")
-    RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData);
+    RespDTO<List<ScaleContent>> getScale(@RequestBody SearchVO searchVO);
 
     /**
      * 获取提示信息

data-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;
-}

data-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-选中
-}

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

@@ -1,26 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:化验信息
- * @Author:zhaops
- * @time: 2018/12/19 14:03
- */
-@Getter
-@Setter
-public class LisResult {
-    private String name;//套餐名称
-    private String detailName;//化验项名称
-    private String uniqueName;//公表名称
-    private Double value;//值
-    private Double maxValue;//最大值
-    private Double minValue;//最小值
-    private String units;//单位
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
-    @NotNull(message = "请输入数据来源")
-    private Integer source;
-}

data-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
-}

data-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;
-}

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

@@ -1,45 +0,0 @@
-package com.diagbot.client.bean;
-
-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 lisOrder;   //当前正在下单化验
-    private String pacsOrder;   //当前正在下单辅检
-    private String otherOrder; //其他
-
-    private String ruleType;   //规则类型
-}

data-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;
-}

data-service/src/main/java/com/diagbot/client/bean/TreatmentPlan.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:14
- */
-@Getter
-@Setter
-public class TreatmentPlan {
-    private String title;
-    private List<MeditionDetail> meditionDetails;
-}

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

@@ -1,10 +1,9 @@
 package com.diagbot.client.hystrix;
 
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ScaleContent;
-import com.diagbot.client.bean.SearchData;
-import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.DisclaimerInformationDTO;
@@ -36,26 +35,15 @@ public class AiptServiceHystrix implements AiptServiceClient {
     /**
      * 推理
      *
-     * @param searchData
+     * @param searchVO
      * @return
      */
     @Override
-    public RespDTO<PushDTO> pushInner(@RequestBody SearchData searchData) {
+    public RespDTO<PushDTO> pushInner(@RequestBody SearchVO searchVO) {
         log.error("【hystrix】调用{}异常", "pushInner");
         return null;
     }
 
-    /**
-     * 获取治疗方案
-     *
-     * @param searchData
-     * @return
-     */
-    @Override
-    public RespDTO<Treat> getTreatment(@RequestBody SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "getTreatment");
-        return null;
-    }
 
     @Override
     public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
@@ -78,11 +66,11 @@ public class AiptServiceHystrix implements AiptServiceClient {
     /**
      * 获取量表接口
      *
-     * @param searchData
+     * @param searchVO
      * @return
      */
     @Override
-    public RespDTO<List<ScaleContent>> getScale(@RequestBody SearchData searchData) {
+    public RespDTO<List<ScaleContent>> getScale(@RequestBody SearchVO searchVO) {
         log.error("【hystrix】调用{}异常", "getScale");
         return null;
     }

data-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;
 
@@ -8,18 +9,43 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: 推理出参
+ * @Description: 页面推送模式推理出参
  * @Author:zhaops
  * @time: 2018/11/20 13:44
  */
 @Getter
 @Setter
 public class PushDTO {
+    /**
+     * 症状
+     */
     private List<ConceptPushDTO> symptom;
-    private List<ConceptPushDTO> other;
+    /**
+     * 体征结果
+     */
     private List<ConceptPushDTO> vital;
+    /**
+     * 化验
+     */
     private List<ConceptPushDTO> lab;
+    /**
+     * 辅检
+     */
     private List<ConceptPushDTO> pacs;
+    /**
+     * 诊断
+     */
     private Map<String, List<ConceptPushDTO>> dis;
+    /**
+     * 病情提示
+     */
     private List<MedicalIndication> medicalIndications;
+    /**
+     * 治疗方案
+     */
+    private Treat treat;
+    /**
+     * 有无病情提示标志（0：无，1：有）
+     */
+    private String hasIndications;
 }

data-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -1,58 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @Description: 推送类型
- * @Author:zhaops
- * @time: 2019/3/14 11:28
- */
-public enum FeatureTypeEnum implements KeyedNamed {
-    Symptom(1, "症状"),
-    Other(3, "其他史"),
-    VitalResult(4, "查体结果"),
-    VitalIndex(42, "查体指标"),
-    Lis(5, "化验"),
-    Pacs(6, "辅检"),
-    Disease(7, "诊断"),
-    Treat(8, "治疗"),
-    Scale(21, "量表内容"),
-    MedicalIndication(22, "指标"),
-    ManagementEvaluation(11, "管理评估");
-
-    @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;
-    }
-}

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

@@ -1,15 +1,11 @@
 package com.diagbot.facade;
 
-import com.diagbot.client.bean.LisResult;
-import com.diagbot.client.bean.SearchData;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
 import com.diagbot.vo.PushVO;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description:
  * @Author:zhaops
@@ -24,47 +20,12 @@ public class AssembleFacade {
      * @param pushVO
      * @return SearchData
      */
-    public SearchData assembleData(PushVO pushVO) {
-        SearchData searchData = new SearchData();
-        searchData.setAge(pushVO.getAge());
-        searchData.setSymptom(pushVO.getSymptom());
-        searchData.setVital(pushVO.getVital());
-        searchData.setLis(pushVO.getLisString());
-        searchData.setPacs(pushVO.getPacs());
-        searchData.setPasts(pushVO.getPasts());
-        searchData.setOther(pushVO.getOther());
-        searchData.setDiag(pushVO.getDiag());
-        searchData.setDisType(pushVO.getDisType());
-        searchData.setAdverseEvent(pushVO.getAdverseReactions());
-        searchData.setScaleName(pushVO.getScaleName());
-        searchData.setDiseaseName(pushVO.getDiseaseName());
-        searchData.setIndications(pushVO.getIndications());
-        searchData.setFeatureType(pushVO.getFeatureType());
-        searchData.setSysCode("1");
-        searchData.setLength(10);
-        searchData.setSysType(SysTypeEnum.DATA_SERVICE.getKey());
-        searchData.setHosCode(pushVO.getHosCode());
-
-        searchData.setLisOrder(pushVO.getLisOrder());
-        searchData.setPacsOrder(pushVO.getPacsOrder());
-        searchData.setOtherOrder(pushVO.getOtherOrder());
-        searchData.setRuleType(pushVO.getRuleType());
-
-        switch (pushVO.getSex()) {
-            case 1:
-                searchData.setSex("M");
-                break;
-            case 2:
-                searchData.setSex("F");
-                break;
-            default:
-                searchData.setSex("A");
-                break;
-        }
-        if (ListUtil.isNotEmpty(pushVO.getLis())) {
-            List<LisResult> lisResultList = BeanUtil.listCopyTo(pushVO.getLis(), LisResult.class);
-            searchData.setLisArr(lisResultList);
-        }
-        return searchData;
+    public SearchVO assembleData(PushVO pushVO) {
+        SearchVO searchVO = new SearchVO();
+        BeanUtil.copyProperties(pushVO, searchVO);
+        searchVO.setSysCode("1");
+        searchVO.setLength(10);
+        searchVO.setSysType(SysTypeEnum.DATA_SERVICE.getKey());
+        return searchVO;
     }
 }

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

@@ -1,13 +1,12 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.vo.SearchVO;
+import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ScaleContent;
-import com.diagbot.client.bean.SearchData;
-import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.ConceptPushDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.enums.FeatureTypeEnum;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.PushVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,6 @@ import org.springframework.stereotype.Component;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -39,62 +37,50 @@ public class PushFacade {
      */
     public PushDTO push(PushVO pushVO) {
         PushDTO pushDTO = new PushDTO();
-        SearchData searchData = assembleFacade.assembleData(pushVO);
-        RespDTO<PushDTO> respDTO = aiptServiceClient.pushInner(searchData);
+        SearchVO searchVO = assembleFacade.assembleData(pushVO);
+        RespDTO<PushDTO> respDTO = aiptServiceClient.pushInner(searchVO);
         RespDTOUtil.respNGDeal(respDTO, "中间层没有返回结果");
         PushDTO data = respDTO.data;
 
-        String featureType = searchData.getFeatureType();
+        String featureType = searchVO.getFeatureType();
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
         //症状
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Symptom.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Symptom.getKey()))) {
             List<ConceptPushDTO> symptom = data.getSymptom();
             pushDTO.setSymptom(symptom);
         }
-        //其他史
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Other.getKey()))) {
-        }
         //查体
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalResult.getKey())) ||
-                featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalIndex.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Result.getKey())) ||
+                featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Index.getKey()))) {
             List<ConceptPushDTO> vitals = data.getVital();
             pushDTO.setVital(vitals);
         }
         //化验
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Lis.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Lis.getKey()))) {
             List<ConceptPushDTO> labs = data.getLab();
             pushDTO.setLab(labs);
         }
         //辅检
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Pacs.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Pacs.getKey()))) {
             pushDTO.setPacs(data.getPacs());
         }
         //诊断
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Disease.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Disease.getKey()))) {
             pushDTO.setDis(data.getDis());
         }
         //推送指标
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.MedicalIndication.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Indication.getKey()))) {
             pushDTO.setMedicalIndications(data.getMedicalIndications());
         }
+        //治疗方案
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Treat.getKey()))) {
+            pushDTO.setTreat(data.getTreat());
+        }
         return pushDTO;
     }
 
-    /**
-     * 治疗方案推送-不包含慢病内容
-     *
-     * @param pushVO
-     * @return
-     */
-    public Treat pushTreatment(PushVO pushVO) {
-        SearchData searchData = assembleFacade.assembleData(pushVO);
-        RespDTO<Treat> res = aiptServiceClient.getTreatment(searchData);
-        RespDTOUtil.respNGDeal(res, "中间层没有返回治疗方案");
-        return res.data;
-    }
-
     /**
      * 治疗方案推送-不包含慢病内容
      *
@@ -102,8 +88,8 @@ public class PushFacade {
      * @return
      */
     public List<ScaleContent> pushScale(PushVO pushVO) {
-        SearchData searchData = assembleFacade.assembleData(pushVO);
-        RespDTO<List<ScaleContent>> res = aiptServiceClient.getScale(searchData);
+        SearchVO searchVO = assembleFacade.assembleData(pushVO);
+        RespDTO<List<ScaleContent>> res = aiptServiceClient.getScale(searchVO);
         RespDTOUtil.respNGDeal(res, "中间层没有返回量表");
         List<ScaleContent> data = res.data;
         return data;

data-service/src/main/java/com/diagbot/vo/PushBaseVO.java

@@ -1,33 +0,0 @@
-package com.diagbot.vo;
-
-import com.diagbot.client.bean.LisResult;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description: 推理参数
- * @Author:zhaops
- * @time: 2019/4/17 14:42
- */
-@Getter
-@Setter
-public class PushBaseVO {
-    @NotNull(message = "请输入年龄")
-    private Integer age;
-    @NotNull(message = "请输入性别")
-    private Integer sex;
-    @NotBlank(message = "请输入推送类型")
-    private String featureType;
-    private String symptom;
-    private String diag;
-    private String vital;
-    private List<LisResult> lis;
-    private String pacs;
-    private String pasts;
-    private String other;
-}

data-service/src/main/java/com/diagbot/vo/PushJoinVO.java

@@ -1,13 +1,12 @@
 package com.diagbot.vo;
 
-import com.diagbot.client.bean.LisResult;
+import com.diagbot.biz.push.entity.MRBaseData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Description:
@@ -16,34 +15,17 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class PushJoinVO {
-    @NotNull(message = "请输入年龄")
-    private Integer age;
+public class PushJoinVO extends MRBaseData {
+    /**
+     * 性别
+     */
     @NotNull(message = "请输入性别")
     private Integer sex;
-    private String symptom;
-    private String diag;
-    private String vital;
-    private List<LisResult> lis;
-    private String pacs;
-    @ApiModelProperty(hidden = true)
-    private String past;
-    private String other;
-    //不能分类文本
-    private String unknown;
 
-    private String diseaseName;
-    private String scaleName; //量表名称
-    @ApiModelProperty(hidden = true)
-    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 unknown;
 
     //创建时间
     @ApiModelProperty(hidden = true)
@@ -57,4 +39,4 @@ public class PushJoinVO {
     //过期时间字符串
     @ApiModelProperty(hidden = true)
     private String expireTimeStr;
-}
+}

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

@@ -1,29 +1,15 @@
 package com.diagbot.vo;
 
-import io.swagger.annotations.ApiModelProperty;
+import com.diagbot.biz.push.vo.SearchVO;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description:
+ * @Description:页面推送模式推理入参
  * @Author:zhaops
  * @time: 2018/11/20 13:38
  */
 @Getter
 @Setter
-public class PushVO  extends PushBaseVO {
-    private String diseaseName;
-    private String scaleName; //量表名称
-    @ApiModelProperty(hidden = true)
-    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 SearchVO {
 }

data-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;
@@ -31,108 +30,119 @@ public class PushController {
     PushFacade pushFacade;
 
     @ApiOperation(value = "数据服务模式-推理[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填) 1：男，2：女<br>" +
-                    "symptom：症状,String<br>" +
+            notes = "hosCode： 医院编码<br>" +
+                    "featureType：类型(必填多选)，1：症状，4：查体结果，41：查体模板，42：查体指标，5：化验，6：辅检，7：诊断，8：治疗方案，22：病情提示（核心指标、危急值、开单合理项、异常值等）,多项用逗号分开，String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>" +
+                    "age： 年龄(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女，Integer<br>" +
+                    "chief：主诉,String<br>" +
+                    "symptom：现病史,String<br>" +
+                    "vital：查体,String<br>" +
                     "pasts：既往史,String<br>" +
+                    "infectious：传染病史,String<br>" +
+                    "operation：手术外伤史,String<br>" +
+                    "allergy：过敏史,String<br>" +
+                    "vaccination：接种史,String<br>" +
+                    "personal：个人史,String<br>" +
+                    "marital：婚育史,String<br>" +
+                    "family：家族史,String<br>" +
+                    "menstrual：月经史,String<br>" +
                     "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
+                    "lisString：化验文本输入,String<br>" +
+                    "pacsString：辅检文本输入,String<br>" +
+                    "diagString：诊断文本输入,String<br>" +
+                    "drugString：药品文本输入,String<br>" +
+                    "lis：化验,ArrayList<br>" +
+                    "lis.name：套餐名称(必填),String<br>" +
+                    "lis.detailName：化验项名称(必填),String<br>" +
+                    "lis.uniqueName：公表名称,String<br>" +
+                    "lis.value：值,Double<br>" +
+                    "lis.otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
                     "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，42：查体指标，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
-                    "diseaseName：取治疗方案的诊断,String<br>" +
-                    "scaleName：量表名称,String<br>" +
-                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
-                    "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>" +
-                    "lisString：化验纯文本,String<br>" +
-                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
-                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
-                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐，多项用分号隔开,String<br>")
+                    "lis.minValue：最小值,Double<br>" +
+                    "lis.maxValue：最大值,Double<br>" +
+                    "lis.result：HIS比较结果,String<br>" +
+                    "lis.dateValue：结果时间,String<br>" +
+                    "lis：source：数据来源（必填）,0：内部来源，1：外部来源,Integer<br>" +
+                    "pacs：辅检,ArrayList<br>" +
+                    "pacs.name：辅检项目(外部),String<br>" +
+                    "pacs.uniqueName：公表名辅检项目（内部）,String<br>" +
+                    "pacs.desc：检查描述（描述信息）,String<br>" +
+                    "pacs.result：检查结果（非描述信息）,String<br>" +
+                    "pacs.dateValue：结果时间,String<br>" +
+                    "diag：诊断,ArrayList<br>" +
+                    "item.name：外部项目名称（诊断、药品等）,String<br>" +
+                    "item.uniqueName：内部项目名称（诊断、药品等）,String<br>" +
+                    "item.dateValue：结果时间，String<br>" +
+                    "lisOrder：当前化验开单项，参考lis结构<br>" +
+                    "pacsOrder：当前辅检开单项，参考pacs结构<br>" +
+                    "diagOrder：当前诊断开单项，参考item结构<br>" +
+                    "drugOrder：当前药品开单项，参考item结构<br>" +
+                    "operationOrder：当前手术开单项，参考item结构<br>" +
+                    "otherOrder：其他开单项，参考item结构<br>" +
+                    "diseaseName：选中诊断，参考item结构<br>" +
+                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>")
     @PostMapping("/push")
     @SysLogger("push")
     public RespDTO<PushDTO> push(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.push(pushVO));
     }
 
-    @ApiOperation(value = "数据服务模式-治疗方案[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，1：男，2：女<br>" +
-                    "symptom：症状,String<br>" +
-                    "pasts：既往史,String<br>" +
-                    "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
-                    "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，8：治疗方案,String<br>" +
-                    "diseaeName：取治疗方案的诊断,String<br>" +
-                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
-                    "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>" +
-                    "hosCode：医院编码,String<br>" +
-                    "lisString：化验纯文本,String<br>" +
-                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
-                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
-                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>")
-    @PostMapping("/pushTreatment")
-    @SysLogger("pushTreatment")
-    public RespDTO<Treat> pushTreatment(@RequestBody @Valid PushVO pushVO) {
-        return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
-    }
 
     @ApiOperation(value = "数据服务模式-量表[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，1：男，2：女<br>" +
-                    "symptom：症状,String<br>" +
+            notes = "hosCode： 医院编码<br>" +
+                    "featureType：类型(必填多选)，1：症状，4：查体结果，41：查体模板，42：查体指标，5：化验，6：辅检，7：诊断，8：治疗方案，22：病情提示（核心指标、危急值、开单合理项、异常值等）,多项用逗号分开，String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>" +
+                    "age： 年龄(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女，Integer<br>" +
+                    "chief：主诉,String<br>" +
+                    "symptom：现病史,String<br>" +
+                    "vital：查体,String<br>" +
                     "pasts：既往史,String<br>" +
+                    "infectious：传染病史,String<br>" +
+                    "operation：手术外伤史,String<br>" +
+                    "allergy：过敏史,String<br>" +
+                    "vaccination：接种史,String<br>" +
+                    "personal：个人史,String<br>" +
+                    "marital：婚育史,String<br>" +
+                    "family：家族史,String<br>" +
+                    "menstrual：月经史,String<br>" +
                     "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
+                    "lisString：化验文本输入,String<br>" +
+                    "pacsString：辅检文本输入,String<br>" +
+                    "diagString：诊断文本输入,String<br>" +
+                    "drugString：药品文本输入,String<br>" +
+                    "lis：化验,ArrayList<br>" +
+                    "lis.name：套餐名称(必填),String<br>" +
+                    "lis.detailName：化验项名称(必填),String<br>" +
+                    "lis.uniqueName：公表名称,String<br>" +
+                    "lis.value：值,Double<br>" +
+                    "lis.otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
                     "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，21：量表,String<br>" +
-                    "diseaeName：取治疗方案的诊断,String<br>" +
-                    "scaleName：量表名称,String<br>" +
+                    "lis.minValue：最小值,Double<br>" +
+                    "lis.maxValue：最大值,Double<br>" +
+                    "lis.result：HIS比较结果,String<br>" +
+                    "lis.dateValue：结果时间,String<br>" +
+                    "lis：source：数据来源（必填）,0：内部来源，1：外部来源,Integer<br>" +
+                    "pacs：辅检,ArrayList<br>" +
+                    "pacs.name：辅检项目(外部),String<br>" +
+                    "pacs.uniqueName：公表名辅检项目（内部）,String<br>" +
+                    "pacs.desc：检查描述（描述信息）,String<br>" +
+                    "pacs.result：检查结果（非描述信息）,String<br>" +
+                    "pacs.dateValue：结果时间,String<br>" +
+                    "diag：诊断,ArrayList<br>" +
+                    "item.name：外部项目名称（诊断、药品等）,String<br>" +
+                    "item.uniqueName：内部项目名称（诊断、药品等）,String<br>" +
+                    "item.dateValue：结果时间，String<br>" +
+                    "lisOrder：当前化验开单项，参考lis结构<br>" +
+                    "pacsOrder：当前辅检开单项，参考pacs结构<br>" +
+                    "diagOrder：当前诊断开单项，参考item结构<br>" +
+                    "drugOrder：当前药品开单项，参考item结构<br>" +
+                    "operationOrder：当前手术开单项，参考item结构<br>" +
+                    "otherOrder：其他开单项，参考item结构<br>" +
+                    "diseaseName：选中诊断，参考item结构<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
-                    "indications：指标结果,String<br>" +
-                    "adverseReactions：不良反应,String<br>" +
-                    "hosCode：医院编码,String<br>" +
-                    "lisString：化验纯文本,String<br>" +
-                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
-                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
-                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>")
+                    "scaleName：量表名称,String<br>")
     @PostMapping("/pushScale")
     @SysLogger("pushScale")
     public RespDTO<Map<String, Object>> pushScale(@RequestBody @Valid PushVO pushVO) {

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

@@ -1,6 +1,8 @@
 package com.diagbot.aggregate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.biz.push.entity.Treat;
+import com.diagbot.biz.push.enums.FeatureTypeEnum;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
@@ -13,7 +15,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.ConceptTypeEnum;
-import com.diagbot.enums.FeatureTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.TagTypeEnum;
@@ -21,6 +22,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.facade.DeptVitalFacade;
 import com.diagbot.facade.QuestionFacade;
+import com.diagbot.facade.TreatmentFacade;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
@@ -54,6 +56,8 @@ public class PushItemAggregate {
     private AiptServiceClient aiptServiceClient;
     @Autowired
     private DeptVitalFacade deptVitalFacade;
+    @Autowired
+    private TreatmentFacade treatmentFacade;
 
     @DataProvider("setICSSAll")
     public PushDTO setICSSAll(
@@ -61,7 +65,8 @@ public class PushItemAggregate {
             @DataConsumer("setICSSSymptom") List<ConceptPushDTO> symptom,
             @DataConsumer("setICSSVitalIndex") List<ConceptPushDTO> vital,
             @DataConsumer("setICSSVitalModule") List<QuestionPushDTO> vitalModule,
-            @DataConsumer("setICSSLab") List<QuestionPushDTO> lab) {
+            @DataConsumer("setICSSLab") List<QuestionPushDTO> lab,
+            @DataConsumer("setICSSTreat") Treat treat) {
 
         if (ListUtil.isNotEmpty(symptom)) {
             pushDTO.setSymptom(symptom);
@@ -81,6 +86,9 @@ public class PushItemAggregate {
         if (ListUtil.isNotEmpty(lab)) {
             pushDTO.setLab(lab);
         }
+        if (treat != null) {
+            pushDTO.setTreat(treat);
+        }
         return pushDTO;
     }
 
@@ -89,7 +97,7 @@ public class PushItemAggregate {
                                            @InvokeParameter("data") PushDTO data) {
         List<ConceptPushDTO> symptomRes = ListUtil.newArrayList();
         //症状 概念列表
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Symptom.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Symptom.getKey()))) {
             symptomRes = data.getSymptom();
             if (ListUtil.isNotEmpty(symptomRes)) {
                 symptomRes = addQuestionId(symptomRes, QuestionTypeEnum.Symptom.getKey());
@@ -102,7 +110,7 @@ public class PushItemAggregate {
     public List<ConceptPushDTO> setVitalIndex(@InvokeParameter("featureTypeSet") Set<String> featureTypeSet,
                                               @InvokeParameter("data") PushDTO data) {
         List<ConceptPushDTO> vitalRes = ListUtil.newArrayList();
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalIndex.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Index.getKey()))) {
             vitalRes = data.getVital();
             if (ListUtil.isNotEmpty(vitalRes)) {
                 vitalRes = addQuestionId(vitalRes, QuestionTypeEnum.Vital.getKey());
@@ -116,7 +124,7 @@ public class PushItemAggregate {
                                                 @InvokeParameter("data") PushDTO data,
                                                 @InvokeParameter("pushVO") PushVO pushVO) {
         List<QuestionPushDTO> moduleVitalDTO = Lists.newLinkedList();
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.VitalModule.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Vital_Module.getKey()))) {
             ConceptPushDTO dept = data.getDept();
             moduleVitalDTO = getVitalModule(dept, pushVO);
         }
@@ -129,7 +137,7 @@ public class PushItemAggregate {
                                         @InvokeParameter("pushVO") PushVO pushVO) {
         List<QuestionPushDTO> labs = Lists.newLinkedList();
         List<QuestionPushDTO> lisDTO = Lists.newLinkedList();
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Lis.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Lis.getKey()))) {
             labs = data.getLab();
             if (ListUtil.isNotEmpty(labs)) {
                 Map<String, Long> lisMap = new LinkedHashMap<>();
@@ -159,6 +167,17 @@ public class PushItemAggregate {
         return lisDTO;
     }
 
+    @DataProvider("setICSSTreat")
+    public Treat setICSSTreat(@InvokeParameter("featureTypeSet") Set<String> featureTypeSet,
+                              @InvokeParameter("data") PushDTO data,
+                              @InvokeParameter("pushVO") PushVO pushVO) {
+        Treat treat = data.getTreat();
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Treat.getKey()))) {
+            treat = treatmentFacade.getTreatment(treat, pushVO.getPatientId());
+        }
+        return treat;
+    }
+
     /**
      * 概念关联标签，添加标签id ——症状
      *
@@ -301,4 +320,4 @@ public class PushItemAggregate {
         }
         return mapDTO;
     }
-}
+}

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

@@ -1,12 +1,10 @@
 package com.diagbot.client;
 
+import com.diagbot.biz.push.vo.SearchVO;
 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;
 import com.diagbot.dto.ConceptIntroduceDTO;
@@ -61,14 +59,43 @@ import java.util.Map;
  */
 @FeignClient(value = "aipt-service", fallback = AiptServiceHystrix.class)
 public interface AiptServiceClient {
-    @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 searchVO
+     * @return
+     */
+    @PostMapping(value = "/clinicaldata/getScale")
+    RespDTO<List<ScaleContent>> getScale(@RequestBody SearchVO searchVO);
+
+    /**
+     * 症状特征提取
+     *
+     * @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 searchVO
+     * @return
+     */
+    @PostMapping("/push/pushInner")
+    RespDTO<PushDTO> pushInner(@RequestBody SearchVO searchVO);
+
 
     @PostMapping(value = "/scale/getList")
     RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO);
@@ -79,8 +106,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);
@@ -115,11 +140,11 @@ public interface AiptServiceClient {
     /**
      * 获取管理评估模板
      *
-     * @param searchData
+     * @param searchVO
      * @return
      */
     @PostMapping("/evaluation/getEvaluationModules")
-    RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody SearchData searchData);
+    RespDTO<List<EvaluationDTO>> getEvaluationModules(@RequestBody SearchVO searchVO);
 
     /**
      * 获取指标配置
@@ -149,23 +174,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/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;
-}

icss-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-选中
-}

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/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;
-}

icss-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
-}

icss-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;
-}

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

@@ -1,25 +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 Long id;
-    /**
-     * 1-有提示信息，0-没有提示信息
-     */
-    private String showInfo = "0";
-    private String drugsForbidden;
-    private String bigdrugsName;//药类名
-    private String subdrugsName;//药类名-小类
-    private LinkedList<Medicition> medicitionsList;
-}

icss-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;
-}

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/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;
-}

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

@@ -1,13 +1,11 @@
 package com.diagbot.client.hystrix;
 
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 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.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;
@@ -62,24 +60,55 @@ import java.util.Map;
 @Component
 @Slf4j
 public class AiptServiceHystrix implements AiptServiceClient {
+    /**
+     * 计算接口（量表、计算公式）
+     *
+     * @param calculateData
+     * @return
+     */
     @Override
-    public RespDTO<ResponseData> aiptData(SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "aiptData");
+    public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {
+        log.error("【hystrix】调用{}异常", "scaleCalc");
         return null;
     }
 
+    /**
+     * 获取量表全文接口
+     *
+     * @param searchVO
+     * @return
+     */
+    @Override
+    public RespDTO<List<ScaleContent>> getScale(@RequestBody SearchVO searchVO) {
+        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 searchVO
+     * @return
+     */
     @Override
-    public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {
-        log.error("【hystrix】调用{}异常", "scaleCalc");
+    public RespDTO<PushDTO> pushInner(@RequestBody SearchVO searchVO) {
+        log.error("【hystrix】调用{}异常", "pushInner");
         return null;
     }
 
+
     @Override
     public RespDTO<List<DisScaleDTO>> getList(DisScaleVO scaleVO) {
         log.error("【hystrix】调用{}异常", "getList");
@@ -99,11 +128,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) {
@@ -148,7 +172,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
     @Override
-    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid SearchData searchData) {
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid SearchVO searchVO) {
         log.error("【hystrix】调用{}异常", "getEvaluationModules");
         return null;
     }
@@ -183,29 +207,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/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;
 
@@ -16,7 +17,6 @@ import java.util.Map;
 @Setter
 public class PushDTO {
     private List<ConceptPushDTO> symptom;
-    private List<ConceptPushDTO> other;
     private List<ConceptPushDTO> vital;
     private List<Long> vitalIds;
     private List<QuestionPushDTO> moduleVital;
@@ -25,4 +25,9 @@ public class PushDTO {
     private Map<String, List<ConceptPushDTO>> dis;
     private ConceptPushDTO dept;
     private List<MedicalIndication> medicalIndications;
+    private Treat treat;
+    /**
+     * 有无病情提示标志（0：无，1：有）
+     */
+    private String hasIndications;
 }

icss-service/src/main/java/com/diagbot/enums/FeatureTypeEnum.java

@@ -1,59 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @Description: 推送类型
- * @Author:zhaops
- * @time: 2019/3/14 11:28
- */
-public enum FeatureTypeEnum implements KeyedNamed {
-    Symptom(1, "症状"),
-    Other(3, "其他史"),
-    VitalResult(4, "查体结果"),
-    VitalModule(41, "查体模板"),
-    VitalIndex(42, "查体指标"),
-    Lis(5, "化验"),
-    Pacs(6, "辅检"),
-    Disease(7, "诊断"),
-    Treat(8, "治疗"),
-    Scale(21, "量表内容"),
-    MedicalIndication(22, "指标"),
-    ManagementEvaluation(11, "管理评估");
-
-    @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;
-    }
-}

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

@@ -1,73 +1,24 @@
 package com.diagbot.facade;
 
-import com.diagbot.client.bean.SearchData;
-import com.diagbot.enums.LisSourceEnum;
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.LisResult;
 import com.diagbot.vo.PushVO;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 /**
- * @Description:
+ * @Description:数据拼接
  * @Author:zhaops
  * @time: 2019/5/9 15:40
  */
 @Component
 public class AssembleFacade {
-    /**
-     * 拼装数据
-     *
-     * @param pushVO
-     * @return SearchData
-     */
-    public SearchData assembleData(PushVO pushVO) {
-        SearchData searchData = new SearchData();
-        searchData.setAge(pushVO.getAge());
-        searchData.setSymptom(pushVO.getSymptom());
-        searchData.setVital(pushVO.getVital());
-        searchData.setPacs(pushVO.getPacs());
-        searchData.setPasts(pushVO.getPasts());
-        searchData.setOther(pushVO.getOther());
-        searchData.setDiag(pushVO.getDiag());
-        searchData.setDisType(pushVO.getDisType());
-        searchData.setAdverseEvent(pushVO.getAdverseReactions());
-        searchData.setScaleName(pushVO.getScaleName());
-        searchData.setDiseaseName(pushVO.getDiseaseName());
-        searchData.setIndications(pushVO.getIndications());
-        searchData.setFeatureType(pushVO.getFeatureType());
-        searchData.setHosCode(pushVO.getHosCode());
-        searchData.setSysCode("1");
-        searchData.setLength(10);
-        searchData.setSysType(SysTypeEnum.ICSS_SERVICE.getKey());
-        searchData.setRuleType(pushVO.getRuleType());
-        searchData.setLisOrder(pushVO.getLisOrder());
-        searchData.setPacsOrder(pushVO.getPacsOrder());
-        searchData.setOtherOrder(pushVO.getOtherOrder());
-
-        switch (pushVO.getSex()) {
-            case 1:
-                searchData.setSex("M");
-                break;
-            case 2:
-                searchData.setSex("F");
-                break;
-            default:
-                searchData.setSex("A");
-                break;
-        }
-
-        //化验项映射,转公表
-        if (ListUtil.isNotEmpty(pushVO.getLis())) {
-            searchData.setLisArr(pushVO.getLis());
-        }
-        return searchData;
+    public SearchVO assembleData(PushVO pushVO) {
+        SearchVO searchVO = new SearchVO();
+        BeanUtil.copyProperties(pushVO, searchVO);
+        searchVO.setSysCode("1");
+        searchVO.setLength(10);
+        searchVO.setSysType(SysTypeEnum.ICSS_SERVICE.getKey());
+        return searchVO;
     }
 }

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

@@ -1,7 +1,7 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
-import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.RespDTOUtil;
@@ -33,8 +33,8 @@ public class EvaluationModuleMappingFacade {
      * @return
      */
     public List<EvaluationDTO> getEvaluationModule(EvaluationDiseaseNameVO evaluationdiseaseNameVO) {
-        SearchData searchData = assembleFacade.assembleData(evaluationdiseaseNameVO);
-        RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(searchData);
+        SearchVO searchVO = assembleFacade.assembleData(evaluationdiseaseNameVO);
+        RespDTO<List<EvaluationDTO>> evaluationList = aiptServiceClient.getEvaluationModules(searchVO);
         RespDTOUtil.respNGDeal(evaluationList, "获取管理与评估模板数据失败！");
         List<EvaluationDTO> datas = evaluationList.data;
         return datas;

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

@@ -1,19 +1,13 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.vo.SearchVO;
+import com.diagbot.biz.push.enums.FeatureTypeEnum;
 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.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 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 +16,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;
 
@@ -36,49 +29,22 @@ public class PushFacade {
     @Autowired
     private DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
     @Autowired
-    private TreatmentFacade treatmentFacade;
-    @Autowired
     private AiptServiceClient aiptServiceClient;
     @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;
-    }
-
     /**
-     * 中间层推理-症状……诊断、核心指标
+     * 中间层推理-症状……诊断、病情提示、治疗方案
      *
-     * @param searchData
+     * @param searchVO
      * @return
      */
-    public PushDTO pushInnerAipt(SearchData searchData) {
-        RespDTO<PushDTO> res = aiptServiceClient.pushInner(searchData);
+    public PushDTO pushInnerAipt(SearchVO searchVO) {
+        RespDTO<PushDTO> res = aiptServiceClient.pushInner(searchVO);
         RespDTOUtil.respNGDeal(res, "中间层没有返回结果");
         return res.data;
     }
 
-    /**
-     * 中间层获取治疗方案
-     *
-     * @param searchData
-     * @return
-     */
-    public Treat getTreatment(SearchData searchData) {
-        RespDTO<Treat> res = aiptServiceClient.getTreatment(searchData);
-        RespDTOUtil.respNGDealCover(res, "中间层没有返回治疗方案");
-        return res.data;
-    }
-
     /**
      * 推理接口
      *
@@ -87,8 +53,8 @@ public class PushFacade {
      */
     public PushDTO pushInner(PushVO pushVO) {
         PushDTO pushDTO = new PushDTO();
-        SearchData aiSearchData = assembleFacade.assembleData(pushVO);
-        PushDTO data = pushInnerAipt(aiSearchData);
+        SearchVO searchVO = assembleFacade.assembleData(pushVO);
+        PushDTO data = pushInnerAipt(searchVO);
 
         String featureType = pushVO.getFeatureType();
         String[] featureTypes = featureType.split(",|，");
@@ -114,61 +80,18 @@ public class PushFacade {
             }
         }
 
-        //其他史 概念+标签id
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Other.getKey()))) {
-        }
         //辅检  标签列表
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Pacs.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Pacs.getKey()))) {
             pushDTO.setPacs(data.getPacs());
         }
         //诊断 返回分类+标签列表
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Disease.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Disease.getKey()))) {
             pushDTO.setDis(data.getDis());
         }
         //推送指标 featuretype=22
-        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.MedicalIndication.getKey()))) {
+        if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Indication.getKey()))) {
             pushDTO.setMedicalIndications(data.getMedicalIndications());
         }
         return pushDTO;
     }
-
-    /**
-     * 治疗方案推送
-     *
-     * @param pushVO
-     * @return
-     */
-    public Treat pushTreatment(PushVO pushVO) {
-        SearchData searchData = assembleFacade.assembleData(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/facade/ScaleContentFacade.java

@@ -1,7 +1,7 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
-import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.ScaleIndexDTO;
 import com.diagbot.entity.ScaleContent;
@@ -31,8 +31,8 @@ public class ScaleContentFacade {
      * @return
      */
     public List<ScaleContent> getContent(PushVO pushVO) {
-        SearchData searchData = assembleFacade.assembleData(pushVO);
-        RespDTO<List<ScaleContent>> res = aiptServiceClient.getScale(searchData);
+        SearchVO searchVO = assembleFacade.assembleData(pushVO);
+        RespDTO<List<ScaleContent>> res = aiptServiceClient.getScale(searchVO);
         RespDTOUtil.respNGDeal(res, "远程调用量表内容失败");
         return res.data;
     }

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

@@ -1,11 +1,10 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.biz.push.entity.Medicition;
+import com.diagbot.biz.push.entity.Treat;
 import com.diagbot.client.AiptServiceClient;
-import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.DisTypeVO;
-import com.diagbot.client.bean.Medicition;
-import com.diagbot.client.bean.Treat;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.InquiryDrug;
 import com.diagbot.entity.InquiryInfo;

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

@@ -1,26 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:化验信息
- * @Author:zhaops
- * @time: 2018/12/19 14:03
- */
-@Getter
-@Setter
-public class LisResult {
-    private String name;//套餐名称
-    private String detailName;//化验项名称
-    private String uniqueName;//公表名称
-    private Double value;//值
-    private Double maxValue;//最大值
-    private Double minValue;//最小值
-    private String units;//单位
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
-    @NotNull(message = "请输入数据来源")
-    private Integer source; //0-内部来源，1-外部来源
-}

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

@@ -1,32 +0,0 @@
-package com.diagbot.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description: 推理参数
- * @Author:zhaops
- * @time: 2019/4/17 14:42
- */
-@Getter
-@Setter
-public class PushBaseVO {
-    @NotNull(message = "请输入年龄")
-    private Integer age;
-    @NotNull(message = "请输入性别")
-    private Integer sex;
-    @NotBlank(message = "请输入推送类型")
-    private String featureType;
-    private String symptom;
-    private String diag;
-    private String vital;
-    private List<LisResult> lis;
-    private String pacs;
-    private String pasts;
-    private String other;
-}

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

@@ -1,25 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/11/26 17:05
- */
-@Getter
-@Setter
-public class PushKYJVO {
-    @NotNull(message = "请输入年龄")
-    private Integer age;
-    @NotNull(message = "请输入性别")
-    private Integer sex;
-    @NotBlank(message = "请输入推送类型")
-    private String featureType;
-    private List<LisResult> lisResultList;
-}

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

@@ -1,28 +1,20 @@
 package com.diagbot.vo;
 
+import com.diagbot.biz.push.vo.SearchVO;
 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 SearchVO {
+    /**
+     * 病人id
+     */
+    private Long patientId;
 }

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

@@ -1,13 +1,10 @@
 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 +13,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;
 
@@ -37,87 +33,62 @@ public class PushController {
     AssembleFacade assembleFacade;
 
     @ApiOperation(value = "知识库标准化-推理接口(半结构化)[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，1：男，2：女<br>" +
-                    "symptom：症状,String<br>" +
+            notes = "hosCode： 医院编码<br>" +
+                    "featureType：类型(必填多选)，1：症状，4：查体结果，41：查体模板，42：查体指标，5：化验，6：辅检，7：诊断，8：治疗方案，22：病情提示（核心指标、危急值、开单合理项、异常值等）,多项用逗号分开，String<br>" +
+                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>" +
+                    "age： 年龄(必填)<br>" +
+                    "sex：性别(必填)，1：男，2：女，Integer<br>" +
+                    "chief：主诉,String<br>" +
+                    "symptom：现病史,String<br>" +
+                    "vital：查体,String<br>" +
                     "pasts：既往史,String<br>" +
+                    "infectious：传染病史,String<br>" +
+                    "operation：手术外伤史,String<br>" +
+                    "allergy：过敏史,String<br>" +
+                    "vaccination：接种史,String<br>" +
+                    "personal：个人史,String<br>" +
+                    "marital：婚育史,String<br>" +
+                    "family：家族史,String<br>" +
+                    "menstrual：月经史,String<br>" +
                     "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
+                    "lisString：化验文本输入,String<br>" +
+                    "pacsString：辅检文本输入,String<br>" +
+                    "diagString：诊断文本输入,String<br>" +
+                    "drugString：药品文本输入,String<br>" +
+                    "lis：化验,ArrayList<br>" +
+                    "lis.name：套餐名称(必填),String<br>" +
+                    "lis.detailName：化验项名称(必填),String<br>" +
+                    "lis.uniqueName：公表名称,String<br>" +
+                    "lis.value：值,Double<br>" +
+                    "lis.otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
                     "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体结果，41：查体模板，42：查体指标（查体结果和查体指标不能同时取），5：化验，6：辅检，7：诊断，22-指标,String<br>" +
-                    "patientId：病人id,Long<br>" +
+                    "lis.minValue：最小值,Double<br>" +
+                    "lis.maxValue：最大值,Double<br>" +
+                    "lis.result：HIS比较结果,String<br>" +
+                    "lis.dateValue：结果时间,String<br>" +
+                    "lis：source：数据来源（必填）,0：内部来源，1：外部来源,Integer<br>" +
+                    "pacs：辅检,ArrayList<br>" +
+                    "pacs.name：辅检项目(外部),String<br>" +
+                    "pacs.uniqueName：公表名辅检项目（内部）,String<br>" +
+                    "pacs.desc：检查描述（描述信息）,String<br>" +
+                    "pacs.result：检查结果（非描述信息）,String<br>" +
+                    "pacs.dateValue：结果时间,String<br>" +
+                    "diag：诊断,ArrayList<br>" +
+                    "item.name：外部项目名称（诊断、药品等）,String<br>" +
+                    "item.uniqueName：内部项目名称（诊断、药品等）,String<br>" +
+                    "item.dateValue：结果时间，String<br>" +
+                    "lisOrder：当前化验开单项，参考lis结构<br>" +
+                    "pacsOrder：当前辅检开单项，参考pacs结构<br>" +
+                    "diagOrder：当前诊断开单项，参考item结构<br>" +
+                    "drugOrder：当前药品开单项，参考item结构<br>" +
+                    "operationOrder：当前手术开单项，参考item结构<br>" +
+                    "otherOrder：其他开单项，参考item结构<br>" +
+                    "diseaseName：选中诊断，参考item结构<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
-                    "indications：指标结果（预留字段，暂不用）,String<br>" +
-                    "adverseReactions：不良反应（预留字段，暂不用）,String<br>" +
-                    "hosCode：医院编码,String<br>" +
-                    "lisString：化验纯文本,String<br>" +
-                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
-                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
-                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>")
+                    "patientId：病人id，Long<br>")
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushInner(pushVO));
     }
-
-    @ApiOperation(value = "知识库标准化-治疗方案[by:zhaops]",
-            notes = "age： 年龄(必填)<br>" +
-                    "sex：性别(必填)，1：男，2：女<br>" +
-                    "symptom：症状,String<br>" +
-                    "pasts：既往史,String<br>" +
-                    "other：其它史,String<br>" +
-                    "vital：查体,String<br>" +
-                    "lis：化验,Array<br>" +
-                    "lis：name：套餐名称(必填),String<br>" +
-                    "lis：detailName：化验项名称(必填),String<br>" +
-                    "lis：uniqueName：公表名称,String<br>" +
-                    "lis：value：值,Double<br>" +
-                    "lis：maxValue：最大值,Double<br>" +
-                    "lis：minValue：最小值,Double<br>" +
-                    "lis：units：单位,String<br>" +
-                    "lis：otherValue：其他结果，包括阴性阳性，文字描述等,String<br>" +
-                    "lis：source：数据来源（必填）,Integer<br>" +
-                    "pacs：辅检,String<br>" +
-                    "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，8：治疗方案,String<br>" +
-                    "diseaeName：取治疗方案的诊断,String<br>" +
-                    "patientId：病人id,Long<br>" +
-                    "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
-                    "indications：指标结果（预留字段，暂不用）,String<br>" +
-                    "adverseReactions：不良反应（预留字段，暂不用）,String<br>" +
-                    "hosCode：医院编码,String<br>" +
-                    "lisString：化验纯文本,String<br>" +
-                    "lisOrder：下单化验项，多项用分号隔开,String<br>" +
-                    "pacsOrder：下单辅检项，多项用分号隔开,String<br>" +
-                    "otherOrder：其他下单项，多项用分号隔开,String<br>" +
-                    "ruleType：规则类型，1：危急值提醒  2：开单合理性  3：管理评估  4：不良反应  5：药物推荐  6：异常值，多项用分号隔开,String<br>")
-    @PostMapping("/pushTreatment")
-    @SysLogger("pushTreatment")
-    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));
-    }
 }

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

@@ -1,7 +1,7 @@
 package com.diagbot.client;
 
+import com.diagbot.biz.push.entity.ResponseData;
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.hystrix.AIServiceHystrix;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

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

@@ -1,29 +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 Map<String, JSONObject> treat;   //治疗方案
-    private Map<String, JSONObject> scale;   //量表内容
-    private Map<String, JSONObject> managementEvaluation;   //管理评估
-    private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
-}

knowledgeman-service/src/main/java/com/diagbot/client/hystrix/AIServiceHystrix.java

@@ -1,8 +1,8 @@
 package com.diagbot.client.hystrix;
 
+import com.diagbot.biz.push.entity.ResponseData;
 import com.diagbot.client.AIServiceClient;
 import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;