From 82c894f237a3c2ef46a3e2de09cce1753aca7d34 Mon Sep 17 00:00:00 2001
From: duhe <duhe@ccbjb.com.cn>
Date: Fri, 28 Mar 2025 15:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=9D=90=E7=9B=AE=E5=BD=95=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AEcheck=E6=B3=A8=E8=A7=A3=E4=BF=AE=E6=AD=A3=20up=20by=20?=
 =?UTF-8?q?dh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../openhis/web/datadictionary/dto/DeviceManageDto.java    | 2 +-
 .../openhis/web/datadictionary/dto/DeviceManageUpDto.java  | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
index e8569c47..791e3358 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
@@ -139,7 +139,7 @@ public class DeviceManageDto {
     private String itemTypeCode_dictText;
 
     /** 医保类别 */
-    @Dict(dictCode = "med_chrgitm_type")
+    @Dict(dictCode = "yb_type")
     private String ybType;
     private String ybType_dictText;
 
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 8febe63b..0426e2f4 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
@@ -27,7 +27,6 @@ public class DeviceManageUpDto {
     private Long id;
 
     /** 编码 */
-    @NotBlank(message = "器材编码不能为空")
     private String busNo;
 
     /** 器材名称 */
@@ -35,11 +34,9 @@ public class DeviceManageUpDto {
     private String name;
 
     /** 器材名称拼音 */
-    @NotBlank(message = "器材名称拼音不能为空")
     private String pyStr;
 
     /** 器材五笔拼音 */
-    @NotBlank(message = "器材五笔拼音不能为空")
     private String wbStr;
 
     /** 器材分类 */
@@ -67,14 +64,14 @@ public class DeviceManageUpDto {
     private String minUnitCode;
 
     /** 所属科室 */
-    @NotBlank(message = "所属科室不能为空")
+    @NotNull(message = "所属科室不能为空")
     @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
     private String orgId_dictText;
 
     /** 所在位置 */
-    @NotBlank(message = "所在位置不能为空")
+    @NotNull(message = "所在位置不能为空")
     @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locationId;