ltkj_peis_region.git

			@@ -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);

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

			}
			}
			List<Map<String, Object>> collect =null;

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

			private String refRange;

			private String final;
			private String finala;

			private String finalLongText;

	ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ltkj-hosp/src/main/java/com/ltkj/hosp/domain/WsImportResultGroup.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史