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

诊疗器材枚举增加

Browse Source
This commit is contained in:
anxin
2025-03-03 16:01:49 +08:00
parent 2c4486f6f8
commit b8ced534fe
7 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
View File

@@ -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<DeviceManageDto> 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);
}

10
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
View File

@@ -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<DiagnosisTreatmentDto> 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);
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;

9
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
View File

@@ -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;
/** 身体部位 */

3
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/WhetherContainUnknown.java
View File

@@ -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", "未知");