update:his账单明细查询页面
This commit is contained in:
@@ -160,12 +160,12 @@ public class HisDetailController {
|
||||
|
||||
List<HashMap<Object, Object>> list = hisDetailService.findHisDetail(map);
|
||||
|
||||
// 支付方式
|
||||
List<Dicinfo> pay_type = dicinfoService.findDicinfoTreeNodeList("PAY_TYPE");
|
||||
HashMap<String, String> peyTypeMap = new HashMap<>();
|
||||
for (Dicinfo dicinfo : pay_type) {
|
||||
peyTypeMap.put(dicinfo.getDicvalue(), dicinfo.getDicname());
|
||||
}
|
||||
// 支付方式 - 不再使用字典转换,直接显示原始值
|
||||
// List<Dicinfo> pay_type = dicinfoService.findDicinfoTreeNodeList("PAY_TYPE");
|
||||
// HashMap<String, String> peyTypeMap = new HashMap<>();
|
||||
// for (Dicinfo dicinfo : pay_type) {
|
||||
// peyTypeMap.put(dicinfo.getDicvalue(), dicinfo.getDicname());
|
||||
// }
|
||||
|
||||
// 业务类型
|
||||
List<Dicinfo> biz_type = dicinfoService.findDicinfoTreeNodeList("BIZ_TYPE");
|
||||
@@ -175,36 +175,37 @@ public class HisDetailController {
|
||||
}
|
||||
|
||||
for (HashMap<Object, Object> hashMap : list) {
|
||||
String paymethod = StringDUtil.changeNullToEmpty(hashMap.get("VISITZORG"));
|
||||
String paymethod = StringDUtil.changeNullToEmpty(hashMap.get("PAYMETHOD"));
|
||||
if ("1".equals(paymethod)) {
|
||||
hashMap.put("VISITZORG", "门诊");
|
||||
hashMap.put("PAYMETHOD", "门诊");
|
||||
} else if ("2".equals(paymethod)) {
|
||||
hashMap.put("VISITZORG", "住院");
|
||||
hashMap.put("PAYMETHOD", "住院");
|
||||
} else {
|
||||
hashMap.put("VISITZORG", "");
|
||||
hashMap.put("PAYMETHOD", "");
|
||||
}
|
||||
|
||||
String tradingStatus = StringDUtil.changeNullToEmpty(hashMap.get("H_JYLX"));
|
||||
String tradingStatus = StringDUtil.changeNullToEmpty(hashMap.get("TRADINGSTATUS"));
|
||||
if ("1".equals(tradingStatus)) {
|
||||
hashMap.put("H_JYLX", "收款记录");
|
||||
hashMap.put("TRADINGSTATUS", "收款记录");
|
||||
} else if ("2".equals(tradingStatus)) {
|
||||
hashMap.put("H_JYLX", "退款记录");
|
||||
hashMap.put("TRADINGSTATUS", "退款记录");
|
||||
} else {
|
||||
hashMap.put("H_JYLX", "");
|
||||
hashMap.put("TRADINGSTATUS", "");
|
||||
}
|
||||
|
||||
String biztype = StringDUtil.changeNullToEmpty(hashMap.get("BIZTYPE"));
|
||||
hashMap.put("BIZTYPE", bizTypeMap.get(biztype));
|
||||
|
||||
String paytype = StringDUtil.changeNullToEmpty(hashMap.get("PAYTYPE"));
|
||||
hashMap.put("PAYTYPE", peyTypeMap.get(paytype));
|
||||
// 支付方式 - 直接使用原始值,不进行字典转换
|
||||
// String paytype = StringDUtil.changeNullToEmpty(hashMap.get("PAYTYPE"));
|
||||
// hashMap.put("PAYTYPE", peyTypeMap.get(paytype));
|
||||
|
||||
}
|
||||
|
||||
if (list.size() > 0) {
|
||||
// 定义标题头和文件名
|
||||
String[] DISTANCE_HEADERNAME = {"交易状态", "业务类型", "支付方式", "交易时间", "交易日期", "操作员", "总金额", "平台交易号", "his订单号", "患者id", "患者姓名", "来源"};
|
||||
String[] sqlKey = {"TRADINGSTATUS", "BIZTYPE", "PAYTYPE", "TRADETIME", "TRADE_DATE", "HISOPERCODE", "AMOUNT", "PLATFORMTRANSID", "HISTRANSID", "PATIENTID", "PATIENTNAME", "SOURCE"};
|
||||
String[] DISTANCE_HEADERNAME = {"交易状态", "业务类型", "支付方式", "交易时间", "交易日期", "操作员", "总金额", "平台交易号", "his订单号", "HIS交易ID", "患者id", "患者姓名", "来源"};
|
||||
String[] sqlKey = {"TRADINGSTATUS", "BIZTYPE", "PAYTYPE", "TRADETIME", "TRADE_DATE", "HISOPERCODE", "AMOUNT", "PLATFORMTRANSID", "HISTRANSID", "HISTRANSID", "PATIENTID", "PATIENTNAME", "SOURCE"};
|
||||
|
||||
List<Object> rulList = new ArrayList<Object>(list);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user