cds访问质控传参修改

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

@@ -17,154 +17,6 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class AnalyzeCdsVO extends TokenVO {
-
-    @NotNull(message = "请输入医院id")
-    private Long hospitalId;
-
-    /**
-     * 大数据返回内容截取长度
-     */
-    private Integer length = 10;
-    /**
-     * 年龄
-     */
-    private Integer age;
-    /**
-     * 性别（1：男，2：女，3：通用）
-     */
-    private Integer sex;
-    /**
-     * 婚姻
-     */
-    private String marriage = "";
-    /**
-     * 主诉
-     */
-    private String chief = "";
-    /**
-     * 现病史
-     */
-    private String symptom = "";
-    /**
-     * 查体
-     */
-    private String vital = "";
-    /**
-     * 既往史
-     */
-    private String pasts = "";
-    /**
-     * 传染病史
-     */
-    private String infectious = "";
-    /**
-     * 手术外伤史
-     */
-    private String surgical = "";
-    /**
-     * 过敏史
-     */
-    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<Item> dept = new ArrayList<>();
-    /**
-     * 化验项目和结果
-     */
-    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<Item> operation = new ArrayList<>();
-    /**
-     * 输血记录
-     */
-    private List<ItemExtVO> transfusion = 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<ItemExtVO> transfusionOrder = new ArrayList<>();
-    /**
-     * 其他开单项
-     */
-    private List<Item> otherOrder = new ArrayList<>();
-    /**
-     * 选中诊断
-     */
-    private Item diseaseName;
+public class AnalyzeCdsVO extends SearchData {
 
 }

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

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/7/29 18:37
+ */
+@Getter
+@Setter
+public class HospitalBaseVO {
+    // 医院ID
+    @NotNull(message = "请输入医院id")
+    private Long hospitalId;
+}

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

@@ -7,7 +7,7 @@ import com.diagbot.biz.push.entity.Item;
  * @author: rengb
  * @time: 2020/8/31 11:17
  */
-public class ItemExtVO extends Item {
+public class ItemExt extends Item {
     // 备注内容
     private String remark;
 }

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

@@ -0,0 +1,168 @@
+package com.diagbot.vo;
+
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Lis;
+import com.diagbot.biz.push.entity.Pacs;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/7/29 15:31
+ */
+@Getter
+@Setter
+public class SearchData extends HospitalBaseVO {
+    /**
+     * 大数据返回内容截取长度
+     */
+    private Integer length = 10;
+    /**
+     * 年龄
+     */
+    private Integer age;
+    /**
+     * 性别（1：男，2：女，3：通用）
+     */
+    private Integer sex;
+    /**
+     * 婚姻
+     */
+    private String marriage = "";
+    /**
+     * 主诉
+     */
+    private String chief = "";
+    /**
+     * 现病史
+     */
+    private String symptom = "";
+    /**
+     * 查体
+     */
+    private String vital = "";
+    /**
+     * 既往史
+     */
+    private String pasts = "";
+    /**
+     * 传染病史
+     */
+    private String infectious = "";
+    /**
+     * 手术外伤史
+     */
+    private String surgical = "";
+    /**
+     * 过敏史
+     */
+    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<Item> dept = new ArrayList<>();
+    /**
+     * 化验项目和结果
+     */
+    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<Item> operation = new ArrayList<>();
+    /**
+     * 输血记录
+     */
+    private List<ItemExt> transfusion = 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<ItemExt> transfusionOrder = new ArrayList<>();
+    /**
+     * 其他开单项
+     */
+    private List<Item> otherOrder = new ArrayList<>();
+    /**
+     * 选中诊断
+     */
+    private Item diseaseName;
+    /**
+     * 选中手术
+     */
+    private Item operationName;
+}