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

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:31:06 +08:00
parent cbd3e7f981
commit 79ea4ed4f7
148 changed files with 6722 additions and 10861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
/**
* 常量
*
*
* @author system
*/
public class CommonConstants {
@@ -13,6 +13,7 @@ public class CommonConstants {
* 共同常量
*/
public interface Common {
/**
* 租户ID字段名称
*/
@@ -301,14 +302,11 @@ public class CommonConstants {
* 项目分类
*/
String MedCategoryCode = "med_category_code";
<<<<<<< HEAD
=======
/**
* 耗材分类
*/
String DevCategoryCode = "dev_category_code";
>>>>>>> v1.3
/**
* 门诊号
@@ -350,11 +348,7 @@ public class CommonConstants {
String ChargeTime = "charge_time";
/**
<<<<<<< HEAD
* 审批时间
=======
* 申请人
>>>>>>> v1.3
*/
String ApplicantName = "applicant_name";
@@ -374,14 +368,11 @@ public class CommonConstants {
String ItemId = "item_id";
/**
<<<<<<< HEAD
=======
* 项目编号
*/
String ItemNo = "item_no";
/**
>>>>>>> v1.3
* 项目所在表
*/
String ItemTable = "item_table";
@@ -400,18 +391,12 @@ public class CommonConstants {
* 校对人Id
*/
String PerformerCheckId = "performer_check_id";
<<<<<<< HEAD
=======
>>>>>>> v1.3
/**
* 单位
*/
String UnitCode = "unit_code";
/**
<<<<<<< HEAD
=======
* 用法
*/
String MethodCode = "method_code";
@@ -422,7 +407,6 @@ public class CommonConstants {
String RateCode = "rate_code";
/**
>>>>>>> v1.3
* 住院开始时间
*/
String StartTime = "start_time";
@@ -446,8 +430,6 @@ public class CommonConstants {
* 过期天数
*/
String RemainingDays = "remaining_days";
<<<<<<< HEAD
=======
/**
* 追溯码
@@ -468,7 +450,6 @@ public class CommonConstants {
* 入科科室ID
*/
String InHospitalOrgId = "in_hospital_org_id";
>>>>>>> v1.3
}
/**
@@ -542,6 +523,7 @@ public class CommonConstants {
* 字典名常量
*/
public interface DictName {
/**
* 药品分类
*/
@@ -561,6 +543,7 @@ public class CommonConstants {
* sql条件常量
*/
public interface SqlCondition {
/**
* 关于库存的表名str
*/
@@ -630,6 +613,7 @@ public class CommonConstants {
* excel导出常量
*/
public interface ExcelOut {
// "0"的
String CONSTANTZERO = "0";
// 0.00
@@ -655,6 +639,7 @@ public class CommonConstants {
* excel导出的sheet名称
*/
public interface SheetName {
/**
* 发药明细
*/
@@ -733,6 +718,7 @@ public class CommonConstants {
* 导出时需要隐藏的列
*/
public interface CellName {
/**
* 源仓库
*/
@@ -748,6 +734,7 @@ public class CommonConstants {
* 工具方法常量
*/
public interface UtilMethodConstant {
/**
* 是否四舍五入(与余数作比较)的临界值 例：0.86 -> 0.85 0.88 -> 0.90
*/
@@ -758,6 +745,7 @@ public class CommonConstants {
* 数字常量
*/
public interface NumConstant {
/**
* 数字 1
*/
@@ -769,6 +757,7 @@ public class CommonConstants {
* 发药明细-统计类型
*/
public interface StatisticalType {
/**
* 住院耗材记账领用明细
*/

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

@@ -18,132 +18,106 @@ public enum AssignSeqEnum {
* 患者编号
*/
PATIENT_NUM("1", "患者编号", "PN"),
/**
* 采购单据号
*/
PURCHASE_NUM("2", "采购单据号", "PUR"),
/**
* 就诊编号
*/
ENCOUNTER_NUM("3", "就诊编号", "EN"),
/**
* 药品请求编码
*/
MEDICATION_RES_NO("5", "药品请求编码", "MR"),
/**
* 耗材请求编码
*/
DEVICE_RES_NO("6", "耗材请求编码", "DR"),
/**
* 服务项目请求编码
*/
SERVICE_RES_NO("7", "服务项目请求编码", "SR"),
/**
* 费用项目编码
*/
CHARGE_ITEM_NO("8", "费用项目编码", "CI"),
/**
* 药品项目编码
*/
MEDICATION_NUM("9", "药品项目编码", "MD"),
/**
* 器材项目编码
*/
DEVICE_NUM("10", "项目编码", "DD"),
/**
* 支付编码
*/
PAYMENT_NO("11", "支付编码", "SF"),
/**
* 诊疗项目编码
*/
ACTIVITY_DEFINITION_NUM("11", "诊疗编码", "AC"),
/**
* 诊断定义编码
*/
CONDITION_DEFINITION_NUM("11", "诊断编码", "CD"),
/**
* 科室业务编码
*/
ORGANIZATION_BUS_NO("14", "科室业务编码", "ORG"),
/**
* 位置业务编码
*/
LOCATION_BUS_NO("15", "科室业务编码", "LOC"),
/**
* 厂商/产地单据号
*/
SUPPLIER_BUS_NO("16", "供应商编号", "SUP"),
/**
* 盘点单据号
*/
STOCKTAKING_NUM("17", "盘点单据号", "STO"),
/**
* 报损单单据号
*/
LOSS_BUS_NO("18", "报损单编号", "LOS"),
/**
* 采购退货单据号
*/
RETURN_BUS_NO("17", "退货编号", "RET"),
/**
* 领用出库单据号
*/
REQUISITION_NUM("19", "领用出库单据号", "REQ"),
/**
* 退货出库单据号
*/
RETURN_ISSUE_NUM("20", "退货出库单据号", "RIS"),
/**
* 处方号-通用药物
*/
PRESCRIPTION_COMMON_NO("21", "处方号-通用药物", "PCN"),
/**
* 处方号-麻醉药品
*/
PRESCRIPTION_NARCOTIC_NO("22", "处方号-麻醉药品", "PNN"),
/**
* 处方号-毒性药品
*/
PRESCRIPTION_TOXIC_NO("23", "处方号", "PTN"),
/**
* 处方号-一类精神药
*/
PRESCRIPTION_A_PSYCHOTROPIC_NO("24", "处方号", "PAN"),
/**
* 处方号-二类精神药
*/
PRESCRIPTION_B_PSYCHOTROPIC_NO("25", "处方号", "PBN"),
/**
* 住院编号
*/
ADMISSION_NUM("26", "住院号", "ZY"),
/**
* 调拨单据号
*/
@@ -152,77 +126,62 @@ public enum AssignSeqEnum {
* 发票单据号
*/
INVOICE_NUM("28", "发票单据号", "INV"),
/**
* 药品发放编码
*/
MEDICATION_DIS_NO("29", "药品发放编码", "MS"),
/**
* 耗材发放编码
*/
DEVICE_DIS_NO("30", "耗材发放编码", "DS"),
/**
* 医院内部处方编号
*/
ELEP_MEDICATION_NO("31", "医院内部处方编号", "ER"),
/**
* 医保收费批号
*/
YB_CLINIC_ORDER("32", "医保订单编号", "YBORD"),
/**
* 医保收费批号
*/
YB_CLINIC_FEE("34", "费用明细流水号", "F"),
/**
* 自费收费批号
*/
SF_CLINIC_ORDER("33", "自费订单编号", "SFORD"),
/**
* 处方号-中草药
*/
PRESCRIPTION_CHINESE_HERBAL_MEDICINE("34", "处方号-中草药", "PCM"),
/**
* 身体部位编码
*/
BODY_STRUCTURE_NO("35", "身体部位编码", "BS"),
/**
* 订货单单号
*/
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"),
/**
* 药房盘点单单号
*/
@@ -231,145 +190,114 @@ public enum AssignSeqEnum {
* 药房调入单单号
*/
PURCHASE_TRANSFERIN("43", "药房调入单", "PTI"),
/**
* 药房调出单单号
*/
PURCHASE_TRANSFEROUT("44", "药房调出单", "PTU"),
/**
* 医嘱签发编码
*/
ADVICE_SIGN("45", "医嘱签发编码", "ASI"),
/**
* 物资订货单
*/
MATERIAL_PURCHASE("46", "物资订货单", "MPU"),
/**
* 物资进货单
*/
MATERIAL_STOCKIN("47", "物资进货单", "MSI"),
/**
* 物资退货单
*/
MATERIAL_RETURN("48", "物资退货单", "MRE"),
/**
* 物资出库单
*/
MATERIAL_STOCKOUT("49", "物资出库单", "MSO"),
/**
* 物资退库单
*/
MATERIAL_PRODUCT_RETURN("50", "物资退库单", "MPR"),
/**
* 物资损益单
*/
MATERIAL_PRPFITLOSS("51", "物资损益单", "MPP"),
/**
* 物资盘点单
*/
MATERIAL_STOCKTAKING("52", "物资盘点单", "MST"),
/**
* 物资调入单
*/
MATERIAL_TRANSFERIN("53", "物资调入单", "MTI"),
/**
* 物资调出单
*/
MATERIAL_TRANSFEROUT("54", "物资调出单", "MTO"),
/**
* 科室请领单单号
*/
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 病历文书
*/
PURCHASE_DOCUMENT("63", "病历文书", "DOC"),
/**
* 调价单
*/
CHANGE_PRICE_BUZ("64", "调整零售价", "CPB"),
/**
* 药品汇总单号
*/
MEDICINE_SUMMARY_NO("65", "药品汇总单号", "MSY"),
/**
* 公费医疗自付比例调整申请编号
*/
GF_RATIO_APPLICATION("66", "公费医疗自付比例调整申请编号", "GRA"),
/**
* 参与者编码
*/
PRACTITIONER_NO("67", "参与者编码", "PER"),
/**
* 号源编码
*/
HEALTHCARE_SERVICE_NO("68", "号源编码", "HS"),
/**
* 耗材汇总单号
*/
<<<<<<< HEAD
DEVICE_SUMMARY_NO("69", "耗材汇总单号", "DSN");
=======
DEVICE_SUMMARY_NO("69", "耗材汇总单号", "DSN"),
/**
* 自动备份单据号
*/
AUTO_BACKUP_NO("70", "自动备份单据号", "ABU");
>>>>>>> v1.3
private final String code;
private final String info;
@@ -380,4 +308,4 @@ public enum AssignSeqEnum {
this.info = info;
this.prefix = prefix;
}
}
}

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

@@ -20,15 +20,10 @@ public enum SupplyCategory implements HisEnumInterface {
* 库存供应
*/
STOCK_SUPPLY(1, "1", "库存供应"),
/**
* 非库存供应
*/
<<<<<<< HEAD
NON_STOCK(2, "2", "非库存供应"),
=======
NON_STOCK(2, "2", "非库存供应");
>>>>>>> v1.3
// /**
// * 普通
@@ -65,17 +60,6 @@ public enum SupplyCategory implements HisEnumInterface {
// /**
// * 院内出库
// */
<<<<<<< HEAD
IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
// /**
// * 院外出库
// */
OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"),
// /**
// * 其他出库
// */
OTHER_OUTBOUND(13, "13","2.其他出库");
=======
// IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"),
// /**
// * 院外出库
@@ -85,7 +69,6 @@ public enum SupplyCategory implements HisEnumInterface {
// * 其他出库
// */
// OTHER_OUTBOUND(13, "13","2.其他出库"),
>>>>>>> v1.3
// /**
// * 普通损益
// */
@@ -154,7 +137,6 @@ public enum SupplyCategory implements HisEnumInterface {
// * 调价分类 挂号
// */
// REQUEST_CATEGORY_CHANGE_PRICE_HEALTH(27, "27","挂号调价单");
private Integer value;
private String code;
private String info;

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

@@ -18,28 +18,18 @@ import lombok.Getter;
@AllArgsConstructor
public enum YbPayment {
<<<<<<< HEAD
YB_FUND_PAY(100000, 1, null, "基金支付总额"),
SELF_PAY(200000, 1, null, "个人负担总金额"),
=======
/**
* 医保报销的费用总额，医保支付时存在，等于各种补贴报销的总和
*/
YB_FUND_PAY(100000, 1, null, "基金支付总额"),
/**
* 个人支付，医保定义的名词，实际使用时医保和自费都用，医保时就是结算接口返回的字段，自费时等于全部费用项总和
*/
SELF_PAY(200000, 1, null, "个人负担总金额"),
/**
* 医保定义名词，其他（如医院负担金额）；实际使用时与下面某一枚举重复使用 OTH_PAY 重复，使用该枚举，不使用OTH_PAY
*/
>>>>>>> v1.3
OTHER_PAY(300000, 1, null, "其他（如医院负担金额）"),
/**
* 基本医保统筹基金支出
*/
@@ -168,9 +158,6 @@ public enum YbPayment {
* 医院负担金额
*/
HOSP_PART_AMT(300011, 2, OTHER_PAY, "医院负担金额"),
<<<<<<< HEAD
=======
// 医保结算返回值记录枚举
FULAMT_OWNPAY_AMT(1, 2, null, "全自费金额"),
// PSN_PART_AMT(2,2,null,"个人负担总金额"),
@@ -180,33 +167,20 @@ public enum YbPayment {
ACT_PAY_DEDC(6, 2, null, "实际支付起付线"),
POOL_PROP_SELFPAY(7, 2, null, "基本医疗保险统筹基金支付比例"),
BALC(8, 2, null, "余额"),
HIFMI_PAY(9,2, null, "居民大病保险资金支出"),
HIFP_PAY(10,2, null, "居民大病保险资金支出"),//重复，误用
CVLSERV_PAY(11,2, null, "公务员医疗补助资金支出"),//重复，误用
HIFES_PAY(12,2, null, "企业补充医疗保险基金支出"),
HIFOB_PAY(13,2, null, "职工大额医疗费用补助基金支出"),
MAF_PAY(14,2, null, "医疗救助基金支出"),
OTH_PAY(15,2, null, "其他支出"),//重复，误用
ACCT_MULAID_PAY(16,2, null, "个人账户共济支付金额"),
>>>>>>> v1.3
HIFMI_PAY(9, 2, null, "居民大病保险资金支出"),
HIFP_PAY(10, 2, null, "居民大病保险资金支出"),//重复，误用
CVLSERV_PAY(11, 2, null, "公务员医疗补助资金支出"),//重复，误用
HIFES_PAY(12, 2, null, "企业补充医疗保险基金支出"),
HIFOB_PAY(13, 2, null, "职工大额医疗费用补助基金支出"),
MAF_PAY(14, 2, null, "医疗救助基金支出"),
OTH_PAY(15, 2, null, "其他支出"),//重复，误用
ACCT_MULAID_PAY(16, 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, "余额"),
// 基金类型，下述仅作记录
<<<<<<< HEAD
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, "保健预支基金"),
=======
BIRTH_FUND(510100, 2, YB_FUND_PAY, "生育基金"),
RETIREE_MEDICAL(340100, 2, YB_FUND_PAY, "离休人员医疗保障基金"),
URBAN_BASIC_MEDICAL(390100, 2, YB_FUND_PAY, "城乡居民基本医疗保险基金"),
@@ -221,8 +195,6 @@ public enum YbPayment {
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, "保健预支基金"),
>>>>>>> v1.3
// 师大中银支付
BPC_PAY(500000, 2, SELF_PAY, "BPC支付"),
// 师大专属