Revert "Fix Bug #550: AI修复"

This reverts commit 16c42ca108.
This commit is contained in:
2026-05-27 08:59:07 +08:00
parent bd14563691
commit 9db5ced4e3
5432 changed files with 778638 additions and 171 deletions

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.yb.mapper.ClinicSettleMapper">
</mapper>

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.yb.mapper.ClinicUnSettleMapper">
</mapper>

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.yb.mapper.ClinicPreSettleMapper">
</mapper>

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.yb.mapper.ClinicUnRegMapper">
</mapper>

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.yb.mapper.DirectoryCheckRecordMapper">
</mapper>

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.yb.mapper.FinancialApplyRecordMapper">
</mapper>

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.yb.mapper.FinancialReconcileRecordMapper">
</mapper>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.yb.mapper.InpatientDischargeMapper">
</mapper>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.yb.mapper.InpatientFeeDetailMapper">
</mapper>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.yb.mapper.InpatientPreSettleMapper">
</mapper>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.yb.mapper.InpatientRegInfoUpdateRecordeMapper">
</mapper>

View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.yb.mapper.InpatientRegMapper">
<select id="selectInpatientInfoByEncounterId" resultType="com.openhis.yb.domain.InpatientReg">
SELECT
id,
psn_no,
insutype,
coner_name,
tel,
begntime,
mdtrt_cert_type,
mdtrt_cert_no,
med_type,
ipt_no,
medrcdno,
atddr_no,
chfpdr_name,
adm_diag_dscr,
adm_dept_codg,
adm_dept_name,
adm_bed,
dscg_maindiag_code,
dscg_maindiag_name,
main_cond_dscr,
dise_codg,
dise_name,
oprn_oprt_code,
oprn_oprt_name,
fpsc_no,
matn_type,
birctrl_type,
latechb_flag,
geso_val,
fetts,
fetus_cnt,
pret_flag,
birctrl_matn_date,
dise_type_code,
exp_content,
insuplc_admdvs,
mdtrtarea_admvs,
mdtrt_id
FROM yb_inpatient_reg inreg
LEFT JOIN adm_encounter enc ON inreg.ipt_no = enc.bus_no AND enc.delete_flag = '0'
WHERE enc.id = #{encounterId}
</select>
</mapper>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.yb.mapper.InpatientSettleMapper">
</mapper>

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.yb.mapper.InventoryChangeRecordMapper">
</mapper>

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.yb.mapper.InventoryCheckRecordMapper">
</mapper>

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.yb.mapper.InventoryDelRecordMapper">
</mapper>

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.yb.mapper.InventoryPurchaseRecordMapper">
</mapper>

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.yb.mapper.InventoryPurchaseReturnRecordMapper">
</mapper>

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.yb.mapper.InventorySaleRecordMapper">
</mapper>

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.yb.mapper.InventorySaleReturnRecordMapper">
</mapper>

View File

