器材更up

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java

@@ -94,10 +94,12 @@ public class DeviceManageUpDto {
 
     /** 生产厂家 */
     @NotNull(message = "生产厂家不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long manufacturerId;
 
     /** 供应商 */
     @NotNull(message = "供应商不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long supplyId;
 
     /** 说明 */
@@ -109,8 +111,19 @@ public class DeviceManageUpDto {
 
     /** 执行科室 */
     @NotNull(message = "执行科室不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long ruleId;
 
+    /** 归属科室 */
+    @NotNull(message = "归属科室不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    /** 所在位置 */
+    @NotNull(message = "所在位置不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long locationId;
+
     /** 器材版本 */
     private String version;
 

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import javax.validation.constraints.NotBlank;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
@@ -48,9 +49,11 @@ public class MedicationManageUpDto {
     private String lotNumber;
 
     /** 生效日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveDate;
 
     /** 到期日期 */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date expirationDate;
 
     /** 用法 */