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

Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

Browse Source 
# Conflicts:
#	openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java
This commit is contained in:
mayang
2025-03-31 10:42:38 +08:00
parent 6e1204fbea 7c296698aa
commit 4ccd07d3af
287 changed files with 17854 additions and 5302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
View File

@@ -40,6 +40,11 @@ public class CommonConstants {
* 3（用于字符串截位）
*/
Integer THREE = 3;
/**
* 中杠
*/
String DASH = "-";
}
/**
@@ -113,11 +118,15 @@ public class CommonConstants {
*/
String PatientBusNo = "patient_bus_no";
/**
* 患者ID
*/
String PatientId = "patient_id";
/**
* 就诊号
*/
String EncounterBusNo = "encounter_bus_no";
/**
* 身份证号
*/
@@ -141,17 +150,37 @@ public class CommonConstants {
/**
* 请求状态
*/
String requestStatus = "request_status";
String RequestStatus = "request_status";
/**
* 创建时间
*/
String createTime = "create_time";
String CreateTime = "create_time";
/**
* 请求基于什么的ID
*/
String basedOnId = "based_on_id";
String BasedOnId = "based_on_id";
/**
* 药品id
*/
String MedicationId = "medication_id";
/**
* 就诊Id
*/
String encouterId = "encouter_id";
/**
* 合同编码
*/
String contractNo = "contract_no";
/**
* 支付流水
*/
String paymentNo = "payment_no";
}
/**
@@ -170,6 +199,25 @@ public class CommonConstants {
String TCM_DIAGNOSIS = "中医诊断";
}
/**
* 字典字段名常量
*/
public interface DictName {
/**
* 器材
*/
String MED_CATEGORY_CODE = "med_category_code";
/**
* 药品分类
*/
String DEVICE_CATEGORY_CODE = "device_category_code";
/**
* 诊疗分类
*/
String DIAGNOSIS_CATEGORY_CODE = "activity_category_code";
}
/**
* sql条件常量
*/

17
openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
View File

@@ -70,4 +70,21 @@ public class PromptMsgConstant {
String M00001 = "apl.inventory.M00001";
}
/**
* 退费
*/
public interface ChargeRefund {
/**
* 该收费单相关{0}已经发出，请先退药后再进行退费
*/
String M00001 = "apl.chargeRefund.M00001";
/**
* 该收费单相关诊疗项目已经执行，请等待医技科室审批完成后再进行退费
*/
String M00002 = "apl.chargeRefund.M00002";
}
}

15
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java
View File

