feat: 合并 upstream/v1.3 新增功能模块（安全合并策略）

新增功能模块：
- 药房管理：住院退药、处方审核功能
- 报表管理：门诊管理报表、药房结算报表、医嘱统计报表
- 支付管理：三方对账功能
- 新增枚举类：电子处方类型、频次类型、病历状态等10个
- 新增实体类：处方审核记录、第三方支付请求、中医结算目录
- 工具类增强：年龄计算、Excel工具

合并策略：仅合并低风险新增文件，保留现有业务功能
上游版本：v1.3 (2025-03-06发版)
合并分支：merge-upstream-v1.3-0310

🤖 Auto-generated by Claude Code

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareDto.java

@@ -0,0 +1,18 @@
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ThreePartCompareDto {
+    /**
+     * 待比较的付款单
+     */
+    private List<ThreePartComparePaymentDto> payments;
+
+    /**
+     * 待比较的付款请求
+     */
+    private List<ThreePartCompareRequestDto> paymentRequests;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartComparePaymentDto.java

@@ -0,0 +1,29 @@
+package com.openhis.web.paymentmanage.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+@Data
+public class ThreePartComparePaymentDto {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long paymentId;// 支付单id
+
+    private String paymentNo;// 支付单号
+
+    private String patientName;// 患者名称
+
+    private BigDecimal tenderedAmount;// 应收
+
+    private BigDecimal paidAmount;// 实收
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date billDate;// 支付时间
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareRequestDto.java

@@ -0,0 +1,17 @@
+package com.openhis.web.paymentmanage.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ThreePartCompareRequestDto {
+
+    private Long requestId;// 请求ID
+
+    private String paymentId;//paymentId
+
+    private BigDecimal amount;//请求金额
+
+    private String requestType;//退or付款
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ThreePartPayMapper.java

@@ -0,0 +1,28 @@
+package com.openhis.web.paymentmanage.mapper;
+
+import com.openhis.web.paymentmanage.dto.ThreePartComparePaymentDto;
+import com.openhis.web.paymentmanage.dto.ThreePartCompareRequestDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public interface ThreePartPayMapper {
+    /**
+     * 获取支付数据
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<ThreePartComparePaymentDto> getThreePartComparePaymentDtoList(@Param("startTime") String startTime,@Param("endTime") String endTime);
+
+    /**
+     * 获取第三方支付请求数据
+     * @param paymentIds
+     * @return
+     */
+    List<ThreePartCompareRequestDto> getThreePartCompareRequestDtoList(@Param("paymentIds")List<Long> paymentIds);
+}