From b8ced534fe39c405777f6345edc5e88e457e7165 Mon Sep 17 00:00:00 2001 From: anxin Date: Mon, 3 Mar 2025 16:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E7=96=97=E5=99=A8=E6=9D=90=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceManageController.java | 15 ++++++++++++++ .../DiagnosisTreatmentController.java | 10 ++++++++++ .../datadictionary/dto/DeviceManageDto.java | 4 ++++ .../datadictionary/dto/DeviceManageUpDto.java | 20 +++++++++++++++++++ .../dto/DiagnosisTreatmentDto.java | 2 ++ .../dto/DiagnosisTreatmentUpDto.java | 9 +++++++++ .../common/enums/WhetherContainUnknown.java | 3 ++- 7 files changed, 62 insertions(+), 1 deletion(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java index 467bfdbe..0f69308f 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java @@ -27,6 +27,8 @@ import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.DeviceCategory; import com.openhis.common.enums.OrganizationType; import com.openhis.common.enums.PublicationStatus; +import com.openhis.common.enums.WhetherContainUnknown; +import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.datadictionary.dto.DeviceManageDto; @@ -101,9 +103,22 @@ public class DeviceManageController { new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request); // 设置排序 queryWrapper.orderByAsc("bus_no"); + // 分页查询 Page deviceManagePage = HisPageUtils.selectPage(DeviceDefinitionMapper, queryWrapper, pageNo, pageSize, DeviceManageDto.class); + + deviceManagePage.getRecords().forEach(e -> { + // 高值器材标志枚举类回显赋值 + e.setHvcmFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getHvcmFlag())); + // 医保标记枚举类回显赋值 + e.setYbFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getYbFlag())); + // 医保对码标记枚举类回显赋值 + e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getYbMatchFlag())); + // 过敏标记枚举类回显赋值 + e.setAllergenFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getAllergenFlag())); + }); + // 返回【器材目录列表DTO】分页 return R.ok(deviceManagePage); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java index c27dc396..08d3bb30 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java @@ -27,6 +27,8 @@ import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.ActivityDefCategory; import com.openhis.common.enums.OrganizationType; import com.openhis.common.enums.PublicationStatus; +import com.openhis.common.enums.WhetherContainUnknown; +import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisPageUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto; @@ -137,6 +139,14 @@ public class DiagnosisTreatmentController { // 分页查询 Page diseaseTreatmentPage = HisPageUtils.selectPage(activityDefinitionMapper, queryWrapper, pageNo, pageSize, DiagnosisTreatmentDto.class); + + diseaseTreatmentPage.getRecords().forEach(e -> { + // 医保标记枚举类回显赋值 + e.setYbFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getYbFlag())); + // 医保对码标记枚举类回显赋值 + e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(WhetherContainUnknown.class, e.getYbMatchFlag())); + }); + // 返回【诊疗目录列表DTO】分页 return R.ok(diseaseTreatmentPage); } 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 39afccc7..87196531 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 @@ -58,6 +58,7 @@ public class DeviceManageDto { /** 高值器材标志 */ private Integer hvcmFlag; + private String hvcmFlag_enumText; /** 销售单位 */ private String salesUnitCode; @@ -67,12 +68,14 @@ public class DeviceManageDto { /** 医保标记 */ private Integer ybFlag; + private String ybFlag_enumText; /** 医保编码 */ private String ybNo; /** 医保对码标记 */ private Integer ybMatchFlag; + private String ybMatchFlag_enumText; /** 状态 */ private PublicationStatus statusEnum; @@ -100,4 +103,5 @@ public class DeviceManageDto { /** 过敏标记 */ private Integer allergenFlag; + private String allergenFlag_enumText; } 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 c208666f..2e163bed 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 @@ -3,6 +3,7 @@ package com.openhis.web.datadictionary.dto; import java.math.BigDecimal; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -33,63 +34,81 @@ public class DeviceManageUpDto { private String name; /** 器材名称拼音 */ + @NotBlank(message = "器材名称拼音不能为空") private String pyStr; /** 器材五笔拼音 */ + @NotBlank(message = "器材五笔拼音不能为空") private String wbStr; /** 器材分类 */ + @NotNull(message = "器材分类不能为空") private DeviceCategory categoryEnum; /** 器材种类 */ + @NotBlank(message = "器材种类不能为空") private String typeCode; /** 包装单位 */ + @NotBlank(message = "包装单位不能为空") private String unitCode; /** 包装规格 */ + @NotBlank(message = "包装规格不能为空") private String size; /** 拆零比 */ + @NotNull(message = "拆零比不能为空") private BigDecimal partPercent; /** 最小使用单位 */ + @NotBlank(message = "最小使用单位不能为空") private String minUnitCode; /** 产品型号 */ + @NotBlank(message = "产品型号不能为空") private String modelNumber; /** 高值器材标志 */ + // @NotNull(message = "高值器材标志不能为空") private Integer hvcmFlag; /** 销售单位 */ + @NotBlank(message = "销售单位不能为空") private String salesUnitCode; /** 批准文号 */ + @NotBlank(message = "批准文号不能为空") private String approvalNumber; /** 医保标记 */ + // @NotNull(message = "医保标记不能为空") private Integer ybFlag; /** 医保编码 */ private String ybNo; /** 医保对码标记 */ + // @NotNull(message = "医保对码标记不能为空") private Integer ybMatchFlag; /** 生产厂家 */ + @NotNull(message = "生产厂家不能为空") private Long manufacturerId; /** 供应商 */ + @NotNull(message = "供应商不能为空") private Long supplyId; /** 说明 */ private String description; /** 适用范围 */ + @NotBlank(message = "适用范围不能为空") private String jurisdiction; /** 执行科室 */ + @NotNull(message = "执行科室不能为空") private Long ruleId; /** 器材版本 */ @@ -99,5 +118,6 @@ public class DeviceManageUpDto { private String substanceText; /** 过敏标记 */ + // @NotNull(message = "过敏标记不能为空") private Integer allergenFlag; } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java index a57edee7..79c4ed95 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java @@ -44,12 +44,14 @@ public class DiagnosisTreatmentDto { /** 医保标记 */ private Integer ybFlag; + private String ybFlag_enumText; /** 医保编码 */ private String ybNo; /** 医保对码标记 */ private Integer ybMatchFlag; + private String ybMatchFlag_enumText; /** 状态 */ private PublicationStatus statusEnum; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java index 873c27af..154a1158 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java @@ -1,10 +1,12 @@ package com.openhis.web.datadictionary.dto; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.openhis.common.enums.ActivityDefCategory; + import lombok.Data; import lombok.experimental.Accessors; @@ -22,6 +24,7 @@ public class DiagnosisTreatmentUpDto { private Long id; /** 目录类别 */ + @NotNull(message = "目录类别不能为空") private ActivityDefCategory categoryEnum; /** 编码 */ @@ -33,24 +36,30 @@ public class DiagnosisTreatmentUpDto { private String name; /** 项目名称拼音 */ + @NotBlank(message = "项目名称拼音不能为空") private String pyStr; /** 五笔拼音 */ + @NotBlank(message = "五笔拼音不能为空") private String wbStr; /** 类型 */ + @NotBlank(message = "类型不能为空") private String typeCode; /** 使用单位 */ + @NotBlank(message = "使用单位不能为空") private String permittedUnitCode; /** 医保标记 */ + // @NotNull(message = "医保标记不能为空") private Integer ybFlag; /** 医保编码 */ private String ybNo; /** 医保对码标记 */ + // @NotNull(message = "医保对码标记不能为空") private Integer ybMatchFlag; /** 身体部位 */ diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/WhetherContainUnknown.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/WhetherContainUnknown.java index 9a85df41..17f7939b 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/WhetherContainUnknown.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/WhetherContainUnknown.java @@ -1,6 +1,7 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; + import lombok.AllArgsConstructor; import lombok.Getter; @@ -9,7 +10,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum WhetherContainUnknown { +public enum WhetherContainUnknown implements HisEnumInterface { NO(0, "no", "否"), YES(1, "yes", "是"), UNKNOWN(2, "unknown", "未知");