@@ -1,16 +1,23 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 性别 0=男,1=女,2=未知(和若依框架保持一致)
*/
@Getter
@AllArgsConstructor
public enum AdministrativeGender implements HisEnumInterface {
MALE(1, "male", "男性"),
FEMALE(2, "female", "女性"),
OTHER(3, "other", "其他"),
UNKNOWN(9, "unknown", "未知");
MALE(0, "male", "男性"),
FEMALE(1, "female", "女性"),
UNKNOWN(2, "unknown", "未知");
@EnumValue
private final Integer value;
private final String code;

28
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
View File

@@ -29,7 +29,7 @@ public enum AssignSeqEnum {
/**
* 处方号
*/
PRESCRIPTION_NO("4", "处方号", "P"),
PRESCRIPTION_NO("4", "处方号", "PR"),
/**
* 药品请求编码
@@ -49,7 +49,31 @@ public enum AssignSeqEnum {
/**
* 费用项目编码
*/
CHARGE_ITEM_NO("8", "费用项目编码", "CI");
CHARGE_ITEM_NO("8", "费用项目编码", "CI"),
/**
* 药品项目编码
*/
MEDICATION_NUM("9", "药品项目编码", "MD"),
/**
* 器材项目编码
*/
DEVICE_NUM("10", "项目编码", "DD"),
/**
* 支付编码
*/
PAYMENT_NO("11", "支付编码", "SF"),
/**
* 诊疗项目编码
*/
ACTIVITY_DEFINITION_NUM("11", "诊疗编码", "AD"),
/**
* 诊断定义编码
*/
CONDITION_DEFINITION_NUM("11", "诊断编码", "CD");
private final String code;
private final String info;

51
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Category.java Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* Category 合同类别（结算类别）
*
* @author SunJQ
* @date 2025-03-29
*/
@Getter
@AllArgsConstructor
public enum Category {
/**
* MEMBER_FIRST
*/
SELF(0, "自费"),
/**
* MEMBER_SECOND
*/
PROVINCIAL_INSURANCE(1, "MEMBER_SECOND"),
/**
* MEMBER_SECOND
*/
MUNICIPAL_INSURANCE(1, "MEMBER_SECOND"),
/**
* MEMBER_SECOND
*/
PUBLIC(1, "MEMBER_SECOND");
@EnumValue
private Integer value;
private String description;
public static Category getByValue(Integer value) {
if (value==null) {
return null;
}
for (Category val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

16
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java
View File

@@ -16,25 +16,25 @@ import lombok.Getter;
@AllArgsConstructor
public enum ChargeItemContext implements HisEnumInterface {
/**
* 采购
*/
PURCHASE(1, "1", "采购"),
/**
* 药品
*/
MEDICATION(2, "2", "药品"),
MEDICATION(1, "1", "药品"),
/**
* 耗材
*/
DEVICE(3, "3", "耗材"),
DEVICE(2, "2", "耗材"),
/**
* 项目
*/
ACTIVITY(4, "4", "项目");
ACTIVITY(3, "3", "项目"),
/**
* 采购
*/
PURCHASE(4, "4", "采购");
private final Integer value;
private final String code;

17
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java
View File

@@ -37,10 +37,25 @@ public enum ChargeItemStatus implements HisEnumInterface {
*/
ERROR(6, "entered-in-error", "错误"),
/**
* 退费中
*/
REFUNDING(7, "refunding", "退费中"),
/**
* 全部退费
*/
REFUNDED(8, "refunded", "全部退费"),
/**
* 部分退费
*/
PART_REFUND(9, "part-refund", "部分退费"),
/**
* 未知
*/
UNKNOWN(7, "unknown", "未知");
UNKNOWN(10, "unknown", "未知");
private final Integer value;
private final String code;

5
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java
View File

@@ -12,7 +12,10 @@ import lombok.Getter;
@AllArgsConstructor
public enum ConditionCode implements HisEnumInterface {
UNIT_PRODUCT_BATCH_NUM(1, "unit_product_batch_num", "单位,产品批号");
UNIT_PRODUCT_BATCH_NUM(1, "1", "产品批号"),
PROCUREMENT(2,"2","采购"),
UNIT(3,"3","单位"),
LIMIT(4,"4","限制");
@EnumValue
private final Integer value;

50
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java Normal file
View File

@@ -0,0 +1,50 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 合同类型
*
* @author zwh
* @date 2025-03-29
*/
@Getter
@AllArgsConstructor
public enum ContractCategory implements HisEnumInterface{
/**
* 自费
*/
SELF_CHARGE(1, "1", "自费"),
/**
* 公费
*/
PUBLIC_CHARGE(2, "2", "公费"),
/**
* 省医保
*/
PROVINCIAL_INSURANCE(3, "3", "省医保"),
/**
* 市医保
*/
MUNICIPAL_INSURANCE(4, "4", "市医保"),
/**
* 职工医保
*/
WORKER_INSURANCE(5, "5", "职工医保");
@EnumValue
private final Integer value;
private final String code;
private final String info;
}

22
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java
View File

@@ -6,17 +6,17 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum DeviceCategory {
ACTIVE (1, "active", "有源的"),
COMMUNICATING(2, "communicating", "通讯类"),
HOMEUSE(3, "communicating", "非院内使用"),
IMPLANTABLE(4, "implantable", "植入类"),
IN_VITRO(5, "in-vitro", "试管类"),
POINT_OF_CARE(6, "point-of-care", "床旁类"),
SINGLE_USE(7, "single-use", "单次消耗类"),
REUSABLE(8, "reusable", "可重用的"),
SOFTWARE(9, "software", "软件类"),
DME(10, "dme", "治疗设备");
public enum DeviceCategory implements HisEnumInterface {
ACTIVE (1, "1", "有源的"),
COMMUNICATING(2, "2", "通讯类"),
HOMEUSE(3, "3", "非院内使用"),
IMPLANTABLE(4, "4", "植入类"),
IN_VITRO(5, "5", "试管类"),
POINT_OF_CARE(6, "6", "床旁类"),
SINGLE_USE(7, "7", "单次消耗类"),
REUSABLE(8, "8", "可重用的"),
SOFTWARE(9, "9", "软件类"),
DME(10, "10", "治疗设备");
@EnumValue
private final Integer value;
private final String code;

96
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java Normal file
View File

@@ -0,0 +1,96 @@
package com.openhis.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 药品请求状态
*
* @author wangyang
* @date 2025-03-14
*/
@Getter
@AllArgsConstructor
public enum DispenseStatus implements HisEnumInterface {
/**
* 草稿
*/
DRAFT(1, "DR", "草稿"),
/**
* 待配药
*/
PREPARATION(2, "PR", "待配药"),
/**
* 待发药
*/
IN_PROGRESS(3, "IN", "待发药"),
/**
* 已发药
*/
COMPLETED(4, "CO", "已发药"),
/**
* 暂停
*/
ON_HOLD(5, "ON", "暂停"),
/**
* 停止
*/
STOPPED(6, "ST", "停止"),
/**
* 拒绝发药
*/
DECLINED(7, "DE", "拒绝发药"),
/**
* 已汇总
*/
SUMMARIZED(8, "SR", "已汇总"),
/**
* 部分发药
*/
PART_COMPLETED(9, "PC", "部分发药"),
/**
* 部分退药
*/
PART_REFUND(10, "PR", "部分退药"),
/**
* 退药中
*/
IN_REFUND(11, "IR", "退药中"),
/**
* 已退药
*/
REFUNDED(12, "RE", "已退药"),
/**
* 未知
*/
UNKNOWN(13, "UN", "未知");
private Integer value;
private String code;
private String info;
public static DispenseStatus getByValue(Integer value) {
if (value == null) {
return null;
}
for (DispenseStatus val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

41
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java Normal file
View File

@@ -0,0 +1,41 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum FinCategory implements HisEnumInterface {
/**
* 自费
*/
SELF_PAY(1, "1", "自费"),
/**
* 省医保
*/
PROVINCIAL_MEDICAL_INSURANCE(2, "2", "省医保"),
/**
* 市医保
*/
MUNICIPAL_MEDICAL_INSURANCE(3, "3", "市医保");
private Integer value;
private String code;
private String info;
public static FinCategory getByValue(Integer value) {
if (value == null) {
return null;
}
for (FinCategory val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

4
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java
View File

@@ -18,9 +18,9 @@ import lombok.Getter;
public enum ItemType implements HisEnumInterface {
/**
* 中药
* 药品
*/
MEDICINE(1, "1", "中药"),
MEDICINE(1, "1", "药品"),
/**
* 耗材

35
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 未执行原因
*
* @author zwh
* @date 2025-03-29
*/
@Getter
@AllArgsConstructor
public enum NotPerformedReason {
/**
* 退费
*/
REFUND(1, "1", "退费"),
/**
* 异常
*/
ERROR(9, "9", "异常");
@EnumValue
private final Integer value;
private final String code;
private final String info;
}

136
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java Normal file
View File

@@ -0,0 +1,136 @@
package com.openhis.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 药品请求状态
*
* @author wangyang
* @date 2025-03-14
*/
@Getter
@AllArgsConstructor
public enum NotPerformedReasonEnum implements HisEnumInterface {
/**
* 订单已停止
*/
ORDER_STOPPED(1,"OS", "订单已停止"),
/**
* 过时订单
*/
OUTDATED_ORDER(2, "OO", "过时订单"),
/**
* 不完整的数据
*/
INCOMPLETE_DATA(3, "ID", "不完整的数据"),
/**
* 产品不可用
*/
PRODUCT_NOT_AVAILABLE(4, "PNA", "产品不可用"),
/**
* 道德/宗教
*/
MORAL_RELIGIOUS(5, "MR", "道德/宗教"),
/**
* 无法提供护理
*/
UNABLE_PROVIDE(6, "UP", "无法提供护理"),
/**
* 先尝试其他治疗方法
*/
OTHER_TREATMENT(7, "OT", "先尝试其他治疗方法"),
/**
* 处方/请求需要澄清
*/
PRESCRIPTION_REQUEST_CLARIFICATION(8, "PRC", "处方/请求需要澄清"),
/**
* 药物水平过高
*/
EXCESSIVE_DRUG_LEVELS(9, "EDL", "药物水平过高"),
/**
* 入院
*/
HOSPITALIZED(10, "HO", "入院"),
/**
* 实验室干扰问题
*/
LABORATORY_INTERFERENCE_ISSUE(11, "LII", "实验室干扰问题"),
/**
* 患者不可用
*/
PATIENT_UNAVAILABLE(12, "PU", "患者不可用"),
/**
* 患者怀孕或哺乳
*/
PATIENT_PREGNANT_BREASTFEEDING(13, "PPB", "患者怀孕或哺乳"),
/**
* 过敏
*/
ALLERGY(14, "AL", "过敏"),
/**
* 药物与另一种药物相互作用
*/
ANOTHER_DRUG(15, "AD", "药物与另一种药物相互作用"),
/**
* 重复治疗
*/
REPEAT_TREATMENT(16, "RT", "重复治疗"),
/**
* 疑似不耐受
*/
SUSPECTED_INTOLERANCE(17, "SI", "疑似不耐受"),
/**
* 计划手术的患者
*/
PATIENTS_PLANNING_SURGERY(18, "PPS", "计划手术的患者"),
/**
* 冲洗
*/
WASH(19, "WA", "冲洗"),
/**
* 药物缺货
*/
DRUG_SHORTAGE(20, "DS", "药物缺货"),
/**
* 药物不可用
*/
MEDICATION_NOT_AVAILABLE(21, "MNA", "药物不可用");
private Integer value;
private String code;
private String info;
public static NotPerformedReasonEnum getByValue(Integer value) {
if (value == null) {
return null;
}
for (NotPerformedReasonEnum val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

169
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/Payment.java Normal file
View File

@@ -0,0 +1,169 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 支付类型
*
* @author SunJQ
* @date 2025-03-29
*/
@Getter
@AllArgsConstructor
public enum Payment {
/**
* 现金支付
*/
CASH(1, 1, "现金支付"),
/**
* 微信支付
*/
VX_PAY(2, 1, "微信支付"),
/**
* 支付宝支付
*/
ALI_PAY(3, 1, "支付宝支付"),
/**
* 银联支付
*/
UNION_PAY(4, 1, "银联支付"),
/**
* 医保账户支付
*/
YB_ZH_PAY(5, 1, "医保账户支付"),
/**
* 医保统筹支付合计
*/
YB_TC_SUM_PAY(6, 1, "医保统筹支付合计"),
/**
* 医保统筹支付
*/
YB_TC_PAY(7, 2, "医保统筹支付"),
/**
* 医保公务员补助
*/
YB_GWY_PAY(8, 2, "医保公务员补助"),
/**
* 先行自付金额
*/
XX_SELF_PAY(9, 2, "先行自付金额"),
/**
* 全自费金额
*/
ALL_SELF_PAY(10, 2, "先行自付金额"),
/**
* 医疗工伤支付
*/
YL_GS_PAY(11, 2, "医疗工伤支付"),
/**
* 老红军支付
*/
YB_HJ_PAY(12, 2, "老红军支付"),
/**
* 离休人员医疗保障基金支付金额
*/
YB_LTX_PAY(13, 2, "离休人员医疗保障基金支付金额"),
/**
* 居民统筹
*/
YB_JM_TC_PAY(14, 2, "居民统筹"),
/**
* 居民大病
*/
YB_JM_DB_PAY(15, 2, "居民大病"),
/**
* 补充医疗补助基金支付金额
*/
YB_BC_PAY(16, 2, "补充医疗补助基金支付金额"),
/**
* 其他扶贫报销金额
*/
YB_OTHER_FP_PAY(17, 2, "其他扶贫报销金额"),
/**
* 健康扶贫医疗基金
*/
YB_JK_FP_PAY(18, 2, "健康扶贫医疗基金"),
/**
* 精准脱贫保险金额
*/
YB_JZ_TP_PAY(19, 2, "精准脱贫保险金额"),
/**
* 提交医保总额
*/
YB_SUM_FEE(20, 2, "提交医保总额"),
/**
* 二乙医疗专项医疗基金支出
*/
YB_EY_PAY(21, 2, "二乙医疗专项医疗基金支出"),
/**
* 慢特病支付
*/
YB_TM_PAY(22, 2, "补充医疗补助基金支付金额"),
/**
* 定点医疗机构垫支
*/
YB_ORG_PAY(23, 2, "定点医疗机构垫支"),
/**
* 起付线公务员返还
*/
YB_RETURN_GWY_PAY(24, 2, "起付线公务员返还"),
/**
* 大额理赔金额
*/
YB_DELP_PAY(25, 2, "大额理赔金额"),
/**
* 民政救助金额
*/
YB_MZJZ_PAY(26, 2, "民政救助金额"),
/**
* 生育基金支付
*/
BIRTH_TC_PAY_AMOUNT(27, 1, "生育基金支付"),
/**
* 生育账户支付
*/
BIRTH_ZH_PAY_AMOUNT(28, 1, "生育账户支付"),
/**
* 符合范围金额
*/
YB_FHFW_AMOUNT(29, 2, "符合范围金额"),
/**
* 财政兜底基金支出
*/
YB_CZDD_AMOUNT(30, 2, "财政兜底基金支出");
@EnumValue
private Integer value;
private Integer level;
private String info;
public static Payment getByValue(Integer value) {
if (value == null) {
return null;
}
for (Payment val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

48
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentKind.java Normal file
View File

@@ -0,0 +1,48 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* PaymentKind (0: MEMBER_FIRST; 1: MEMBER_SECOND;)
*
* @author SunJQ
* @date 2025-03-29
*/
@Getter
@AllArgsConstructor
public enum PaymentKind {
/**
* 住院存款
*/
HOSPITAL_DEPOSIT(0, "住院存款"),
/**
* 门诊收费
*/
OUTPATIENT_CLINIC(1, "门诊收费"),
/**
* 住院费用
*/
INPATIENT_CLINIC(2, "住院费用");
@EnumValue
private Integer value;
private String description;
public static PaymentKind getByValue(String value) {
if(value==null){
return null;
}
for (PaymentKind val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

46
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentResult.java Normal file
View File

@@ -0,0 +1,46 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* PaymentResult (0: MEMBER_FIRST; 1: MEMBER_SECOND;)
*
* @author SunJQ
* @date 2025-03-29
*/
@Getter
@AllArgsConstructor
public enum PaymentResult {
/**
* 未支付
*/
UNPAID(0, "未支付"),
/**
* 已支付
*/
PAID(1, "已支付"),
/**
* 已退费
*/
refunded(-2, "已退费");
private Integer value;
private String description;
public static PaymentResult getByValue(String value) {
if (value==null) {
return null;
}
for (PaymentResult val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

44
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PaymentType.java Normal file
View File

@@ -0,0 +1,44 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* PaymentType (0: MEMBER_FIRST; 1: MEMBER_SECOND;)
*
* @author SunJQ
* @date 2025-03-29
*/
@Getter
@AllArgsConstructor
public enum PaymentType {
/**
* 付费
*/
PAY(0, "付费"),
/**
* 退费
*/
UN_PAY(1, "退费");
@EnumValue
private Integer value;
private String description;
public static PaymentType getByValue(String value) {
if(value==null){
return null;
}
for (PaymentType val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

24
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PermissionLimit.java Normal file
View File

@@ -0,0 +1,24 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 权限限制
*
* @author liuhr
* @date 2025/3/25
*/
@Getter
@AllArgsConstructor
public enum PermissionLimit implements HisEnumInterface {
UNRESTRICTED(1, "unrestricted", "非限制使用"),
RESTRICTED(2, "restricted", "限制使用"),
SPECIAL(3, "special", "特殊使用");
@EnumValue
private final Integer value;
private final String code;
private final String info;
}

9
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRole.java → openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PractitionerRoles.java
View File

@@ -6,16 +6,19 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 参与者角色
* 参与者角色 : 对应 sys_role表的角色标识 ; 需要补充业务数据时在该枚举类添加
*/
@Getter
@AllArgsConstructor
public enum PractitionerRole implements HisEnumInterface {
public enum PractitionerRoles implements HisEnumInterface {
DOCTOR(1, "doctor", "医生"),
NURSE(2, "nurse", "护士"),
PHARMACIST(3, "pharmacist", "药师");
PHARMACIST(3, "pharmacist", "药师"),
LOCATION_ADMIN(4, "locationAdmin", "库房管理员");
@EnumValue
private final Integer value;

29
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
View File

@@ -23,37 +23,42 @@ public enum RequestStatus implements HisEnumInterface {
/**
* 已发送
*/
COMPLETED(2, "completed", "已发送"),
ACTIVE(2, "active", "已发送"),
/**
* 已完成
*/
COMPLETED(3, "completed", "已完成"),
/**
* 暂停
*/
ON_HOLD(3, "on_hold", "暂停"),
ON_HOLD(4, "on_hold", "暂停"),
/**
* 撤回
* 取消
*/
CANCELLED(4, "cancelled", "撤回"),
CANCELLED(5, "cancelled", "取消"),
/**
* 停止
*/
STOPPED(5, "stopped", "停止"),
STOPPED(6, "stopped", "停止"),
/**
* 不可用
*/
ENDED(6, "ended", "不可用"),
/**
* 未知
*/
UNKNOWN(7, "unknown", "未知"),
ENDED(7, "ended", "不可用"),
/**
* 已汇总
*/
SUMMARIZED(8, "summarized", "已汇总");
SUMMARIZED(8, "summarized", "已汇总"),
/**
* 未知
*/
UNKNOWN(9, "unknown", "未知");
@EnumValue
private final Integer value;

27
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SplitPropertyCode.java Normal file
View File

@@ -0,0 +1,27 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 拆分属性
*
* @author liuhr
* @date 2025/3/27
*/
@Getter
@AllArgsConstructor
public enum SplitPropertyCode implements HisEnumInterface {
OUTPATIENT_MIN_UNIT_CEIL(1, "outpatient_min_unit_ceil", "门诊按最小单位每次量向上取整"),
OUTPATIENT_PACKAGE_NON_SPLITTABLE(2, "outpatient_package_non_splittable", "门诊按包装单位不可拆分"),
OUTPATIENT_MIN_UNIT_TOTAL_CEIL(3, "outpatient_min_unit_total_ceil", "门诊按最小单位总量向上取整"),
OUTPATIENT_PACKAGE_UNIT_CEIL(4, "outpatient_package_unit_ceil", "门诊按包装单位每次量向上取整");
@EnumValue
private final Integer value;
private final String code;
private final String info;
}

2
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java
View File

@@ -6,7 +6,7 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum SupplierType {
public enum SupplierType implements HisEnumInterface {
DRAFT(1, "1", "生产商"),
ACTIVE(2, "2", "供应商");

27
openhis-server/openhis-common/src/main/java/com/openhis/common/enums/TempOrderSplitPropertyCode.java Normal file
View File

@@ -0,0 +1,27 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 住院临时医嘱拆分属性的枚举
*
* @author liuhr
*
* @date 2025/3/28
*/
@Getter
@AllArgsConstructor
public enum TempOrderSplitPropertyCode implements HisEnumInterface {
TEMP_ORDER_MIN_UNIT_CEIL(1, "temp_order_min_unit_ceil", "临时医嘱按最小单位每次量向上取整"),
TEMP_ORDER_PACKAGE(2, "temp_order_package", "临时医嘱按包装单位开立"),
TEMP_ORDER_MIN_UNIT_TOTAL_CEIL(3, "temp_order_min_unit_total_ceil", "临时医嘱按最小单位总量向上取整"),
TEMP_ORDER_PACKAGE_UNIT_CEIL(4, "temp_order_package_unit_ceil", "临时医嘱按包装单位每次量向上取整");
@EnumValue
private final Integer value;
private final String code;
private final String info;
}

3
openhis-server/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java
View File

@@ -50,8 +50,7 @@ public class HisQueryUtils {
for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
String paramName = entry.getKey();
// 检查参数名是否以 "STime" 或 "ETime" 结尾
if (paramName.endsWith(CommonConstants.Common.S_TIME)
|| paramName.endsWith(CommonConstants.Common.E_TIME)) {
if (paramName.endsWith(CommonConstants.Common.S_TIME)) {
// 提取字段名（去掉 "STime" 或 "ETime" 后缀）
String fieldName = paramName.substring(0, paramName.length() - 5);
// 驼峰转下划线