l1450637472/dzpt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:his账单明细查询页面

Browse Source
This commit is contained in:
Yuan
2025-08-21 10:00:57 +08:00
parent f18ec9ff2e
commit b636852ad7
10 changed files with 128 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/main/resources/mapper/HisDetailMapper.xml
View File

@@ -3,21 +3,21 @@
<mapper namespace="com.saye.hospitalgd.mapper.HisDetailMapper">
<select id="findHisDetail" parameterType="HashMap" resultType="HashMap">
select HisOperCode
,PayMethod
select PayMethod
,TradingStatus
,BizType
,PayType
,TradeTime
,HisOperCode
,Amount
,remarks
,PlatformTransId
,HisTransId
,PatientID
,PatientId
,PatientName
,trade_date
,source
from hisbills_history
,his_wsdl_id
,HisTransId
from hisbill_history
<where>
<if test="payType!=null and payType!=''">
and PayType = #{payType}
@@ -35,6 +35,26 @@
order by trade_date,TradeTime
</select>
<!-- 添加一个明确的count查询，避免分页插件的自动生成问题 -->
<select id="findHisDetailCount" parameterType="HashMap" resultType="long">
select count(1)
from hisbill_history
<where>
<if test="payType!=null and payType!=''">
and PayType = #{payType}
</if>
<if test="startTime!=null and startTime!=''">
and trade_date &gt;= #{startTime}
</if>
<if test="endTime!=null and endTime!=''">
and trade_date &lt;= #{endTime}
</if>
<if test="likeFiled!=null and likeFiled!=''">
and PlatformTransId like concat('%',concat(#{likeFiled},'%'))
</if>
</where>
</select>
<delete id="deleteHisBillOriginalByParam" parameterType="HashMap">
delete from hisbill_original where trade_date=#{trade_date}
</delete>
@@ -86,18 +106,15 @@
)
</foreach>
</insert>
<!--insert into hisbill_history(PayMethod,TradingStatus,BizType,PayType,TradeTime,HisOperCode,Amount,remarks,PlatformTransId,PatientId,PatientName,trade_date,his_wsdl_id)
select a.PayMethod,a.TradingStatus,a.BizType,a.PayType,a.TradeTime,a.HisOperCode,a.Amount,a.remarks,a.PlatformTransId,a.PatientId,a.PatientName,a.trade_date,a.his_wsdl_id
from hisbill_original a
where a.trade_date=#{trade_date} 之前的存一份省的又改回来-->
<insert id="insertAllHisBillHistory" parameterType="java.util.List">
insert into
hisbill_history(PayMethod,TradingStatus,BizType,PayType,TradeTime,HisOperCode,Amount,remarks,PlatformTransId,PatientId,PatientName,trade_date,his_wsdl_id)
hisbill_history(PayMethod,TradingStatus,BizType,PayType,TradeTime,HisOperCode,Amount,remarks,PlatformTransId,PatientId,PatientName,trade_date,his_wsdl_id,HisTransId)
values
<foreach collection="list" index="index" item="itm" separator=",">
(
#{itm.payMethod},#{itm.tradingStatus},#{itm.bizType},#{itm.payType},#{itm.tradeTime},#{itm.hisOperCode},#{itm.amount},#{itm.remarks},#{itm.platformTransId},#{itm.patientId}
,#{itm.patientName},#{itm.trade_date},#{itm.his_wsdl_id}
,#{itm.patientName},#{itm.trade_date},#{itm.his_wsdl_id},#{itm.hisTransId}
)
</foreach>
</insert>
@@ -116,37 +133,36 @@
</insert>
<select id="findHisDetailByParam" parameterType="HashMap" resultType="HashMap">
select BRNM
,BRID
,ZFJE
,HISDDH
,GHDDH
,ZFFS
,CZY
,JYRQ
,JYSJ
,XTJSH
,ZDH
,JYKH
,ZFZT
from hisbills_history
select PayMethod
,TradingStatus
,BizType
,PayType
,TradeTime
,HisOperCode
,Amount
,remarks
,PlatformTransId
,PatientId
,PatientName
,trade_date
,his_wsdl_id
,HisTransId
from hisbill_history
where trade_date=#{trade_date}
<if test="h_ghddh!=null and h_ghddh!=''">
and H_GHDDH=#{h_ghddh}
<if test="payType!=null and payType!=''">
and PayType = #{payType}
</if>
<if test="zfzt!=null and zfzt!=''">
and ZFZT=#{zfzt}
<if test="tradingStatus!=null and tradingStatus!=''">
and TradingStatus = #{tradingStatus}
</if>
<if test="orderby_je!=null and orderby_je!=''">
order by ZFJE desc
<if test="orderby_amount!=null and orderby_amount!=''">
order by Amount desc
</if>
</select>
<select id="findHisDetailByTimeAndYSDDH" parameterType="HashMap" resultType="HashMap">
select PayMethod,TradingStatus,BizType,PayType,TradeTime,HisOperCode,Amount,remarks,PlatformTransId,
PatientId,PatientName
PatientId,PatientName,HisTransId
from hisbill_history
where trade_date=#{searchTime}
and PlatformTransId = #{c_ysddh}
@@ -161,7 +177,7 @@
</select>
<select id="findHisCashDetail" parameterType="HashMap" resultType="HashMap">
select PayMethod, TradingStatus, BizType, PayType, TradeTime, HisOperCode, Amount, remarks, PlatformTransId, PatientId, PatientName, trade_date, his_wsdl_id
select PayMethod, TradingStatus, BizType, PayType, TradeTime, HisOperCode, Amount, remarks, PlatformTransId, PatientId, PatientName, trade_date, his_wsdl_id, HisTransId
from hisbill_history
where trade_date=#{trade_date} and PayType='5'
</select>

26
src/main/resources/templates/financialReconciliation/hisDetail.html
View File

@@ -141,12 +141,10 @@
sort: false,
templet: function (d) {
let result = "";
for (let i = 0; i < payTypeList.length; i++) {
let obj = payTypeList[i];
if (d.PAYMETHOD === obj.dicvalue) {
result = obj.dicname;
break;
}
if (d.PAYMETHOD === '1') {
result = '门诊';
} else if (d.PAYMETHOD === '2') {
result = '住院';
}
return result;
}
@@ -190,18 +188,7 @@
align: 'center',
title: '支付方式',
width: 120,
sort: false,
templet: function (d) {
let result = "";
for (let i = 0; i < payTypeList.length; i++) {
let obj = payTypeList[i];
if (d.PAYTYPE === obj.dicvalue) {
result = obj.dicname;
break;
}
}
return result;
}
sort: false
},
@@ -209,6 +196,7 @@
{field: 'AMOUNT', align: 'center', title: '金额 ', width: 120, sort: false},
{field: 'PLATFORMTRANSID', align: 'center', title: '平台订单号 ', width: 120, sort: false},
{field: 'HISTRANSID', align: 'center', title: 'his订单号 ', width: 120, sort: false},
{field: 'HISTRANSID', align: 'center', title: 'HIS交易ID', width: 120, sort: false},
{field: 'PATIENTID', align: 'center', title: '患者id ', width: 120, sort: false},
{field: 'PATIENTNAME', align: 'center', title: '患者姓名 ', width: 120, sort: false},
{field: 'TRADE_DATE', align: 'center', title: '交易时间', width: 120, sort: false},
@@ -266,7 +254,7 @@
let url = "/hisDetail/exportHisDetail";
let param = {};
param.payType = $("#searchPayType").val();
param.payType = $("#payType").val();
param.likeFiled = $("#likeFiled").val();
let date = $("#searchDate").val();
if (date !== '') {

44
src/main/resources/templates/financialReconciliation/thirdDetail.html
View File

@@ -133,31 +133,31 @@
//size:'lg', 默认普通尺寸 sm 小 lg 大
cols: [
[
{field: 'I_JYRQ', align: 'center', title: '交易日期', width: 180, sort: false},
{field: 'I_JYSJ', align: 'center', title: '交易时间', width: 180, sort: false},
{field: 'I_JZRQ', align: 'center', title: '记账日期', width: 180, sort: false},
{field: 'I_YHLSH', align: 'center', title: '银行流水号', width: 120, sort: false},
{field: 'I_SHLSH', align: 'center', title: '商户流水号', width: 120, sort: false},
{field: 'I_DDH', align: 'center', title: '订单号', width: 120, sort: false},
{field: 'I_DDZT', align: 'center', title: '订单状态', width: 120, sort: false},
{field: 'I_FKFZH', align: 'center', title: '付款方账号', width: 120, sort: false},
{field: 'I_FKFHM', align: 'center', title: '付款方户名', width: 120, sort: false},
{field: 'I_DDJE', align: 'center', title: '订单金额', width: 150, sort: false},
{field: 'I_JYJE', align: 'center', title: '交易金额', width: 120, sort: false},
{field: 'I_SXF', align: 'center', title: '手续费', width: 120, sort: false},
{field: 'I_JSJE', align: 'center', title: '结算金额', width: 240, sort: false},
{field: 'I_GTDM', align: 'center', title: '柜台代码', width: 180, sort: false},
{field: 'C_JYRQ', align: 'center', title: '交易日期', width: 180, sort: false},
{field: 'C_JYSJ', align: 'center', title: '交易时间', width: 180, sort: false},
{field: 'C_QSRQ', align: 'center', title: '清算日期', width: 180, sort: false},
{field: 'C_LSH', align: 'center', title: '流水号', width: 120, sort: false},
{field: 'C_SHDDH', align: 'center', title: '商户订单号', width: 120, sort: false},
{field: 'C_YSDDH', align: 'center', title: '银商订单号', width: 120, sort: false},
{field: 'C_JYLX', align: 'center', title: '交易类型', width: 120, sort: false},
{field: 'C_CARD', align: 'center', title: '卡号', width: 120, sort: false},
{field: 'C_FKH', align: 'center', title: '发卡行', width: 120, sort: false},
{field: 'C_JYJE', align: 'center', title: '交易金额', width: 150, sort: false},
{field: 'C_QSJE', align: 'center', title: '清算金额', width: 120, sort: false},
{field: 'C_SXF', align: 'center', title: '手续费', width: 120, sort: false},
{field: 'C_SJZFJE', align: 'center', title: '实际支付金额', width: 240, sort: false},
{field: 'C_ZDH', align: 'center', title: '终端号', width: 180, sort: false},
{
field: 'I_FXK',
field: 'C_ZFFS',
align: 'center',
title: '发卡行/通道',
title: '支付方式',
width: 120,
sort: false,
templet: function (d) {
let result = "";
for (let i = 0; i < payTypeList.length; i++) {
let obj = payTypeList[i];
if (d.I_FXK === obj.dicvalue) {
if (d.C_ZFFS === obj.dicvalue) {
result = obj.dicname;
break;
}
@@ -165,18 +165,18 @@
return result;
}
},
{field: 'I_ZFKZ', align: 'center', title: '卡种', width: 120, sort: false},
{field: 'C_KLX', align: 'center', title: '卡类型', width: 120, sort: false},
{
field: 'I_JYLX',
field: 'C_JYLX',
align: 'center',
title: '交易类型',
width: 100,
sort: false,
templet: function (d) {
return d.I_JYLX === '1' ? '消费' : '消费撤销';
return d.C_JYLX === '1' ? '消费' : '消费撤销';
}
},
{field: 'I_QS', align: 'center', title: '分期期数', width: 120, sort: false},
{field: 'C_FQQS', align: 'center', title: '分期期数', width: 120, sort: false},
]
],
data: []
@@ -244,7 +244,7 @@
let url = "/thirdDetail/exportThirdDetail";
let param = {};
param.payType = $("#searchPayType").val();
param.c_zffs = $("#c_zffs").val();
param.likeFiled = $("#likeFiled").val();
let date = $("#searchDate").val();
if (date !== '') {