From 76ca9e469bc3c4e76bd11e8ba789f717f75d7b86 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 五月 2024 13:54:08 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
index 473f576..620b893 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
@@ -101,8 +101,8 @@
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�");
 
         dataMap.put("RQ", simpleDateFormat.format(new Date()));
-        dataMap.put("FKDW", serviceDonorpayment.getHospitalname());
-        dataMap.put("JBR", StringUtils.isEmpty(serviceDonorpayment.getUserName()) ? "" : serviceDonorpayment.getUserName());
+        dataMap.put("JSDW", serviceDonorpayment.getHospitalname());
+
         ServiceDonorchargeorgan serviceDonorchargeorgan = new ServiceDonorchargeorgan();
         serviceDonorchargeorgan.setPaymentid(id);
         List<ServiceDonorchargeorgan> serviceDonorchargeorgans = serviceDonorchargeorganMapper.selectServiceDonorchargeorganList(serviceDonorchargeorgan);
@@ -117,10 +117,11 @@
                 map.put("XH", count);
                 map.put("JXZ", StringUtils.isEmpty(serviceDonorchargeorgan1.getDonorname()) ? "" : serviceDonorchargeorgan1.getDonorname());
                 map.put("XM", StringUtils.isEmpty(serviceDonorchargeorgan1.getOrganname()) ? "" : serviceDonorchargeorgan1.getOrganname());
-                map.put("XTBH", StringUtils.isEmpty(serviceDonorchargeorgan1.getCaseno()) ? "" : serviceDonorchargeorgan1.getCaseno());
-                map.put("ST", StringUtils.isEmpty(serviceDonorchargeorgan1.getName()) ? "" : serviceDonorchargeorgan1.getName());
+                map.put("GJFPBH", StringUtils.isEmpty(serviceDonorchargeorgan1.getCaseno()) ? "" : serviceDonorchargeorgan1.getCaseno());
+                map.put("STXS", StringUtils.isEmpty(serviceDonorchargeorgan1.getName()) ? "" : serviceDonorchargeorgan1.getName());
 
                 map.put("JE", serviceDonorchargeorgan1.getOrgancharge() == BigDecimal.ZERO ? "" : serviceDonorchargeorgan1.getOrgancharge());
+                map.put("BZ", "");
                 hj += serviceDonorchargeorgan1.getOrgancharge().doubleValue();
 
                 newsList.add(map);
@@ -128,7 +129,12 @@
 
         }
         dataMap.put("items", newsList);
-        dataMap.put("BYHJ", hj);
+        dataMap.put("HJ", hj);
+        dataMap.put("SKDW", "娴欐睙鐪佷汉姘戝尰闄㈡禉姹熺渷浜轰綋鍣ㄥ畼鑾峰彇鏈嶅姟绠$悊涓績");
+        dataMap.put("KHYH", "涓浗鍐滀笟閾惰鏉窞鏈濇櫀鏀");
+        dataMap.put("ZH", "19015601040025130");
+//        dataMap.put("LXR", StringUtils.isEmpty(serviceDonorpayment.getUserName()) ? "" : serviceDonorpayment.getUserName());
+        dataMap.put("LXR", "閮戜寒锛�18868898880锛�");
 
     }
 

--
Gitblit v1.9.3