wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

器材目录项目check注解修正 up by dh

Browse Source
This commit is contained in:
duhe
2025-03-28 15:43:10 +08:00
parent c309c4f184
commit 82c894f237
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
View File

@@ -139,7 +139,7 @@ public class DeviceManageDto {
private String itemTypeCode_dictText; private String itemTypeCode_dictText;
/** 医保类别 */ /** 医保类别 */
@Dict(dictCode = "med_chrgitm_type") @Dict(dictCode = "yb_type")
private String ybType; private String ybType;
private String ybType_dictText; private String ybType_dictText;

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

@@ -27,7 +27,6 @@ public class DeviceManageUpDto {
private Long id; private Long id;
/** 编码 */ /** 编码 */
@NotBlank(message = "器材编码不能为空")
private String busNo; private String busNo;
/** 器材名称 */ /** 器材名称 */
@@ -35,11 +34,9 @@ public class DeviceManageUpDto {
private String name; private String name;
/** 器材名称拼音 */ /** 器材名称拼音 */
@NotBlank(message = "器材名称拼音不能为空")
private String pyStr; private String pyStr;
/** 器材五笔拼音 */ /** 器材五笔拼音 */
@NotBlank(message = "器材五笔拼音不能为空")
private String wbStr; private String wbStr;
/** 器材分类 */ /** 器材分类 */
@@ -67,14 +64,14 @@ public class DeviceManageUpDto {
private String minUnitCode; private String minUnitCode;
/** 所属科室 */ /** 所属科室 */
@NotBlank(message = "所属科室不能为空") @NotNull(message = "所属科室不能为空")
@Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name") @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long orgId; private Long orgId;
private String orgId_dictText; private String orgId_dictText;
/** 所在位置 */ /** 所在位置 */
@NotBlank(message = "所在位置不能为空") @NotNull(message = "所在位置不能为空")
@Dict(dictTable = "adm_location", dictCode = "id", dictText = "name") @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long locationId; private Long locationId;