@@ -0,0 +1,152 @@
<?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.yb.mapper.MedicalInsuranceMapper">
<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,
sum(case when T5.pay_enum = #{zhGjPay} THEN T5.amount ELSE 0 END) AS acct_gj_pay,
count(T1.id) AS fix_med_ins_setl_cnt
FROM fin_payment_reconciliation T1
INNER JOIN adm_encounter T4 ON T1.encounter_id = T4.id AND T4.delete_flag = '0'
INNER JOIN yb_clinc_reg T2 ON T4.bus_no = T2.ipt_otp_no
INNER JOIN yb_clinc_settle T3 ON T1.payment_no = T3.payment_no AND T2.mdtrt_id = T3.mdtrt_id
LEFT JOIN fin_payment_rec_detail T5 ON T1.id = T5.reconciliation_id
WHERE t1.bill_date &gt; #{startTime}
AND t1.bill_date &lt; #{endTime}
AND T2.insutype = #{InsuType}
AND T4.yb_class_enum = #{clrType}
AND T3.clr_optins = #{admVs}
AND T1.tenant_id = #{tenantId}
GROUP BY t1.id
</select>
<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,
sum(case when T5.pay_enum = #{zhGjPay} THEN T5.amount ELSE 0 END) AS acct_gj_pay,
sum(case when T5.pay_enum = #{cash} THEN T5.amount ELSE 0 END) AS self_pay_cash,
sum(case when T5.pay_enum = #{cashAli} THEN T5.amount ELSE 0 END) AS self_pay_vx,
sum(case when T5.pay_enum = #{cashVX} THEN T5.amount ELSE 0 END) AS self_pay_ali,
sum(case when T5.pay_enum = #{cashUNIN} THEN T5.amount ELSE 0 END) AS self_pay_union,
count(T1.id) AS fix_med_ins_setl_cnt
FROM fin_payment_reconciliation T1
INNER JOIN yb_clinc_reg T2 ON T1.encounter_id = T2.ipt_otp_no
INNER JOIN yb_clinc_settle T3 ON T1.id = T3.payment_id AND T2.mdtrt_id = T3.mdtrt_id
INNER JOIN adm_encounter T4 ON T1.encounter_id = T4.id AND T4.delete_flag = '0'
LEFT JOIN fin_payment_rec_detail T5 ON T1.id = T5.reconciliation_id
WHERE t1.bill_date &gt; #{startTime}
AND t1.bill_date &lt; #{endTime}
AND T4.yb_class_enum = #{clrType}
AND T3.clr_optins = #{admVs}
AND T1.tenant_id = #{tenantId}
GROUP BY t1.id
</select>
<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,
sum(case when T5.pay_enum = #{zhGjPay THEN T5.amount ELSE 0 END}) AS acct_gj_pay,
sum(case when T5.pay_enum = #{cash} THEN T5.amount ELSE 0 END) AS self_pay_cash,
sum(case when T5.pay_enum = #{cashAli} THEN T5.amount ELSE 0 END) AS self_pay_vx,
sum(case when T5.pay_enum = #{cashVX} THEN T5.amount ELSE 0 END) AS self_pay_ali,
sum(case when T5.pay_enum = #{cashUNIN} THEN T5.amount ELSE 0 END) AS self_pay_union,
sum(T3.medfee_sumamt) AS med_sumfee,
count(T3.id) AS psntime,
count(T1.id) AS fix_med_ins_setl_cnt
FROM fin_payment_reconciliation T1
INNER JOIN yb_clinc_reg T2 ON T1.encounter_id = T2.ipt_otp_no
INNER JOIN yb_clinc_settle T3 ON T1.id = T3.payment_id AND T2.mdtrt_id = T3.mdtrt_id
INNER JOIN adm_encounter T4 ON T1.encounter_id = T4.id AND T4.delete_flag = '0'
LEFT JOIN fin_payment_rec_detail T5 ON T1.id = T5.reconciliation_id
WHERE t1.bill_date &gt; #{startTime}
AND t1.bill_date &lt; #{endTime}
AND T4.yb_class_enum = #{clrType}
AND T3.clr_optins = #{admVs}
AND T1.tenant_id = #{tenantId}
GROUP BY t1.id
</select>
<select id="get3201ParamList" resultType="com.openhis.yb.dto.Settlement3201DetailDto">
SELECT
T2.insutype,
T4.clr_optins,
SUM(T1.tendered_amount) AS med_fee_sum_amt,
SUM(case when WHEN T5.pay_enum = #{ybFund} THEN T5.amount ELSE 0 END) AS fund_pay_sum_amt,
SUM(case when WHEN T5.pay_enum = #{zhPay} THEN T5.amount ELSE 0 END) AS acct_pay,
SUM(case when WHEN T5.pay_enum = #{zhGjPay} THEN T5.amount ELSE 0 END) AS acct_gj_pay,
COUNT(T1.id) AS fix_med_ins_setl_cnt
FROM fin_payment_reconciliation T1
INNER JOIN yb_clinc_reg T2 ON T1.encounter_id = T2.ipt_otp_no
INNER JOIN yb_clinc_settle T3 ON T1.id = T3.payment_id AND T2.mdtrt_id = T3.mdtrt_id
INNER JOIN adm_encounter T4 ON T1.encounter_id = T4.id AND T4.delete_flag = '0'
LEFT JOIN fin_payment_rec_detail T5 ON T1.id = T5.reconciliation_id
WHERE
T1.bill_date &gt; #{startTime}
AND T1.bill_date &lt; #{endTime}
<if test="InsuType != null">
AND T2.insutype = #{InsuType}
</if>
<if test="clrType != null">
AND T4.yb_class_enum = #{clrType}
</if>
<if test="admVs != null">
AND T4.clr_optins = #{admVs}
</if>
AND T1.tenant_id = #{tenantId}
GROUP BY
T2.insutype,
T4.clr_optins;
</select>
<select id="getPaymentDecDetailUniAccountDtoListByPaymentIdList"
resultType="com.openhis.yb.dto.PaymentDecDetailUniAccountDto">
SELECT
t1.id,
t1.predecessor_id,
t1.reconciliation_id,
t1.target_enum,
t1.account_id,
t1.account_code,
t1.pay_enum,
t1.pay_level_enum,
t1.amount,
t1.return_amount,
t1.charge_amount,
t1.pay_trans_no,
t1.pay_trans_text,
t1.pay_trans_date,
t1.before_balance,
t1.after_balance,
t1.result_enum,
t2.contract_no,
t5.insutype,
t5.med_type,
t6.kind_enum,
t7.medfee_sumamt,
t8.medfee_sumamt as return_medfee_sumamt
FROM
fin_payment_rec_detail t1
LEFT JOIN adm_account t2 on t1.account_id = t2.id
LEFT JOIN fin_contract t3 on t2.contract_no = t3.bus_no
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
LEFT JOIN yb_clinc_un_settle t8 on t6.yb_settle_ids = t8.settle_id
WHERE
1=1
AND t6.bill_date &gt; #{startTime}
AND t6.bill_date &lt; #{endTime}
AND t6.status_enum != #{draft}
AND t5.med_type IS NOT NULL
AND t1.account_id IS NOT NULL
<if test="idList != null and idList.size() > 0">
AND t1.reconciliation_id IN
<foreach collection="idList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>

View File

@@ -0,0 +1,4 @@
<?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.yb.mapper.PerinfoMapper">
</mapper>

View File

@@ -0,0 +1,102 @@
<?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.yb.mapper.RegMapper">
<resultMap id="RegMap" type="com.openhis.yb.domain.ClinicReg">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="medicalNo" column="medical_no" jdbcType="VARCHAR"/>
<result property="mdtrtId" column="mdtrt_id" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="sex" column="sex" jdbcType="VARCHAR"/>
<result property="naty" column="naty" jdbcType="VARCHAR"/>
<result property="brdy" column="brdy" jdbcType="DATE"/>
<result property="age" column="age" jdbcType="DOUBLE"/>
<result property="fixmedinsCode" column="fixmedins_code" jdbcType="VARCHAR"/>
<result property="fixmedinsName" column="fixmedins_name" jdbcType="VARCHAR"/>
<result property="mdtrtareaAdmvs" column="mdtrtarea_admvs" jdbcType="VARCHAR"/>
<result property="insuplcAdmdvs" column="insuplc_admdvs" jdbcType="VARCHAR"/>
<result property="psnNo" column="psn_no" jdbcType="VARCHAR"/>
<result property="insutype" column="insutype" jdbcType="VARCHAR"/>
<result property="medType" column="med_type" jdbcType="VARCHAR"/>
<result property="begntime" column="begntime" jdbcType="TIMESTAMP"/>
<result property="mdtrtCertType" column="mdtrt_cert_type" jdbcType="VARCHAR"/>
<result property="mdtrtCertNo" column="mdtrt_cert_no" jdbcType="VARCHAR"/>
<result property="iptOtpNo" column="ipt_otp_no" jdbcType="VARCHAR"/>
<result property="atddrNo" column="atddr_no" jdbcType="VARCHAR"/>
<result property="drName" column="dr_name" jdbcType="VARCHAR"/>
<result property="deptCode" column="dept_code" jdbcType="VARCHAR"/>
<result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
<result property="caty" column="caty" jdbcType="VARCHAR"/>
<result property="regFee" column="reg_fee" jdbcType="DOUBLE"/>
<result property="checkFee" column="check_fee" jdbcType="DOUBLE"/>
<result property="totalFee" column="total_fee" jdbcType="DOUBLE"/>
<result property="status" column="status" jdbcType="VARCHAR"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="sysOrgCode" column="sys_org_code" jdbcType="VARCHAR"/>
<result property="tenantId" column="tenant_id" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Reg_List">
id,
medical_no,
mdtrt_id,
NAME,
sex,
naty,
brdy,
age,
fixmedins_code,
fixmedins_name,
mdtrtarea_admvs,
insuplc_admdvs,
psn_no,
insutype,
med_type,
begntime,
mdtrt_cert_type,
mdtrt_cert_no,
ipt_otp_no,
atddr_no,
dr_name,
dept_code,
dept_name,
caty,
reg_fee,
check_fee,
total_fee,
STATUS,
create_by,
create_time,
sys_org_code,
tenant_id
</sql>
<!-- 查询挂号列表 -->
<select id="queryRegList" resultMap="RegMap">
select
<include refid="Reg_List"/>
from
business_clinc_reg
<where>
DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')
<!-- 病历号 -->
<if test="reg.medicalNo != null and reg.medicalNo !=''">
and medical_no LIKE CONCAT(CONCAT('%', #{reg.medicalNo}),'%')
</if>
<!-- 姓名 -->
<if test="reg.name != null and reg.name !=''">
and name LIKE CONCAT(CONCAT('%', #{reg.name}),'%')
</if>
<!-- 状态 -->
<choose>
<when test="reg.status != null and reg.status == '0'.toString()">
and status = '0'
</when>
<otherwise>
and status = '1'
</otherwise>
</choose>
</where>
order by create_time desc
</select>
</mapper>

View File

@@ -0,0 +1,4 @@
<?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.yb.mapper.SignMapper">
</mapper>