2025-12-24 发版,具体内容见发版日志

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

@@ -426,7 +426,6 @@ public class CommonConstants {
          */
         String RemainingDays = "remaining_days";
 
-
         /**
          * 追溯码
          */
@@ -436,6 +435,16 @@ public class CommonConstants {
          * encounter状态
          */
         String StatusEnum = "status_enum";
+
+        /**
+         * 诊室ID
+         */
+        String OrgId = "org_id";
+
+        /**
+         * 入科科室ID
+         */
+        String InHospitalOrgId = "in_hospital_org_id";
     }
 
     /**
@@ -679,6 +688,20 @@ public class CommonConstants {
          * 库存审批详情
          */
         String INVENTORY_APPROVAL_DETAILS = "库存审批详情";
+        /**
+         * 领用出库单
+         */
+        String REQUISITION_DELIVERY_FORM = "领用出库单";
+
+        /**
+         * 费用明细
+         */
+        String COST_DETAILS = "费用明细";
+
+        /**
+         * 采购入库单
+         */
+        String PURCHASE_RECEIPT_ORDER = "采购入库单";
 
     }
 
@@ -718,4 +741,18 @@ public class CommonConstants {
 
     }
 
+    /**
+     * 发药明细-统计类型
+     */
+    public interface StatisticalType {
+        /**
+         * 住院耗材记账领用明细
+         */
+        Integer DETAIL_DEVICE_TYPE = 5;
+        /**
+         * 住院耗材记账领用流水账
+         */
+        Integer ACCOUNT_DEVICE_TYPE = 6;
+    }
+
 }

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java

@@ -22,4 +22,13 @@ public enum DocDefinitionEnum{
     private final String value;
     private final String code;
     private final String info;
+
+    public static String getInfoByValue(String value){
+        for(DocDefinitionEnum definition : DocDefinitionEnum.values()){
+            if(definition.getValue().equals(value)){
+                return definition.getInfo();
+            }
+        }
+        return "";
+    }
 }

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/TemperatureChartEnum.java

@@ -12,18 +12,25 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum TemperatureChartEnum {
+    TEMPERATURE_CHINESE("00301","","体温拒测等汉字"),
     BREATH("001", "breathe", "呼吸"),
     PULSE("002", "pulse", "脉搏"),
     TEMPERATURE("003", "temperature", "体温"),
     BLOOD_PRESSURE("008", "bloodPressure", "血压"),
     PAIN_SCORE("016", "painScore", "疼痛等级"),
     POSTOP_DAYS("031", "", "术后天数"),
-    HEIGHT("","height","身高"),
-    WEIGHT("","weight","体重"),
+    HEIGHT("030","height","身高"),
+    WEIGHT("009","weight","体重"),
     OUTPUT("","output","出量"),
-    INPUT("","input","入量"),
+    INPUT("006","input","入量"),
+    BOWEL_MOVEMENT_FREQUENCY("005","input","大便次数"),
+    URINATION_FREQUENCY("004","input","小便次数"),
+    URINE_VOLUME("011","input","尿量"),
+    OTHERS("007","input","其他"),
     HEART_RATE("","heartRate","心率"),
     TIME_POINT("","timePoint","时间点"),
+    OPERATION("9502", "", "手术"),
+    TRANSFER_DEPARTMENT("9506", "", "转科"),
     WARD_ADMISSION("9500", "", "入科");
 
     private final String code;

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

@@ -18,10 +18,19 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum YbPayment {
 
+    /**
+     * 医保报销的费用总额，医保支付时存在，等于各种补贴报销的总和
+     */
     YB_FUND_PAY(100000, 1, null, "基金支付总额"),
 
+    /**
+     * 个人支付，医保定义的名词，实际使用时医保和自费都用，医保时就是结算接口返回的字段，自费时等于全部费用项总和
+     */
     SELF_PAY(200000, 1, null, "个人负担总金额"),
 
+    /**
+     * 医保定义名词，其他（如医院负担金额）；实际使用时与下面某一枚举重复使用 OTH_PAY 重复，使用该枚举，不使用OTH_PAY
+     */
     OTHER_PAY(300000, 1, null, "其他（如医院负担金额）"),
 
     /**
@@ -162,6 +171,15 @@ 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, "个人账户共济支付金额"),
+
 
     // 基金类型，下述仅作记录
     BIRTH_FUND(510100, 2, YB_FUND_PAY, "生育基金"),

openhis-server-new/openhis-common/src/main/java/com/openhis/common/utils/HisQueryUtils.java

@@ -101,6 +101,15 @@ public class HisQueryUtils {
         return queryWrapper;
     }
 
+    // 新增SQL转义方法，防止注入风险
+    private static String escapeSql(String value) {
+        if (value == null) {
+            return "";
+        }
+        // 转义单引号（PostgreSQL中用两个单引号表示一个单引号）
+        return value.replace("'", "''");
+    }
+
     /**
      * 检查时间字符串是否符合指定格式
      *