推理接口入参整理

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

@@ -1,7 +1,6 @@
 package com.diagbot.client;
 
 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.hystrix.AIServiceHystrix;

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/hystrix/AIServiceHystrix.java

@@ -2,7 +2,6 @@ package com.diagbot.client.hystrix;
 
 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;

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

@@ -0,0 +1,23 @@
+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 {
+    private Long conceptId;
+    private String name;  //名称
+    private Integer libType;
+    private Integer type;
+    private String showInfo = "0";//是否显示提示信息
+    private Integer controlType; //控件类型
+    private List<AdverseReactionDetail> details;
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+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 {
+    private Integer type; //1-量表，2-公式，3-其他指标，4-危机值
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""} ,controlType:0-radio,1-checkbox,2-text,3-dropdownlist
+}

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

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

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

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

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

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

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

@@ -0,0 +1,20 @@
+package com.diagbot.biz.push.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/12/6 11:13
+ */
+@Getter
+@Setter
+public class Pacs {
+    private String name;//检查项目
+    private String uniqueName;//公表名
+    private String result;
+    private Date dataValue;
+}

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+package com.diagbot.biz.push.facade;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/12/6 10:02
+ */
+@Component
+public class AssembleFacade {
+}