Fix Bug #466: AI修复

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveParam.java

@@ -1,38 +1,44 @@
 package com.openhis.web.doctorstation.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.openhis.common.enums.Whether;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- * 医嘱保存参数类
+ * 医嘱/检验申请保存参数
  */
 @Data
-@Accessors(chain = true)
 public class AdviceSaveParam {
 
-    /**
-     * 患者挂号对应的科室id
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long organizationId;
+    /** 患者就诊ID */
+    @NotNull(message = "就诊ID不能为空")
+    private Long encounterId;
 
-    /**
-     * 代煎标识 | 0:否 , 1:是
-     */
-    private Integer sufferingFlag;
+    /** 申请类型：1-普通 2-急诊 */
+    private Integer applicationType;
 
-    /**
-     * 保存医嘱 dto
-     */
-    private List<AdviceSaveDto> adviceSaveList;
+    /** 标本类型 */
+    private String specimenType;
 
-    public AdviceSaveParam() {
-        this.sufferingFlag = Whether.NO.getValue();
-    }
+    /** 执行时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime executionTime;
 
+    /** 发往科室编码 */
+    private String targetDeptCode;
+
+    /** 临床诊断 */
+    private String diagnosis;
+
+    /** 关联的检验/检查项目ID集合 */
+    private List<Long> itemIds;
+
+    /** 医嘱操作类型：1-保存草稿 2-签发 */
+    private String adviceOpType;
 }