zjh20250320

zjh

2025-03-20 e191ab24286eb091db9966c9227c68d1af717b46

zjh20250320

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java

@@ -411,6 +411,7 @@
            int woManCount = 0;//女组人数
            List<String> ids=new ArrayList<>();

            String errMsg="";
            for (TjReservation tjReservation : tjReservations) {
                String idCard = tjReservation.getIdCard();
                String phoe = tjReservation.getPhoe();
@@ -431,6 +432,7 @@
                        if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) ||
                                (sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) {
                            wrongList.add(tjReservation.getName());
                            errMsg="身份证号/手机号 格式不准确";
                            log.info(tjReservation.getName()+idCard+MatchUtils.isIdCard(idCard)+MatchUtils.isMobileNO(phoe));
                        }else {

@@ -446,7 +448,7 @@
                                return AjaxResult.error("身份证号不正确");
                            }

                            TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm()));
                            TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm().trim()));
                            if (null != dwDept) {
                                for (TjDwGrouping groupingMan : groupingMans) {
                                    if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
@@ -503,6 +505,7 @@
                                rightList.add(tjReservation);
                            } else {
                                wrongList.add(tjReservation.getName());
                                errMsg="所选项目名 不正确";
                            }
                        }
    //                }
@@ -578,6 +581,7 @@

                } else {
                    wrongList.add(tjReservation.getName());
                    errMsg="身份证号/手机号/项目名为空";
                }
            }
            if (!yyList.isEmpty()) {
@@ -589,7 +593,7 @@
            if (!wrongList.isEmpty()) {
                map.put("list", wrongList);
                map.put("hjMoney", hjMoney);
                return AjaxResult.error("操作失败, 请认真核对信息后重新导入!!!", map);
                return AjaxResult.error("操作失败, 请认真核对信息后重新导入!!!"+errMsg, map);
            } else {
                map.put("list", rightList);
                map.put("count", count);

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java

@@ -81,6 +81,7 @@
            for (Map.Entry<String, List<TjXdPicture>> entry : stringListMap.entrySet()) {
                Map<String,Object>map=new HashMap<>();
                TjCustomer customer = customerService.getById(entry.getKey());
                if(null !=customer){
                customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
@@ -90,6 +91,8 @@
                map.put("picturePath",configService.selectConfigByKey("TjXdPicture"));
                arrayList.add(map);
            }

            }
        }
        List<Map<String, Object>> collect =null;
        Map<String,Object>map=new HashMap<>();

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/WsImportResultGroup.java

@@ -35,7 +35,7 @@

    private String refRange;

    private String final;
    private String finala;

    private String finalLongText;