ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -3088,6 +3088,7 @@ if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1 && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) { TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId()); TjPdfVO tjPdfVO = new TjPdfVO(); tjPdfVO.setProName(tjOrderDetail.getProject().getProName()); tjPdfVO.setProResult(tjOrderDetail.getProResult()); @@ -3099,9 +3100,10 @@ } tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId())); LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber); wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId())); wrapper.orderByDesc(LtkjExamJcbgd::getZdsj); wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId()) .and(w -> w.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId())) .or() .eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()))).orderByDesc(LtkjExamJcbgd::getZdsj); List<LtkjExamJcbgd> list = jcbgdService.list(wrapper); if (null != list && !list.isEmpty()) { LtkjExamJcbgd jcbgd = list.get(0); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1758,12 +1758,12 @@ List<TjOrderDetail> dels = new ArrayList<>(); for (TjOrderDetail tjOrderDetail : tjOrderDetails) { if (remark.getProsId().equals(tjOrderDetail.getProsId())) { if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) { if (null != tjOrderDetail.getYcbz()) { if (!tjOrderDetail.getDeptId().equals("2")) { String replacedAll = tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "") .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", ""); List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),replacedAll, List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(replacedAll,replacedAll, tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber,replacedAll, tjOrderDetail.getProResult()); @@ -1772,11 +1772,11 @@ } } else { String[] split = tjOrderDetail.getProResult().split("。|,|，"); String[] split = tjOrderDetail.getProResult().split("[。,，:：.\\s]+"); List<Map<String, Object>> mapList = new ArrayList<>(); for (String s : split) { s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");; // Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s); s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "").replaceAll(" ","") .replaceAll("症","").replaceAll("[0-9]", ""); Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb); if (null != maps && !maps.isEmpty()) { Object bt = maps.get("bt"); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -161,11 +161,11 @@ return AjaxResult.error("身份证号码错误"); } } if(cusIdcard.length()==9){ if (!MatchUtils.cardValidates(cusIdcard)) { return AjaxResult.error("身份证号码错误"); } } // if(cusIdcard.length()==9){ // if (!MatchUtils.cardValidates(cusIdcard)) { // return AjaxResult.error("身份证号码错误"); // } // } } @@ -655,16 +655,16 @@ //判断身份证号格式是否正确 if(sfjysfzh.equalsIgnoreCase("Y")){ if(tjCustomer.getCusIdcard().length()==18){ if(tjCustomer.getIdType().equals("1") ){ if (!(MatchUtils.isIdCard(tjCustomer.getCusIdcard()))) return AjaxResult.error("身份证号错误"); } if(tjCustomer.getCusIdcard().length()==9){ if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) { return AjaxResult.error("身份证号码错误"); } } // if(tjCustomer.getCusIdcard().length()==9){ // if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) { // return AjaxResult.error("身份证号码错误"); // } // } }
