From 86c2fdbef4ed64b5f38adb23fe8b54b79054550b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 17:29:48 +0800
Subject: [PATCH] zjh20250120
---
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 | 4 ++--
ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml | 2 +-
ltkj-admin/src/main/resources/application.yml | 3 +++
4 files changed, 10 insertions(+), 7 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 87d4ea3..439aa17 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
@@ -1156,8 +1156,8 @@
}
String str = " ";
List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
- detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("\\锛圼^\\锛塢*\\锛�", "")
- .replaceAll("[ 娴嬪畾]",""),detail.getProResult());
+ detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇",""),detail.getProResult());
if(detail.getDeptId().equals("2")){
String[] split = result.split("銆�");
for (String s : split) {
@@ -1224,8 +1224,8 @@
// }
String str = " ";
List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",
- i.get(2),tjOrder.getTjNumber(),i.get(0).replaceAll("\\锛圼^\\锛塢*\\锛�", "")
- .replaceAll("[ 娴嬪畾]",""),i.get(1));
+ i.get(2),tjOrder.getTjNumber(),i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇",""),i.get(1));
if (!maps.isEmpty()){
for (Map<String, Object> objectMap : maps) {
// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
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 839c23c..04439d8 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
@@ -1662,8 +1662,8 @@
if(!tjOrderDetail.getDeptId().equals("2")){
List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
- ,tjOrderDetail.getProName().replaceAll("\\锛圼^\\锛塢*\\锛�", "")
- .replaceAll("[ 娴嬪畾]","")
+ ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇","")
,tjOrderDetail.getProResult());
if(null !=maps && !maps.isEmpty()){
tjOrderDetail.setAdvices(maps);
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 4b88db1..f20af19 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -6,6 +6,9 @@
# linux-test
# linux-mjprod
# linux-mjtest
+# win-xamjyyprod
+# win-chkwyyprod
+# win-pbkwyyprod
# 闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌姝ｅ紡 5001
# 闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌娴嬭瘯 5002
# 闄曡タ瑗垮畨鐓ゆ満鍖婚櫌姝ｅ紡 5003
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml
index 8115424..39569af 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml
@@ -39,7 +39,7 @@
and bm like concat('%', #{bm}, '%')
</if>
<if test="ks != null and ks != ''">
- and ks = #{ks}
+ and ks like concat('%', #{ks}, '%')
</if>
<if test="jcxm != null and jcxm != ''">
and jcxm like concat('%', #{jcxm}, '%')
--
Gitblit v1.8.0