病历保存相关bean修改2

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

@@ -13,7 +13,7 @@ import lombok.Setter;
 
 /**
  * @Description
- * @author rgb
+ * @author rengb
  * @time 2018年11月23日下午2:29:43
  */
 @Getter

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

@@ -0,0 +1,33 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class SaveInquiryDrugVO {
+	
+	/**
+	 * 药品标签id
+	 */
+    @NotNull(message="药品标签id必传")
+    @ApiModelProperty(value="药品标签id",required=true)
+    private Long questionId;
+
+    /**
+     * 药品标签名
+     */
+    @NotBlank(message="药品标签名必传")
+    @ApiModelProperty(value="药品标签名",required=true)
+    private String tagName;
+
+}

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

@@ -0,0 +1,41 @@
+/**
+ * 
+ */
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class SaveInquiryEvaluationVO {
+	
+	
+	/**
+     * 评估页面html内容
+     */
+	@ApiModelProperty(value="评估页面html内容",required=true)
+    @NotBlank(message="评估页面html内容必传")
+    private String htmlContent;
+	
+	/**
+	 * 评估量表明细
+	 */
+	@Valid
+    @ApiModelProperty(value="评估量表明细",required=true)
+    @NotEmpty(message="评估量表明细不能为空")
+    private List<SaveInquiryScaleVO> scaleList;
+
+}

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

@@ -0,0 +1,38 @@
+/**
+ * 
+ */
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class SaveInquiryScaleVO {
+	
+	/**
+     * 量表标签id
+     */
+	@ApiModelProperty(value="量表标签id",required=true)
+	@NotNull(message="量表标签id必传")
+    private Long scaleId;
+	
+
+	
+	/**
+     * 量表页面html内容
+     */
+	@ApiModelProperty(value="量表页面html内容",required=true)
+    @NotBlank(message="量表页面html内容必传")
+    private String htmlContent;
+
+}

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

@@ -94,9 +94,28 @@ public class SaveInquiryVO {
     @NotBlank(message="内容JSON字符串必传")
     private String dataJson;
     
+	/**
+	 * 问诊明细
+	 */
     @Valid
     @ApiModelProperty(value="问诊明细",required=true)
     @NotEmpty(message="问诊明细不能为空")
     private List<SaveInquiryDetailVO> detailList;
+    
+    /**
+     * 问诊药品明细
+     */
+    @Valid
+    @ApiModelProperty(value="问诊药品明细",required=true)
+    @NotEmpty(message="问诊药品明细不能为空")
+    private List<SaveInquiryDrugVO> drugList;
+    
+    /**
+     * 评估结果
+     */
+    @Valid
+    @ApiModelProperty(value="评估结果",required=true)
+    @NotNull(message="评估结果必传")
+    private SaveInquiryEvaluationVO inquiryEvaluation;
    
 }