ltkj_peis.git - gitblit

			@@ -380,7 +380,7 @@

			List<String> wrongList = new ArrayList<>();
			List<TjReservation> rightList = new ArrayList<>();
			List<TjReservation> yyList = new ArrayList<>();
			List<String> yyList = new ArrayList<>();
			Map<String, Object> map = new HashMap<>();
			List<TjDwGrouping> groupingMans = null;//男
			List<TjDwGrouping> groupingWoMans = null;//女
			@@ -411,44 +411,56 @@
			int woManCount = 0;//女组人数
			List<String> ids=new ArrayList<>();

			String errMsg="";
			// String errMsg = "";
			for (TjReservation tjReservation : tjReservations) {
			String name = tjReservation.getName();
			String idCard = tjReservation.getIdCard();
			String phoe = tjReservation.getPhoe();
			idCard= idCard.replaceAll("[',，;.。 ‘“]","");
			name = name.replaceAll("[',，;.。 ‘“]", "").replaceAll(" ", "");
			phoe = phoe.replaceAll("[',，;.。 ‘“]", "").replaceAll(" ", "");
			idCard = idCard.replaceAll("[',，;.。 ‘“]", "").replaceAll(" ", "");

			if (!StringUtils.isBlank(idCard) \|\| !StringUtils.isBlank(phoe) \|\| null != tjReservation.getDwxm()) {
			//将科学计数的手机号转换成文本形式
			phoe = MatchUtils.translateToPlainStr(tjReservation.getPhoe());

			if(!ids.isEmpty() && ids.contains(tjReservation.getIdCard())){
			if (!ids.isEmpty() && ids.contains(idCard)) {
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			return AjaxResult.error("此身份证号: "+tjReservation.getIdCard()+" 重复,请核对后上传!");
			}

			ids.add(tjReservation.getIdCard());
			ids.add(idCard);

			// if (sfjysfzh.equalsIgnoreCase("Y") \|\| sfjysjh.equalsIgnoreCase("Y")) {
			if (!Objects.equals(tjReservation.getSex(), MatchUtils.getSexByIdCard(idCard))){
			wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"性别不准确");
			log.info(tjReservation.getName() + " " + idCard);
			}

			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 {

			wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"身份证号/手机号格式不准确");
			// errMsg = "身份证号/手机号格式不准确";
			log.info(tjReservation.getName() + " " + idCard + MatchUtils.isIdCard(idCard) + " " + phoe + " " + MatchUtils.isMobileNO(phoe));
			}
			// else {

			tjReservation.setPhoe(phoe);

			tjReservation.setName(name);

			tjReservation.setIdCard(idCard);

			//年龄
			tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
			tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard().replaceAll(" ", ""))));
			//出生日期
			try {
			tjReservation.setBirthday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()));
			tjReservation.setBirthday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard().replaceAll(" ", "")));
			} catch (Exception e) {
			return AjaxResult.error("身份证号不正确");
			// return AjaxResult.error("身份证号不正确");
			}

			TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm().trim()));
			TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().
			eq(TjDwDept::getDwDeptName, tjReservation.getDwxm().trim()).eq(TjDwDept::getDwId,dwId));
			if (null != dwDept) {
			for (TjDwGrouping groupingMan : groupingMans) {
			if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
			@@ -500,90 +512,23 @@
			wq.eq(TjReservation::getIsExpire, 2);
			TjReservation one = tjReservationService.getOne(wq);
			if (null != one) {
			yyList.add(one);
			}
			rightList.add(tjReservation);
			yyList.add(one.getName() + " " + tjReservation.getIdCard());
			} else {
			wrongList.add(tjReservation.getName());
			errMsg="所选项目名不正确";
			rightList.add(tjReservation);
			}
			}
			// }
			// else {
			// //将科学计数的手机号转换成文本形式
			// String str = MatchUtils.translateToPlainStr(tjReservation.getPhoe());
			// tjReservation.setPhoe(str);
			//
			// //年龄
			// tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
			// //出生日期
			// tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
			//
			// TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm()));
			// if (null != dwDept) {
			// for (TjDwGrouping groupingMan : groupingMans) {
			// if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
			// tjReservation.setGroupingId(groupingMan.getId());
			// tjReservation.setGroupingName(groupingMan.getGroupingName());
			// tjReservation.setYsPrice(groupingMan.getYsPrice());
			// //合计
			// hjMoney = hjMoney.add(groupingMan.getYsPrice());
			// count += 1;
			// //男组人数
			// manMoney = manMoney.add(groupingMan.getYsPrice());
			// manCount += 1;
			// }
			// }
			//
			// for (TjDwGrouping groupingWoMan : groupingWoMans) {
			// if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) {
			// tjReservation.setGroupingId(groupingWoMan.getId());
			// tjReservation.setGroupingName(groupingWoMan.getGroupingName());
			// tjReservation.setYsPrice(groupingWoMan.getYsPrice());
			// //合计
			// hjMoney = hjMoney.add(groupingWoMan.getYsPrice());
			// count += 1;
			// woManMoney = woManMoney.add(groupingWoMan.getYsPrice());
			// woManCount += 1;
			// }
			// }
			// for (TjDwGrouping groupingWz : groupingWzs) {
			// if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) {
			// tjReservation.setGroupingId(groupingWz.getId());
			// tjReservation.setGroupingName(groupingWz.getGroupingName());
			// tjReservation.setYsPrice(groupingWz.getYsPrice());
			// //合计
			// hjMoney = hjMoney.add(groupingWz.getYsPrice());
			// count += 1;
			// if (tjReservation.getSex() == 0) {
			// manMoney = manMoney.add(groupingWz.getYsPrice());
			// manCount += 1;
			// }
			// if (tjReservation.getSex() == 1) {
			// woManMoney = woManMoney.add(groupingWz.getYsPrice());
			// woManCount += 1;
			// }
			//
			// }
			// }
			// LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
			// wq.eq(TjReservation::getIdCard, tjReservation.getIdCard());
			// wq.eq(TjReservation::getIsExpire, 2);
			// TjReservation one = tjReservationService.getOne(wq);
			// if (null != one) {
			// yyList.add(one);
			// }
			// rightList.add(tjReservation);
			// } else {
			// wrongList.add(tjReservation.getName());
			// }
			// }

			} else {
			wrongList.add(tjReservation.getName());
			errMsg="身份证号/手机号/项目名为空";
			wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"该单位套餐分类名填写不正确");
			}
			// }

			}
			else {
			wrongList.add(tjReservation.getName()+"身份证号/手机号/套餐分类名名为空");
			}
			}


			if (!yyList.isEmpty()) {
			map.put("list", yyList);
			map.put("hjMoney", hjMoney);
			@@ -593,7 +538,7 @@
			if (!wrongList.isEmpty()) {
			map.put("list", wrongList);
			map.put("hjMoney", hjMoney);
			return AjaxResult.error("操作失败, 请认真核对信息后重新导入!!!"+errMsg, map);
			return AjaxResult.error("操作失败, 请认真核对错误信息后重新导入!!!", map);
			} else {
			map.put("list", rightList);
			map.put("count", count);
			@@ -948,7 +893,7 @@

			TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());

			TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId());
			// TjDwDept dwDept = dwDeptService.getById(dwGrouping.getDwDeptId());

			LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
			wq.eq(TjReservation::getIdCard, reservation.getIdCard());
			@@ -1046,6 +991,7 @@

			/**
			* 团体预约体检信息联动下拉框
			*
			* @param pid
			* @param type
			* @return