feat: 合并 upstream/v1.3 新增功能模块(安全合并策略)
新增功能模块:
- 药房管理:住院退药、处方审核功能
- 报表管理:门诊管理报表、药房结算报表、医嘱统计报表
- 支付管理:三方对账功能
- 新增枚举类:电子处方类型、频次类型、病历状态等10个
- 新增实体类:处方审核记录、第三方支付请求、中医结算目录
- 工具类增强:年龄计算、Excel工具
合并策略:仅合并低风险新增文件,保留现有业务功能
上游版本:v1.3 (2025-03-06发版)
合并分支:merge-upstream-v1.3-0310
🤖 Auto-generated by Claude Code
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.openhis.web.paymentmanage.mapper.ThreePartPayMapper">
|
||||
|
||||
<select id="getThreePartComparePaymentDtoList"
|
||||
resultType="com.openhis.web.paymentmanage.dto.ThreePartComparePaymentDto">
|
||||
SELECT
|
||||
fin.ID AS payment_id,
|
||||
fin.payment_no AS payment_no,
|
||||
fin.tendered_amount AS tendered_amount,
|
||||
del.amount AS paid_amount,
|
||||
fin.bill_date AS bill_date,
|
||||
pat."name" AS patient_name
|
||||
FROM
|
||||
fin_payment_reconciliation fin
|
||||
LEFT JOIN fin_payment_rec_detail del ON fin."id" = del.reconciliation_id
|
||||
AND del.pay_enum = 500000
|
||||
LEFT JOIN adm_patient pat ON fin.patient_id = pat."id"
|
||||
WHERE
|
||||
fin.delete_flag = '0' AND fin.status_enum != 0 AND
|
||||
fin.bill_date BETWEEN
|
||||
to_timestamp(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')::timestamptz
|
||||
AND
|
||||
to_timestamp(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')::timestamptz
|
||||
|
||||
</select>
|
||||
<select id="getThreePartCompareRequestDtoList"
|
||||
resultType="com.openhis.web.paymentmanage.dto.ThreePartCompareRequestDto">
|
||||
SELECT
|
||||
req.ID AS request_id,
|
||||
req.payment_id,
|
||||
req.amount,
|
||||
req.request_type
|
||||
FROM
|
||||
fin_three_part_pay_request req
|
||||
LEFT JOIN fin_payment_reconciliation fin ON fin."id" = req.payment_id
|
||||
WHERE
|
||||
req.payment_id IN
|
||||
<foreach item="paymentId" collection="paymentIds" separator="," close=")" open="(" index="">
|
||||
#{paymentId}
|
||||
</foreach>
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user