From 5ff22b16970da191d5d886e59730cbf4cdc47498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=AD=A6=E6=88=90?= <1274337408@qq.com>
Date: Tue, 22 Sep 2026 10:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=96=97=E4=BA=92=E5=8A=A9=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F-=E5=8C=BB=E4=BF=9D=EF=BC=8C=E6=8A=A5=E9=94=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=EF=BC=9A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E4=BA=8C=E6=AC=A1=E6=8A=A5=E9=94=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SickHelpMedicalInsController.java         | 26 ++++++++++++++++---
 .../member/SickHelpMemberController.java      |  8 +++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java
index f0fed28..f7caee2 100644
--- a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java
+++ b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java
@@ -253,15 +253,31 @@ public class SickHelpMedicalInsController {
 
         int success = 0;
 
+        List<SickHelpMedicalIns> successData = new ArrayList<>();
         List<SickHelpMedicalIns> failData = new ArrayList<>();
 
         for (SickHelpMedicalIns ins : list) {
             if (StrUtil.isNotBlank(ins.getLoginName())) {
-                Optional<SickHelpMedicalIns> optional = excelList.stream().filter(x -> x.getLoginName().equals(ins.getLoginName())).findFirst();
+                String loginName = StrUtil.trim(ins.getLoginName());
+                Optional<SickHelpMedicalIns> optional = excelList.stream()
+                        .filter(x -> loginName.equals(StrUtil.trim(x.getLoginName())))
+                        .findFirst();
                 if (optional.isPresent()) {
-                    ins.setEcbx(optional.get().getEcbx());
-                    BigDecimal subtract = ins.getSxzf().subtract(optional.get().getEcbx());
+                    BigDecimal ecbx = optional.get().getEcbx();
+                    if (ecbx == null) {
+                        ins.setErrMsg("学校二次报销金额为空，请检查导入数据");
+                        failData.add(ins);
+                        continue;
+                    }
+                    if (ins.getSxzf() == null) {
+                        ins.setErrMsg("医保个人自付金额为空，请先核对医保数据");
+                        failData.add(ins);
+                        continue;
+                    }
+                    ins.setEcbx(ecbx);
+                    BigDecimal subtract = ins.getSxzf().subtract(ecbx);
                     ins.setCalc(subtract);
+                    successData.add(ins);
                     success += 1;
                 } else {
                     failData.add(ins);
@@ -271,7 +287,9 @@ public class SickHelpMedicalInsController {
 
         System.out.println();
 
-        dao.update(list, "ecbx|calc");
+        if (!successData.isEmpty()) {
+            dao.update(successData, "ecbx|calc");
+        }
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("success", success);
         hashMap.put("fail", failData.size());
diff --git a/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java b/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java
index 14db27a..7d6d224 100644
--- a/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java
+++ b/src/main/java/io/v/nutz/sickHelp/controller/member/SickHelpMemberController.java
@@ -102,10 +102,16 @@ public class SickHelpMemberController {
                 fundMember.setUnitName(user.getString("unitname"));
                 fundMember.setSex(user.getString("sex"));
                 if (StrUtil.isBlank(fundMember.getIdcard())) {
-                    fundMember.setIdcard(StrUtil.trim(user.getString("idcard")));
+                    String userIdcard = StrUtil.trim(user.getString("idcard"));
+                    if (StrUtil.isNotBlank(userIdcard)) {
+                        fundMember.setIdcard(userIdcard);
+                    }
                 }
 //                fundMember.setIsMember(true);
             }
+            if (StrUtil.isBlank(fundMember.getIdcard()) && fundMemberOptional.isPresent()) {
+                fundMember.setIdcard(StrUtil.trim(fundMemberOptional.get().getIdcard()));
+            }
             fundMember.setIsMember("是".equals(fundMember.getMember()));
         }
         return list;