wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后端最新版本同步

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml
View File

@@ -68,11 +68,26 @@
org.yb_no as dept_yb_no,
pra."name" as doct_name,
pra.yb_no as doct_yb_no,
contract.bus_no as contract_no
contract.bus_no as contract_no,
T2.charge_name,
T2.title,
T2.status_enum,
T2.org_id,
T2.description,
T2.instance_table,
T2.instance_id,
T2.effective_start,
T2.effective_end,
T2.type_code,
T2.yb_type,
T2.condition_flag,
T2.price
-- 添加更多需要的字段
FROM
adm_charge_item a
LEFT JOIN
adm_charge_item_definition T2 ON a.definition_id = T2.ID AND T2.delete_flag = '0'
LEFT JOIN
med_medication_request b1 ON a.service_id = b1.id AND a.service_table = 'med_medication_request'
LEFT JOIN
wor_device_request b2 ON a.service_id = b2.id AND a.service_table = 'wor_device_request'
@@ -171,5 +186,6 @@
<foreach collection="chargeItemIds" item="itemId" open="(" separator="," close=")">
#{itemId}
</foreach>
AND T1.delete_flag = '0'
</select>
</mapper>

21
openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentReconciliationMapper.xml
View File

@@ -4,4 +4,25 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.financial.mapper.PaymentReconciliationMapper">
<select id="getPaymentAccountContract"
resultType="com.openhis.financial.model.PaymentReconciliationAccountDel">
SELECT payment.*,
account.contract_no AS account_contract_no
FROM fin_payment_reconciliation payment
LEFT JOIN fin_payment_rec_detail paydel ON payment."id" = paydel.reconciliation_id
LEFT JOIN adm_account account ON account."id" = paydel.account_id
WHERE payment.bill_date &gt; #{startTime} :: timestamp
AND payment.bill_date &lt; #{endTime} :: timestamp
AND payment.delete_flag = '0'
AND payment.status_enum IN (#{success}, #{returnAll})
AND payment.kind_enum = #{clinic}
<if test="entererId != null">
AND payment.enterer_id = #{entererId}
</if>
<if test="contractNo != null">
AND account.contract_no = #{contractNo}
</if>
GROUP BY payment.ID,
account.ID
</select>
</mapper>

7
openhis-server-new/openhis-domain/src/main/resources/mapper/jlau/ReviewPrescriptionRecordsMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?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.jlau.mapper.ReviewPrescriptionRecordsMapper">
</mapper>

7
openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageDetailMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?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.template.mapper.OrdersGroupPackageDetailMapper">
</mapper>

7
openhis-server-new/openhis-domain/src/main/resources/mapper/template/OrdersGroupPackageMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?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.template.mapper.OrdersGroupPackageMapper">
</mapper>

2
openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml
View File

@@ -9,7 +9,7 @@
FROM wor_activity_definition
WHERE delete_flag = '0'
AND status_enum = #{status}
AND NAME = #{skinTestInspection} LIMIT 1
AND NAME = #{activityName} LIMIT 1
</select>
</mapper>

12
openhis-server-new/openhis-domain/src/main/resources/mapper/yb/MedicalInsuranceMapper.xml
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}