|
@@ -3,6 +3,7 @@ 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 io.swagger.annotations.ApiModelProperty;
|
|
|
import lombok.Getter;
|
|
|
import lombok.Setter;
|
|
|
|
|
@@ -22,9 +23,14 @@ public class SearchData extends HospitalBaseVO {
|
|
|
*/
|
|
|
private Integer length = 10;
|
|
|
/**
|
|
|
- * 年龄
|
|
|
+ * 年龄文本数据
|
|
|
*/
|
|
|
- private Integer age;
|
|
|
+ private String age;
|
|
|
+ /**
|
|
|
+ * 年龄数字数据
|
|
|
+ */
|
|
|
+ @ApiModelProperty(hidden = true)
|
|
|
+ private Double ageNum;
|
|
|
/**
|
|
|
* 性别(1:男,2:女,3:通用)
|
|
|
*/
|
|
@@ -120,7 +126,7 @@ public class SearchData extends HospitalBaseVO {
|
|
|
/**
|
|
|
* 药品
|
|
|
*/
|
|
|
- private List<Item> drug = new ArrayList<>();
|
|
|
+ private List<Drug> drug = new ArrayList<>();
|
|
|
/**
|
|
|
* 手术及操作
|
|
|
*/
|
|
@@ -144,7 +150,7 @@ public class SearchData extends HospitalBaseVO {
|
|
|
/**
|
|
|
* 当前药品开单项
|
|
|
*/
|
|
|
- private List<Item> drugOrder = new ArrayList<>();
|
|
|
+ private List<Drug> drugOrder = new ArrayList<>();
|
|
|
/**
|
|
|
* 当前手术开单项
|
|
|
*/
|