提交merge1.3

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/ChargeItemDefInfo.java

@@ -61,4 +61,10 @@ public class ChargeItemDefInfo extends ChargeItem {
 
     /** 基础价格 */
     private BigDecimal price;
+
+    /** 基础价格 */
+    private BigDecimal manualAdjustedPrice;
+
+    /** 基础价格 */
+    private BigDecimal systemDiscountPrice;
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java

@@ -0,0 +1,145 @@
+package com.openhis.administration.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.core.common.annotation.Excel;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 费用明细Dto
+ *
+ * @author swb
+ * @date 2025-12-16
+ */
+@Data
+@Accessors(chain = true)
+public class CostDetailDto {
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称", sort = 2)
+    private String chargeName;
+
+    /**
+     * 费用类型
+     */
+    private Integer chargeItemEnum;
+    @Excel(name = "费用类型", sort = 3)
+    private String chargeItemEnum_enumText;
+
+    /**
+     * 单价
+     */
+    @Excel(name = "单价", sort = 4, scale = 2)
+    private BigDecimal unitPrice;
+
+    /**
+     * 数量
+     */
+    @Excel(name = "数量", sort = 5, scale = 0)
+    private BigDecimal quantityValue;
+
+    /**
+     * 金额
+     */
+    @Excel(name = "金额", sort = 6, scale = 2)
+    private BigDecimal totalPrice;
+
+    /**
+     * 执行科室
+     */
+    private Long orgId;
+    @Excel(name = "执行科室", sort = 7)
+    private String orgName;
+
+    /**
+     * 执行人
+     */
+    @Excel(name = "执行人", sort = 8)
+    private String practitioner;
+
+    /**
+     * 执行日期
+     */
+    @Excel(name = "执行日期", sort = 9, dateFormat = "yyyy-MM-dd")
+    private Date recordedTime;
+
+    /**
+     * 医保类型
+     */
+    private Integer chrgitmLv;
+    @Excel(name = "医保类型", sort = 10)
+    private String chrgitmLv_enumText;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", sort = 11)
+    private String remark;
+
+    /**
+     * 住院患者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterId;
+
+    /**
+     * 患者id
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long patientId;
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 生日
+     */
+    private Date birthDate;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 性别
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 诊断
+     */
+    private String conditionNames;
+    /**
+     * 住院医生
+     */
+    private String admittingDoctorName;
+
+    /**
+     * 余额
+     */
+    private BigDecimal balanceAmount;
+
+    /**
+     * 住院号
+     */
+    private String BusNo;
+
+    /**
+     * 床位名称
+     */
+    private String bedName;
+
+    /**
+     * 费别
+     */
+    private String contractName;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java

@@ -0,0 +1,36 @@
+package com.openhis.administration.dto;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 费用明细查询条件
+ * 
+ * @author swb
+ * @date 2025-12-15
+ */
+@Data
+@Accessors(chain = true)
+public class CostDetailSearchParam {
+    /**
+     * 就诊ID列表
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private List<Long> encounterIds;
+
+    /**
+     * 科室ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    /**
+     * 费用类型ID
+     */
+    private String chargeItemEnum;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java

@@ -0,0 +1,47 @@
+package com.openhis.administration.dto;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 药品追溯患者信息Dto
+ *
+ * @author swb
+ * @date 2025-12-15
+ */
+@Data
+@Accessors(chain = true)
+public class TracePatientInfoDto {
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private Integer genderEnum;
+    private String genderEnum_enumText;
+
+    /**
+     * 生日
+     */
+    private Date birthDate;
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 挂号时间
+     */
+
+    private Date registerTime;
+}