From 0c2868f20d689af92f4ef9df71e4e5e864de855f Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Mon, 24 Mar 2025 16:51:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=9D=90=E6=9B=B4up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/datadictionary/dto/DeviceManageUpDto.java | 13 +++++++++++++ .../datadictionary/dto/MedicationManageUpDto.java | 3 +++ openhis-ui-vue3/vite.config.js | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java index 2e163bed..f520ed5d 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java +++ b/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; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java index 61d48ebc..f0c23309 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java +++ b/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; /** 用法 */ diff --git a/openhis-ui-vue3/vite.config.js b/openhis-ui-vue3/vite.config.js index 3fa8a5c1..6731e261 100644 --- a/openhis-ui-vue3/vite.config.js +++ b/openhis-ui-vue3/vite.config.js @@ -32,7 +32,7 @@ export default defineConfig (({mode, command}) => { // https://cn.vitejs.dev/config/#server-proxy '/dev-api': { target: 'http://localhost:18080/openhis', - // target: 'http://192.168.31.221:18080/openhis', + // target: 'http://192.168.31.221:18081/openhis', changeOrigin: true, rewrite: p => p.replace (/^\/dev-api/, ''), },