后端最新版本同步

This commit is contained in:
Zhang.WH
2025-09-25 10:43:25 +08:00
parent 1276dc4adb
commit c8014404f1
355 changed files with 10070 additions and 5578 deletions

View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.yb.mapper.MedicalInsuranceMapper">
<select id="get3201Param" resultType="com.openhis.web.ybmanage.vo.Settlement3201VO">
<select id="get3201Param" resultType="com.openhis.yb.dto.Settlement3201Dto">
SELECT sum(T1.tendered_amount) AS med_fee_sum_amt,
sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END) AS fund_pay_sum_amt,
sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_Pay,
@@ -21,7 +21,7 @@
AND T1.tenant_id = #{tenantId}
GROUP BY t1.id
</select>
<select id="get3202Param" resultType="com.openhis.web.ybmanage.vo.Settlement3202VO">
<select id="get3202Param" resultType="com.openhis.yb.dto.Settlement3202Dto">
SELECT sum(T1.tendered_amount) AS med_fee_sum_amt,
sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END) AS fund_pay_sum_amt,
sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
@@ -43,7 +43,7 @@
AND T1.tenant_id = #{tenantId}
GROUP BY t1.id
</select>
<select id="get3203Param" resultType="com.openhis.web.ybmanage.vo.Financial3203VO">
<select id="get3203Param" resultType="com.openhis.yb.dto.Financial3203Dto">
SELECT sum(T1.tendered_amount) AS med_fee_sum_amt,
sum(case when T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END) AS fund_pay_sum_amt,
sum(case when T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
@@ -68,7 +68,7 @@
GROUP BY t1.id
</select>
<select id="get3201ParamList" resultType="com.openhis.web.ybmanage.vo.Settlement3201DetailVO">
<select id="get3201ParamList" resultType="com.openhis.yb.dto.Settlement3201DetailDto">
SELECT
T2.insutype,
T4.clr_optins,
@@ -122,7 +122,8 @@
t1.result_enum,
t2.contract_no,
t5.insutype,
t5.med_type
t5.med_type,
t7.medfee_sumamt
FROM
fin_payment_rec_detail t1
LEFT JOIN adm_account t2 on t1.account_id = t2.id
@@ -130,6 +131,7 @@
LEFT JOIN adm_encounter t4 on t2.encounter_id = t4.id
LEFT JOIN yb_clinc_reg t5 on t4.bus_no = t5.ipt_otp_no AND t4.delete_flag = '0'
LEFT JOIN fin_payment_reconciliation t6 on t6.id = t1.reconciliation_id AND t6.delete_flag = '0'
LEFT JOIN yb_clinc_settle t7 on t1.pay_trans_text = t7.setl_id
WHERE
1=1
AND t6.bill_date &gt; #{startTime}