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

代码提交 项目定价修改

Browse Source
This commit is contained in:
Zhuangxingyu
2025-02-25 13:55:00 +08:00
parent 62d1a3adb5
commit 70b527ea00
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
openhis-server/core-common/src/main/java/com/core/common/enums/ChargeItemEnum.java
View File

@@ -14,69 +14,69 @@ public enum ChargeItemEnum {
/** /**
* 床位费 * 床位费
*/ */
BED_FEE("01", "床位费"), BED_FEE(1, "床位费"),
/** /**
* 诊察费 * 诊察费
*/ */
DIAGNOSTIC_FEE("02", "诊察费"), DIAGNOSTIC_FEE(2, "诊察费"),
/** /**
* 检查费 * 检查费
*/ */
CHECK_FEE("03", "检查费"), CHECK_FEE(3, "检查费"),
/** /**
* 化验费 * 化验费
*/ */
DIAGNOSTIC_TEST_FEE("04", "化验费"), DIAGNOSTIC_TEST_FEE(4, "化验费"),
/** /**
* 治疗费 * 治疗费
*/ */
MEDICAL_EXPENSE_FEE("05", "治疗费"), MEDICAL_EXPENSE_FEE(5, "治疗费"),
/** /**
* 手术费 * 手术费
*/ */
OPERATION_FEE("06", "手术费"), OPERATION_FEE(6, "手术费"),
/** /**
* 护理费 * 护理费
*/ */
NURSING_FEE("07", "护理费"), NURSING_FEE(7, "护理费"),
/** /**
* 卫生材料费 * 卫生材料费
*/ */
SANITARY_MATERIALS_FEE("08", "卫生材料费"), SANITARY_MATERIALS_FEE(8, "卫生材料费"),
/** /**
* 西药费 * 西药费
*/ */
WEST_MEDICINE("09", "西药费"), WEST_MEDICINE(9, "西药费"),
/** /**
* 中药饮片费 * 中药饮片费
*/ */
CHINESE_MEDICINE_SLICES_FEE("10", "中药饮片费"), CHINESE_MEDICINE_SLICES_FEE(10, "中药饮片费"),
/** /**
* 中成药费 * 中成药费
*/ */
CHINESE_MEDICINE_FEE("11", "中成药费"), CHINESE_MEDICINE_FEE(11, "中成药费"),
/** /**
* 一般诊疗费 * 一般诊疗费
*/ */
GENERAL_CONSULTATION_FEE("12", "一般诊疗费"), GENERAL_CONSULTATION_FEE(12, "一般诊疗费"),
/** /**
* 挂号费 * 挂号费
*/ */
REGISTRATION_FEE("13", "挂号费"), REGISTRATION_FEE(13, "挂号费"),
/** /**
* 其他费 * 其他费
*/ */
OTHER_FEE("14", "其他费"); OTHER_FEE(14, "其他费");
private final String code; private final Integer code;
private final String info; private final String info;
ChargeItemEnum(String code, String info) { ChargeItemEnum(Integer code, String info) {
this.code = code; this.code = code;
this.info = info; this.info = info;
} }
public String getCode() { public Integer getCode() {
return code; return code;
} }

2
openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
View File

@@ -134,7 +134,7 @@ public class ItemDefinitionController {
public R<?> getDefinitionPage(ItemDefSearchParam itemDefSearchParam, public R<?> getDefinitionPage(ItemDefSearchParam itemDefSearchParam,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(value = "searchKey", defaultValue = "10") String searchKey, HttpServletRequest request) { @RequestParam(value = "searchKey", required = false) String searchKey, HttpServletRequest request) {
IPage<ChargeItemDefPageDto> chargeItemDefinitionPage = new Page<>(); IPage<ChargeItemDefPageDto> chargeItemDefinitionPage = new Page<>();
List<ChargeItemDefPageDto> chargeItemDefinitionList; List<ChargeItemDefPageDto> chargeItemDefinitionList;

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

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
public class ChargeItemOptionDto { public class ChargeItemOptionDto {
/** 值 */ /** 值 */
private String value; private Integer value;
/** 标签 */ /** 标签 */
private String label; private String label;

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

@@ -19,7 +19,7 @@ public class ItemDefSearchParam {
/** 定价类型 */ /** 定价类型 */
private String definitionType; private String definitionType;
/** 定价项目 */ /** 定价项目 */
private String chargeItem; private Integer chargeItem;
/** 模糊搜索条件 */ /** 模糊搜索条件 */
private String searchKey; private String searchKey;
} }