py/his
3
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,26 +194,32 @@ public enum AssignSeqEnum {
* 订货单单号
*/
PHARMACY_WAREHOUSE_PURCHASE("36", "药库订货单", "PWP"),
/**
* 药房请领单单号
*/
PURCHASE_REQUISITION("37", "药房请领单", "PRE"),
/**
* 药房入库单单号
*/
PURCHASE_STOCKIN("38", "药房入库单", "PST"),
/**
* 药房退库单单号
*/
PURCHASE_RETURN("39", "药房退库单", "PET"),
/**
* 发药单单号
*/
DISPENSING_ORDER("40", "发药单", "DIO"),
/**
* 药房损益单单号
*/
PURCHASE_PRPFITLOSS("41", "药房损益单", "PPR"),
/**
* 药房盘点单单号
*/
@@ -222,6 +228,7 @@ public enum AssignSeqEnum {
* 药房调入单单号
*/
PURCHASE_TRANSFERIN("43", "药房调入单", "PTI"),
/**
* 药房调出单单号
*/
@@ -241,18 +248,22 @@ public enum AssignSeqEnum {
* 物资进货单
*/
MATERIAL_STOCKIN("47", "物资进货单", "MSI"),
/**
* 物资退货单
*/
MATERIAL_RETURN("48", "物资退货单", "MRE"),
/**
* 物资出库单
*/
MATERIAL_STOCKOUT("49", "物资出库单", "MSO"),
/**
* 物资退库单
*/
MATERIAL_PRODUCT_RETURN("50", "物资退库单", "MPR"),
/**
* 物资损益单
*/
@@ -262,10 +273,12 @@ public enum AssignSeqEnum {
* 物资盘点单
*/
MATERIAL_STOCKTAKING("52", "物资盘点单", "MST"),
/**
* 物资调入单
*/
MATERIAL_TRANSFERIN("53", "物资调入单", "MTI"),
/**
* 物资调出单
*/
@@ -275,43 +288,77 @@ public enum AssignSeqEnum {
* 科室请领单单号
*/
DEPARTMENT_REQUISITION("55", "科室请领单", "DRE"),
/**
* 科室入库单单号
*/
DEPARTMENT_STOCKIN("56", "科室入库单", "DST"),
/**
* 科室退库单单号
*/
DEPARTMENT_RETURN("57", "科室退库单", "DET"),
/**
* 科室损益单单号
*/
DEPARTMENT_PRPFITLOSS("58", "科室损益单", "DPR"),
/**
* 科室盘点单单号
*/
DEPARTMENT_STOCKTAKING("59", "科室盘点单", "DTO"),
/**
* 科室调入单单号
*/
DEPARTMENT_TRANSFERIN("60", "科室调入单", "DTI"),
/**
* 科室调出单单号
*/
DEPARTMENT_TRANSFEROUT("61", "科室调出单", "DTU"),
/**
* 诊疗处方号
*/
ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"),
/**
* b
* 病历文书
* b 病历文书
*/
PURCHASE_DOCUMENT("63", "病历文书", "DOC"),
/**
* 调价单
*/
CHANGE_PRICE_BUZ("64", "调整零售价", "CPB");
CHANGE_PRICE_BUZ("64", "调整零售价", "CPB"),
/**
* 药品汇总单号
*/
MEDICINE_SUMMARY_NO("65", "药品汇总单号", "MSY"),
/**
* 公费医疗自付比例调整申请编号
*/
GF_RATIO_APPLICATION("66", "公费医疗自付比例调整申请编号", "GRA"),
/**
* 参与者编码
*/
PRACTITIONER_NO("67", "参与者编码", "PER"),
/**
* 号源编码
*/
HEALTHCARE_SERVICE_NO("68", "号源编码", "HS"),
/**
* 耗材汇总单号
*/
DEVICE_SUMMARY_NO("69", "耗材汇总单号", "DSN");
private final String code;
private final String info;
private final String prefix;

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

@@ -33,7 +33,7 @@ public enum ConditionCode implements HisEnumInterface {
LIMIT(4, "4", "限制"),
/**
* 限制
* 产品批号售价
*/
LOT_NUMBER_PRICE(5, "5", "产品批号售价");

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

@@ -0,0 +1,50 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 学历层次
*
* @author Thanking
* @date 2025-10-21
*/
@Getter
@AllArgsConstructor
public enum EducationLevel implements HisEnumInterface {
/**
* 预科生
*/
PREPARATORY(0, "0", "预科生"),
/**
* 本科生
*/
UNDERGRADUATE(1, "1", "本科生"),
/**
* 硕士研究生
*/
POSTGRADUATE(2, "2", "硕士研究生"),
/**
* 博士研究生
*/
DOCTORAL(3, "3", "博士研究生");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static EducationLevel getByValue(Integer value) {
if (value == null) {
return null;
}
for (EducationLevel val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

22
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemGenerateSource.java → openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java
View File

@@ -7,14 +7,14 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 账单生成来源
* 生成来源 | 适用医嘱请求和账单
*
* @author zwh
* @date 2025-03-10
*/
@Getter
@AllArgsConstructor
public enum ChargeItemGenerateSource implements HisEnumInterface {
public enum GenerateSource implements HisEnumInterface {
/**
* 医生开立
@@ -27,19 +27,29 @@ public enum ChargeItemGenerateSource implements HisEnumInterface {
NURSE_PRICING(2, "2", "护士划价"),
/**
* 医嘱绑定
* 挂号登记
*/
MEDICAL_ORDER_BINDING(3, "3", "医嘱绑定");
REGISTRATION_REGISTER(3, "3", "挂号登记"),
/**
* 医嘱执行
*/
ORDER_EXECUTE(4, "4", "医嘱执行"),
/**
* 自动滚费
*/
AUTO_ROLL_FEES(5, "5", "自动滚费");
private final Integer value;
private final String code;
private final String info;
public static ChargeItemGenerateSource getByValue(Integer value) {
public static GenerateSource getByValue(Integer value) {
if (value == null) {
return null;
}
for (ChargeItemGenerateSource val : values()) {
for (GenerateSource val : values()) {
if (val.getValue().equals(value)) {
return val;
}

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

@@ -0,0 +1,50 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 公费申请状态
*
* @author Thanking
* @date 2025-10-21
*/
@Getter
@AllArgsConstructor
public enum GfApplicationStatus implements HisEnumInterface {
/**
* 处理中
*/
PROCESSING(0, "0", "处理中"),
/**
* 通过
*/
APPROVED(1, "1", "通过"),
/**
* 驳回
*/
REJECTED(2, "2", "驳回"),
/**
* 取消
*/
CANCELLED(3, "3", "取消");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static GfApplicationStatus getByValue(Integer value) {
if (value == null) {
return null;
}
for (GfApplicationStatus val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

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

@@ -0,0 +1,46 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 公费申请处理角色
*
* @author Thanking
* @date 2025-10-21
*/
@Getter
@AllArgsConstructor
public enum GfApprovalRole implements HisEnumInterface {
/**
* 测算盈亏人
*/
INITIAL_APPROVER(1, "1", "测算盈亏人"),
/**
* 财务报批人
*/
FINANCE_APPROVER(2, "2", "财务报批人"),
/**
* 会议结果录入人
*/
FINAL_RECORDER(3, "3", "会议结果录入人");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static GfApprovalRole getByValue(Integer value) {
if (value == null) {
return null;
}
for (GfApprovalRole val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

42
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java Normal file
View File

@@ -0,0 +1,42 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 公费项目分类
*
* @author Thanking
* @date 2025-10-24
*/
@Getter
@AllArgsConstructor
public enum GfItemType implements HisEnumInterface {
/**
* 药品
*/
MEDICATION(1, "1", "药品"),
/**
* 诊疗
*/
ACTIVITY(2, "2", "诊疗");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static GfItemType getByValue(Integer value) {
if (value == null) {
return null;
}
for (GfItemType val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

42
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java Normal file
View File

@@ -0,0 +1,42 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 公费比例类型
*
* @author Thanking
* @date 2025-10-22
*/
@Getter
@AllArgsConstructor
public enum GfRatioType implements HisEnumInterface {
/**
* 大项比例
*/
TYPE_RATIO(1, "1", "大项比例"),
/**
* 单项比例
*/
INDIVIDUAL_RATIO(2, "2", "单项比例");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static GfRatioType getByValue(Integer value) {
if (value == null) {
return null;
}
for (GfRatioType val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

63
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemCategoryCode.java Normal file
View File

@@ -0,0 +1,63 @@
package com.openhis.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 项目类型
*/
@Getter
@AllArgsConstructor
public enum ItemCategoryCode implements HisEnumInterface {
/**
* 中成药
*/
CHINESE_PATENT_DRUG(1, "1", "中成药"),
/**
* 西药
*/
WESTERN_MEDICINE(2, "2", "西药"),
/**
* 外购药品
*/
EXTERNALLY_PROCURED_DRUGS(3, "3", "外购药品"),
/**
* 中草药
*/
CHINESE_HERBAL_MEDICINE(4, "4", "中草药"),
/**
* 耗材
*/
DEVICE(7, "7", "耗材"),
/**
* 诊疗
*/
SERVICE(8, "8", "诊疗"),
/**
* 其他
*/
OTHER(9, "9", "其他");
private final Integer value;
private final String code;
private final String info;
public static ItemCategoryCode getByValue(Integer value) {
if (value == null) {
return null;
}
for (ItemCategoryCode val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

58
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/OrderPricingSource.java Normal file
View File

@@ -0,0 +1,58 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import com.core.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 医嘱定价来源
*
* @author SunJQ
* @date 2025-04-28
*/
@Getter
@AllArgsConstructor
public enum OrderPricingSource {
/**
* 批次售价
*/
BATCH_SELLING_PRICE(1,
"batchSellingPrice", "批次售价"),
/**
* 零售价
*/
RETAIL_PRICE(2, "retailPrice", "零售价");
private Integer value;
private String code;
private String info;
public static OrderPricingSource getByValue(Integer value) {
if (value == null) {
return null;
}
for (OrderPricingSource val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
public static OrderPricingSource getByCode(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (OrderPricingSource val : values()) {
if (val.getCode().equals(code)) {
return val;
}
}
return null;
}
}

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

@@ -25,14 +25,15 @@ public enum PaymentOutcome {
* 完整
*/
COMPLETED("1", 1, "完整"),
//2025/10/21 长大数据发现此处value和code没对应上，ERROR的value是2，code是3，PARTIAL是3和4.经确认这个枚举目前都是getCode，所以现在将value与code同步
/**
* 错误
*/
ERROR("2", 3,"错误"),
ERROR("3", 3,"错误"),
/**
* 部分
*/
PARTIAL("3", 4, "部分");
PARTIAL("4", 4, "部分");
private String value;
private Integer code;

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

@@ -0,0 +1,46 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 体检结果
*
* @author Thanking
* @date 2025-10-21
*/
@Getter
@AllArgsConstructor
public enum PhysicalExamResult implements HisEnumInterface {
/**
* 未体检
*/
NOT_EXAMINED(0, "0", "未体检"),
/**
* 体检不合格
*/
EXAMINATION_FAILED(1, "1", "体检不合格"),
/**
* 体检合格
*/
EXAMINATION_PASSED(2, "2", "体检合格");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static PhysicalExamResult getByValue(Integer value) {
if (value == null) {
return null;
}
for (PhysicalExamResult val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

54
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestFormType.java
View File

@@ -1,54 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 申请单管理类型
*
* @author zwh
* @date 2025-03-10
*/
@Getter
@AllArgsConstructor
public enum RequestFormType implements HisEnumInterface {
/**
* 检查
*/
CHECK(1, "1", "检查"),
/**
* 检验
*/
INSPECTION(2, "2", "检验"),
/**
* 输血
*/
BLOOD_TRANSFUSION(3, "3", "输血"),
/**
* 手术
*/
SURGERY(4, "4", "手术");
private final Integer value;
private final String code;
private final String info;
public static RequestFormType getByValue(Integer value) {
if (value == null) {
return null;
}
for (RequestFormType val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

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

@@ -0,0 +1,46 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 在校状态
*
* @author Thanking
* @date 2025-10-21
*/
@Getter
@AllArgsConstructor
public enum StudentStatus implements HisEnumInterface {
/**
* 在校
*/
IN_SCHOOL(0, "0", "在校"),
/**
* 休学
*/
ON_LEAVE(1, "1", "休学"),
/**
* 离校
*/
LEFT_SCHOOL(2, "2", "离校");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static StudentStatus getByValue(Integer value) {
if (value == null) {
return null;
}
for (StudentStatus val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

42
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/StudyMode.java Normal file
View File

@@ -0,0 +1,42 @@
package com.openhis.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 学习形式
*
* @author Thanking
* @date 2025-10-21
*/
@Getter
@AllArgsConstructor
public enum StudyMode implements HisEnumInterface {
/**
* 全日制
*/
FULL_TIME(1, "1", "全日制"),
/**
* 非全日制
*/
PART_TIME(2, "2", "非全日制");
@EnumValue
private final Integer value;
private final String code;
private final String info;
public static StudyMode getByValue(Integer value) {
if (value == null) {
return null;
}
for (StudyMode val : values()) {
if (val.getValue().equals(value)) {
return val;
}
}
return null;
}
}

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

@@ -8,9 +8,10 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum SupplierType implements HisEnumInterface {
DRAFT(1, "1", "生产商"),
ACTIVE(2, "2", "供应商");
MANUFACTURER(1, "1", "生产商"),
SUPPLIER(2, "2", "供应商");
@EnumValue
private final Integer value;

215
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java
View File

@@ -14,113 +14,130 @@ import lombok.Getter;
*/
@Getter
@AllArgsConstructor
public enum SupplyCategory implements HisEnumInterface{
public enum SupplyCategory implements HisEnumInterface {
/**
* 库存供应
*/
STOCK_SUPPLY(1, "1","库存供应"),
STOCK_SUPPLY(1, "1", "库存供应"),
/**
* 非库存供应
*/
NON_STOCK(2, "2","非库存供应"),
/**
* 普通
*/
NORMAL(3, "3","0.普通"),
/**
* 采购计划生成
*/
PURCHASE_PLAN_GENERATION(4, "4","1.采购计划生成"),
/**
* 外购药品入库
*/
PURCHASED_DRUGS_WAREHOUSING(5, "5","0.外购药品入库"),
/**
* 自制药品入库
*/
HOMEMADE_DRUGS_WAREHOUSING(6, "6","1.自制药品入库"),
/**
* 代销药品入库
*/
CONSIGNMENT_DRUGS_WAREHOUSING(7, "7","2.代销药品入库"),
/**
* 其他药品入库
*/
OTHER_DRUGS_WAREHOUSING(8, "8","3.其他药品入库"),
/**
* 赠送药品入库
*/
DONATED_DRUGS_WAREHOUSING(9, "9","4.赠送药品入库"),
/**
* 申请采购
*/
PURCHASE_APPLICATION(10, "10","1.申请采购"),
/**
* 院内出库
*/
IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
/**
* 院外出库
*/
OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"),
/**
* 其他出库
*/
OTHER_OUTBOUND(13, "13","2.其他出库"),
/**
* 普通损益
*/
GENERAL_PROFIT_AND_LOSS(14, "14","0.普通损益"),
/**
* 盘点损益
*/
STOCKTAKING_PROFIT_AND_LOSS(15, "15","1.盘点损益"),
/**
* 制剂消耗
*/
PREPARATION_CONSUMPTION(16, "16","2.制剂消耗"),
/**
* 常备抢救药品
*/
STANDBY_RESCUE_MEDICINES(16, "16","2.常备抢救药品"),
/**
* 破损过期药品
*/
DAMAGED_EXPIRED_MEDICINES(16, "16","3.破损过期药品"),
/**
* 捐赠药品
*/
DONATED_MEDICINES(16, "16","4.捐赠药品"),
/**
* 普通盘点
*/
GENERAL_STOCKTAKING(17, "17","0.普通盘点"),
/**
* 月度盘点
*/
MONTHLY_STOCKTAKING(18, "18","1.月度盘点"),
/**
* 门诊病人发药
*/
OUTPATIENT_PATIENT_DISPENSING(19, "19","0.门诊病人发药"),
/**
* 住院病人发药
*/
INPATIENT_PATIENT_DISPENSING(20, "20","1.住院病人发药"),
/**
* 住院病人汇总发药
*/
INPATIENT_PATIENT_SUMMARY_DISPENSING(21, "21","2.住院病人汇总发药"),
/**
* 赠送
*/
PRESENT(22, "22","1.赠送"),
/**
* 视光材料
*/
OPTICAL_MATERIALS(23, "23","2.视光材料");
NON_STOCK(2, "2", "非库存供应");
// /**
// * 普通
// */
// NORMAL(3, "3","0.普通"),
// /**
// * 采购计划生成
// */
// PURCHASE_PLAN_GENERATION(4, "4","1.采购计划生成"),
// /**
// * 外购药品入库
// */
// PURCHASED_DRUGS_WAREHOUSING(5, "5","0.外购药品入库"),
// /**
// * 自制药品入库
// */
// HOMEMADE_DRUGS_WAREHOUSING(6, "6","1.自制药品入库"),
// /**
// * 代销药品入库
// */
// CONSIGNMENT_DRUGS_WAREHOUSING(7, "7","2.代销药品入库"),
// /**
// * 其他药品入库
// */
// OTHER_DRUGS_WAREHOUSING(8, "8","3.其他药品入库"),
// /**
// * 赠送药品入库
// */
// DONATED_DRUGS_WAREHOUSING(9, "9","4.赠送药品入库"),
// /**
// * 申请采购
// */
// PURCHASE_APPLICATION(10, "10","1.申请采购"),
// /**
// * 院内出库
// */
// IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
// /**
// * 院外出库
// */
// OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"),
// /**
// * 其他出库
// */
// OTHER_OUTBOUND(13, "13","2.其他出库"),
// /**
// * 普通损益
// */
// GENERAL_PROFIT_AND_LOSS(14, "14","0.普通损益"),
// /**
// * 盘点损益
// */
// STOCKTAKING_PROFIT_AND_LOSS(15, "15","1.盘点损益"),
// /**
// * 制剂消耗
// */
// PREPARATION_CONSUMPTION(16, "16","2.制剂消耗"),
// /**
// * 常备抢救药品
// */
// STANDBY_RESCUE_MEDICINES(16, "16","2.常备抢救药品"),
// /**
// * 破损过期药品
// */
// DAMAGED_EXPIRED_MEDICINES(16, "16","3.破损过期药品"),
// /**
// * 捐赠药品
// */
// DONATED_MEDICINES(16, "16","4.捐赠药品"),
// /**
// * 普通盘点
// */
// GENERAL_STOCKTAKING(17, "17","0.普通盘点"),
// /**
// * 月度盘点
// */
// MONTHLY_STOCKTAKING(18, "18","1.月度盘点"),
// /**
// * 门诊病人发药
// */
// OUTPATIENT_PATIENT_DISPENSING(19, "19","0.门诊病人发药"),
// /**
// * 住院病人发药
// */
// INPATIENT_PATIENT_DISPENSING(20, "20","1.住院病人发药"),
// /**
// * 住院病人汇总发药
// */
// INPATIENT_PATIENT_SUMMARY_DISPENSING(21, "21","2.住院病人汇总发药"),
// /**
// * 赠送
// */
// PRESENT(22, "22","1.赠送"),
// /**
// * 视光材料
// */
// OPTICAL_MATERIALS(23, "23","2.视光材料"),
// /**
// * 调价分类 药品
// */
// REQUEST_CATEGORY_CHANGE_PRICE_MEDICATION(24, "24","药品调价单"),
// /**
// * 调价分类 耗材
// */
// REQUEST_CATEGORY_CHANGE_PRICE_DEVICE(25, "25","耗材调价单"),
// /**
// * 调价分类 诊疗
// */
// REQUEST_CATEGORY_CHANGE_PRICE_ACTIVITY(26, "26","诊疗调价单"),
// /**
// * 调价分类 挂号
// */
// REQUEST_CATEGORY_CHANGE_PRICE_HEALTH(27, "27","挂号调价单");
private Integer value;
private String code;

1
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyStatus.java
View File

@@ -45,6 +45,7 @@ public enum SupplyStatus implements HisEnumInterface {
* 待审请
*/
PENDING_REVIEW(10, "6", "待审请"),
/**
* 已失效
*/

60
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyType.java
View File

@@ -29,7 +29,7 @@ public enum SupplyType implements HisEnumInterface {
/**
* 汇总发药
*/
DISPENSING_AGGREGATION(3, "3", "汇总发药"),
SUMMARY_DISPENSE(3, "3", "汇总发药"),
/**
* 商品盘点
@@ -73,7 +73,7 @@ public enum SupplyType implements HisEnumInterface {
/**
* 退药
*/
RETURN_MEDICATION(12, "12", "退药") ,
RETURN_MEDICATION(12, "12", "退药"),
/**
* 药库订货单
@@ -113,31 +113,31 @@ public enum SupplyType implements HisEnumInterface {
/**
* 药房入库单
*/
PURCHASE_STOCKIN(21,"21", "药房入库单" ),
PURCHASE_STOCKIN(21, "21", "药房入库单"),
/**
* 药房退库单
*/
PURCHASE_RETURN(22,"22", "药房退库单"),
PURCHASE_RETURN(22, "22", "药房退库单"),
/**
* 发药单
*/
DISPENSING_ORDER(23,"23", "发药单"),
DISPENSING_ORDER(23, "23", "发药单"),
/**
* 药房损益单
*/
PURCHASE_PRPFITLOSS(24,"24", "药房损益单"),
PURCHASE_PRPFITLOSS(24, "24", "药房损益单"),
/**
* 药房盘点单
*/
PURCHASE_STOCKTAKING(25,"25", "药房盘点单"),
PURCHASE_STOCKTAKING(25, "25", "药房盘点单"),
/**
* 药房调入单
*/
PURCHASE_TRANSFERIN(26,"26", "药房调入单"),
PURCHASE_TRANSFERIN(26, "26", "药房调入单"),
/**
* 药房调出单
*/
PURCHASE_TRANSFEROUT(27,"27", "药房调出单"),
PURCHASE_TRANSFEROUT(27, "27", "药房调出单"),
/**
* 物资订货单
@@ -172,11 +172,11 @@ public enum SupplyType implements HisEnumInterface {
/**
* 物资调入单
*/
MATERIAL_TRANSFERIN(35,"35", "物资调入单"),
MATERIAL_TRANSFERIN(35, "35", "物资调入单"),
/**
* 物资调出单
*/
MATERIAL_TRANSFEROUT(36,"36", "物资调出单"),
MATERIAL_TRANSFEROUT(36, "36", "物资调出单"),
/**
* 科室请领单
@@ -185,27 +185,27 @@ public enum SupplyType implements HisEnumInterface {
/**
* 科室入库单
*/
DEPARTMENT_STOCKIN(38,"38", "科室入库单" ),
DEPARTMENT_STOCKIN(38, "38", "科室入库单"),
/**
* 科室退库单
*/
DEPARTMENT_RETURN(39,"39", "科室退库单"),
DEPARTMENT_RETURN(39, "39", "科室退库单"),
/**
* 科室损益单
*/
DEPARTMENT_PRPFITLOSS(40,"40", "科室损益单"),
DEPARTMENT_PRPFITLOSS(40, "40", "科室损益单"),
/**
* 科室盘点单
*/
DEPARTMENT_STOCKTAKING(41,"41", "科室盘点单"),
DEPARTMENT_STOCKTAKING(41, "41", "科室盘点单"),
/**
* 科室调入单
*/
DEPARTMENT_TRANSFERIN(42,"42", "科室调入单"),
DEPARTMENT_TRANSFERIN(42, "42", "科室调入单"),
/**
* 科室调出单
*/
DEPARTMENT_TRANSFEROUT(43,"43", "科室调出单"),
DEPARTMENT_TRANSFEROUT(43, "43", "科室调出单"),
/**
* 自动盘点
@@ -215,7 +215,31 @@ public enum SupplyType implements HisEnumInterface {
/**
* 库存明细
*/
INVENTORY_PRODUCT(45, "45", "库存明细");
INVENTORY_PRODUCT(45, "45", "库存明细"),
/**
* 药品调价
*/
REQUEST_MEDICATION_CHANGE_PRICE(46, "46", "药品调价"),
/**
* 耗材调价
*/
REQUEST_DEVICE_CHANGE_PRICE(47, "47", "耗材调价"),
/**
* 诊疗调价
*/
REQUEST_ACTIVITY_CHANGE_PRICE(48, "48", "诊疗调价"),
/**
* 挂号调价
*/
REQUEST_HEALTH_CHANGE_PRICE(49, "49", "挂号调价"),
/**
* 挂号调价
*/
REQUEST_CHANGE_PRICE(50, "50", "货品调价"),
/**
* 耗材盘点
*/
DEVICE_STOCKTAKING(51, "51", "耗材盘点");
private Integer value;
private String code;

13
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbChrgitmLv.java
View File

@@ -4,6 +4,7 @@
package com.openhis.common.enums.ybenums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import com.core.common.utils.StringUtils;
import com.openhis.common.enums.HisEnumInterface;
import lombok.AllArgsConstructor;
@@ -45,4 +46,16 @@ public enum YbChrgitmLv implements HisEnumInterface {
return null;
}
public static YbChrgitmLv getByCode(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (YbChrgitmLv val : values()) {
if (val.getCode().equals(code)) {
return val;
}
}
return null;
}
}

2
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbDspoWay.java
View File

@@ -8,7 +8,7 @@ import lombok.Getter;
/**
* 处理方式
*
* @author GuoRui
* @author Thanking
*/
@Getter
@AllArgsConstructor

2
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbMedinsLv.java
View File

@@ -8,7 +8,7 @@ import lombok.Getter;
/**
* 医疗机构等级
*
* @author GuoRui
* @author Thanking
*/
@Getter
@AllArgsConstructor

385
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbPayment.java
View File

@@ -4,6 +4,7 @@
package com.openhis.common.enums.ybenums;
import com.baomidou.mybatisplus.annotation.EnumValue;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -17,299 +18,297 @@ import lombok.Getter;
@AllArgsConstructor
public enum YbPayment {
YB_FUND_PAY( 100000 ,1,null,"基金支付总额"),
YB_FUND_PAY(100000, 1, null, "基金支付总额"),
SELF_PAY(200000,1,null,"个人负担总金额"),
SELF_PAY(200000, 1, null, "个人负担总金额"),
OTHER_PAY(300000,1,null,"其他（如医院负担金额）"),
OTHER_PAY(300000, 1, null, "其他（如医院负担金额）"),
/**
* 基本医保统筹基金支出
*/
YB_TC_FUND_AMOUNT(110000,2,YB_FUND_PAY,"基本医保统筹基金支出"),
YB_TC_FUND_AMOUNT(110000, 2, YB_FUND_PAY, "基本医保统筹基金支出"),
/**
* 补充医疗保险基金支出
*/
YB_BC_FUND_AMOUNT(120000,2,YB_FUND_PAY,"补充医疗保险基金支出"),
YB_BC_FUND_AMOUNT(120000, 2, YB_FUND_PAY, "补充医疗保险基金支出"),
/**
* 医疗救助基金支出
*/
YB_JZ_FUND_AMOUNT(130000,2,YB_FUND_PAY,"医疗救助基金支出"),
YB_JZ_FUND_AMOUNT(130000, 2, YB_FUND_PAY, "医疗救助基金支出"),
/**
* 其他支出
*/
YB_OTHER_AMOUNT(140000,2,YB_FUND_PAY,"其他支出"),
YB_OTHER_AMOUNT(140000, 2, YB_FUND_PAY, "其他支出"),
/**
* 职工基本医疗保险
*/
YB_TC_ZG_FUND_VALUE(110100,3,YB_TC_FUND_AMOUNT,"职工基本医疗保险"),
YB_TC_ZG_FUND_VALUE(110100, 3, YB_TC_FUND_AMOUNT, "职工基本医疗保险"),
/**
* 居民基本医疗保险
*/
YB_TC_JM_FUND_VALUE(110200,3,YB_TC_FUND_AMOUNT,"居民基本医疗保险"),
YB_TC_JM_FUND_VALUE(110200, 3, YB_TC_FUND_AMOUNT, "居民基本医疗保险"),
/**
* 全体参保人的居民大病保险
*/
YB_BC_JM_DB_VALUE(120100,3,YB_BC_FUND_AMOUNT,"全体参保人的居民大病保险"),
YB_BC_JM_DB_VALUE(120100, 3, YB_BC_FUND_AMOUNT, "全体参保人的居民大病保险"),
/**
* 大额医疗费用补助
*/
YB_BC_DE_BZ_VALUE(120200,3,YB_BC_FUND_AMOUNT,"大额医疗费用补助"),
YB_BC_DE_BZ_VALUE(120200, 3, YB_BC_FUND_AMOUNT, "大额医疗费用补助"),
/**
* 企业职工大额医疗费用补助
*/
YB_BC_ZG_DE_BZ_VALUE(120300,3,YB_BC_FUND_AMOUNT,"企业职工大额医疗费用补助"),
YB_BC_ZG_DE_BZ_VALUE(120300, 3, YB_BC_FUND_AMOUNT, "企业职工大额医疗费用补助"),
/**
* 公务员医疗补助
*/
YB_BC_GWY_BZ_VALUE(120400,3,YB_BC_FUND_AMOUNT,"公务员医疗补助"),
YB_BC_GWY_BZ_VALUE(120400, 3, YB_BC_FUND_AMOUNT, "公务员医疗补助"),
/**
* 伤残人员医疗保障基金支出
*/
YB_OTHER_SC_BZ_FUND_VALUE(130100,3,YB_OTHER_AMOUNT,"伤残人员医疗保障基金支出"),
YB_OTHER_SC_BZ_FUND_VALUE(130100, 3, YB_OTHER_AMOUNT, "伤残人员医疗保障基金支出"),
/**
*
*/
SELF_YB_ZH_PAY(210000,2,SELF_PAY,"个人医保账户支付"),
SELF_YB_ZH_PAY(210000, 2, SELF_PAY, "个人医保账户支付"),
/**
*
*/
SELF_YB_ZH_GJ_VALUE(210100,3,SELF_YB_ZH_PAY,"账户共济支付金额"),
SELF_YB_ZH_GJ_VALUE(210100, 3, SELF_YB_ZH_PAY, "账户共济支付金额"),
/**
*
*/
SELF_CASH_PAY(220000,2,SELF_PAY,"个人现金支付金额"),
SELF_CASH_PAY(220000, 2, SELF_PAY, "个人现金支付金额"),
/**
*
*/
SELF_VX_PAY(230000,2,SELF_PAY,"微信支付金额"),
SELF_VX_PAY(230000, 2, SELF_PAY, "微信支付金额"),
/**
*
*/
SELF_ALI_PAY(240000,2,SELF_PAY,"阿里支付金额"),
SELF_ALI_PAY(240000, 2, SELF_PAY, "阿里支付金额"),
/**
*
*/
SELF_CASH_VALUE(220400,3,SELF_CASH_PAY,"个人现金支付金额(现金)"),
DISCOUNT_PAY(220500, 2, OTHER_PAY, "优惠金额"),
/**
*
*/
SELF_CASH_VX_VALUE(220100,3,SELF_CASH_PAY,"个人现金支付金额(微信)"),
SELF_CASH_VALUE(220400, 3, SELF_CASH_PAY, "个人现金支付金额(现金)"),
/**
*
*/
SELF_CASH_ALI_VALUE(220200,3,SELF_CASH_PAY,"个人现金支付金额(支付宝)"),
SELF_CASH_VX_VALUE(220100, 3, SELF_CASH_PAY, "个人现金支付金额(微信)"),
/**
*
*/
SELF_CASH_UNION_VALUE(220300,3,SELF_CASH_PAY,"个人现金支付金额(银联)"),
SELF_CASH_ALI_VALUE(220200, 3, SELF_CASH_PAY, "个人现金支付金额(支付宝)"),
/**
*
*/
SELF_CASH_UNION_VALUE(220300, 3, SELF_CASH_PAY, "个人现金支付金额(银联)"),
/**
* 兜底基金支出
*/
OTHER_PAY_DD_FUND_VALUE(300001,2,OTHER_PAY,"兜底基金支出"),
OTHER_PAY_DD_FUND_VALUE(300001, 2, OTHER_PAY, "兜底基金支出"),
/**
* 意外伤害基金支出
*/
OTHER_PAY_YW_SH_FUND_VALUE(300002,2,OTHER_PAY,"意外伤害基金支出"),
OTHER_PAY_YW_SH_FUND_VALUE(300002, 2, OTHER_PAY, "意外伤害基金支出"),
/**
* 离休人员医疗保障金支出
*/
OTHER_PAY_LX_YL_FUND_VALUE(300003,2,OTHER_PAY,"离休人员医疗保障金支出"),
OTHER_PAY_LX_YL_FUND_VALUE(300003, 2, OTHER_PAY, "离休人员医疗保障金支出"),
/**
* 离休人员优惠金支出
*/
OTHER_PAY_LX_YH_FUND_VALUE(300004,2,OTHER_PAY,"离休人员优惠金支出"),
OTHER_PAY_LX_YH_FUND_VALUE(300004, 2, OTHER_PAY, "离休人员优惠金支出"),
/**
* 财政基金支出
*/
OTHER_PAY_CZ_FUND_VALUE(300005,2,OTHER_PAY,"财政基金支出"),
OTHER_PAY_CZ_FUND_VALUE(300005, 2, OTHER_PAY, "财政基金支出"),
/**
* 财政预支支出
*/
OTHER_PAY_CZ_YZ_FUND_VALUE(300006,2,OTHER_PAY,"财政预支支出"),
OTHER_PAY_CZ_YZ_FUND_VALUE(300006, 2, OTHER_PAY, "财政预支支出"),
/**
* 职工大病基金支出
*/
OTHER_PAY_ZG_DB_FUND_VALUE(300007,2,OTHER_PAY,"职工大病基金支出"),
OTHER_PAY_ZG_DB_FUND_VALUE(300007, 2, OTHER_PAY, "职工大病基金支出"),
/**
* 二乙基金支出
*/
OTHER_PAY_EY_FUND_VALUE(300008,2,OTHER_PAY,"二乙基金支出"),
OTHER_PAY_EY_FUND_VALUE(300008, 2, OTHER_PAY, "二乙基金支出"),
/**
* 倾斜救助支出
*/
OTHER_PAY_QX_JZ_FUND_VALUE(300009,2,OTHER_PAY,"倾斜救助支出"),
OTHER_PAY_QX_JZ_FUND_VALUE(300009, 2, OTHER_PAY, "倾斜救助支出"),
/**
* 医疗救助再救助基金
*/
OTHER_PAY_YL_JZ_FUND_VALUE(300010,2,OTHER_PAY,"医疗救助再救助基金"),
OTHER_PAY_YL_JZ_FUND_VALUE(300010, 2, OTHER_PAY, "医疗救助再救助基金"),
/**
* 医院负担金额
*/
HOSP_PART_AMT(300011,2,OTHER_PAY,"医院负担金额"),
HOSP_PART_AMT(300011, 2, OTHER_PAY, "医院负担金额"),
// 医保结算返回值记录枚举
FULAMT_OWNPAY_AMT(1, 2, null, "全自费金额"),
// PSN_PART_AMT(2,2,null,"个人负担总金额"),
OVERLMT_SELFPAY(3, 2, null, "超限价自费费用"), PRESELFPAY_AMT(4, 2, null, "先行自付金额"), INSCP_SCP_AMT(5, 2, null, "符合政策范围金额"),
ACT_PAY_DEDC(6, 2, null, "实际支付起付线"), POOL_PROP_SELFPAY(7, 2, null, "基本医疗保险统筹基金支付比例"), BALC(8, 2, null, "余额"),
//医保结算返回值记录枚举
FULAMT_OWNPAY_AMT(1,2,null,"全自费金额"),
//PSN_PART_AMT(2,2,null,"个人负担总金额"),
OVERLMT_SELFPAY(3,2,null,"超限价自费费用"),
PRESELFPAY_AMT(4,2,null,"先行自付金额"),
INSCP_SCP_AMT(5,2,null,"符合政策范围金额"),
ACT_PAY_DEDC(6,2,null,"实际支付起付线"),
POOL_PROP_SELFPAY(7,2,null,"基本医疗保险统筹基金支付比例"),
BALC(8,2,null,"余额"),
// 基金类型，下述仅作记录
BIRTH_FUND(510100, 2, YB_FUND_PAY, "生育基金"), RETIREE_MEDICAL(340100, 2, YB_FUND_PAY, "离休人员医疗保障基金"),
URBAN_BASIC_MEDICAL(390100, 2, YB_FUND_PAY, "城乡居民基本医疗保险基金"),
URBAN_SERIOUS_ILLNESS(390200, 2, YB_FUND_PAY, "城乡居民大病医疗保险基金"), MEDICAL_ASSISTANCE(610100, 2, YB_FUND_PAY, "医疗救助基金"),
GOVERNMENT_SUBSIDY(640100, 2, YB_FUND_PAY, "政府兜底基金"), ACCIDENT_INSURANCE(390400, 2, YB_FUND_PAY, "意外伤害基金"),
CARE_INSURANCE(620100, 2, YB_FUND_PAY, "照护保险基金"), FINANCIAL_FUND(360100, 2, YB_FUND_PAY, "财政基金"),
HOSPITAL_ADVANCE(999900, 2, YB_FUND_PAY, "医院垫付"), SUPPLEMENTARY_INSURANCE(390300, 2, YB_FUND_PAY, "城乡居民大病补充保险基金"),
BASIC_MEDICAL_INSURANCE_FOR_URBAN_EMPLOYEES(310201, 2, YB_FUND_PAY, "城镇职工基本医疗保险个人账户基金"),
E_WALLET(999981, 2, YB_FUND_PAY, "电子钱包"), HEALTHCARE_PREPAYMENT(360300, 2, YB_FUND_PAY, "保健预支基金"),
// 师大中银支付
BPC_PAY(500000, 2, SELF_PAY, "BPC支付"),
// 师大专属
SCHOOL_GF_PAY(400000, 1, null, "学校垫支");
//基金类型，下述仅作记录
BIRTH_FUND(510100,2,YB_FUND_PAY, "生育基金"),
RETIREE_MEDICAL(340100,2,YB_FUND_PAY, "离休人员医疗保障基金"),
URBAN_BASIC_MEDICAL(390100,2,YB_FUND_PAY, "城乡居民基本医疗保险基金"),
URBAN_SERIOUS_ILLNESS(390200,2,YB_FUND_PAY, "城乡居民大病医疗保险基金"),
MEDICAL_ASSISTANCE(610100,2,YB_FUND_PAY, "医疗救助基金"),
GOVERNMENT_SUBSIDY(640100,2,YB_FUND_PAY, "政府兜底基金"),
ACCIDENT_INSURANCE(390400,2,YB_FUND_PAY, "意外伤害基金"),
CARE_INSURANCE(620100,2,YB_FUND_PAY, "照护保险基金"),
FINANCIAL_FUND(360100, 2,YB_FUND_PAY,"财政基金"),
HOSPITAL_ADVANCE(999900,2,YB_FUND_PAY, "医院垫付"),
SUPPLEMENTARY_INSURANCE(390300,2,YB_FUND_PAY, "城乡居民大病补充保险基金"),
BASIC_MEDICAL_INSURANCE_FOR_URBAN_EMPLOYEES(310201,2,YB_FUND_PAY, "城镇职工基本医疗保险个人账户基金"),
E_WALLET(9999981,2,YB_FUND_PAY, "电子钱包"),
HEALTHCARE_PREPAYMENT(360300, 2,YB_FUND_PAY,"保健预支基金");
//
//
// /**
// * 现金支付
// */
// 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, "财政兜底基金支出");
//
//
// /**
// * 现金支付
// */
// 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;

2
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbTrigScen.java
View File

@@ -8,7 +8,7 @@ import lombok.Getter;
/**
* 触发场景
*
* @author GuoRui
* @author Thanking
*/
@Getter
@AllArgsConstructor

2
openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ybenums/YbWarnType.java
View File

@@ -8,7 +8,7 @@ import lombok.Getter;
/**
* 反馈类型
*
* @author GuoRui
* @author Thanking
*/
@Getter
@AllArgsConstructor