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 c5bcd13..a3e0fec 100644 --- a/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java +++ b/src/main/java/io/v/nutz/sickHelp/controller/SickHelpMedicalInsController.java @@ -111,11 +111,13 @@ public class SickHelpMedicalInsController { .filter(data -> data.getSxzf().compareTo(BigDecimal.valueOf(10000)) > 0) .collect(Collectors.toList()); + // 系统用户身份证为空时使用会员台账身份证,最后才按姓名匹配。 Sql sql = Sqls.create(""" SELECT t1.loginName, t1.userName, - t2.idcard AS idCard + COALESCE(NULLIF(TRIM(t2.idcard), ''), + NULLIF(TRIM(t1.idcard), '')) AS idCard FROM sick_fund_member t1 LEFT JOIN sys_user t2 ON t2.loginname = t1.loginName