From d771a24f1e0de92cb45bd06986c5da6cb19a0617 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 07 五月 2025 18:52:09 +0800
Subject: [PATCH] zjh20250507
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 8 +++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 10 +++++-----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 22 +++++++++++-----------
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index d941288..36f0a9f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/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);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index e7c9a49..68062a1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/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");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 85cb775..b5604d8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/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("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
}
--
Gitblit v1.8.0