From 8cb7fed2bc9279c7d60bdf41883e4f370e01b242 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 18 二月 2025 18:00:19 +0800
Subject: [PATCH] zjh20250218
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 8 ++++----
ltkj-admin/src/test/java/zjhTest.java | 21 +++++++++++++++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 28 +++++++++++++++++++++++++---
3 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
index f67a7c3..b1a9a57 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -152,12 +152,12 @@
List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
- if(jcsqd.getJgbx().contains("銆�")){
- String[] split = jcsqd.getJgzt().split("銆�");
+ if(jcsqd.getJgzt().contains("銆�") || jcsqd.getJgzt().contains("锛�") || jcsqd.getJgzt().contains(";")){
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅")
- && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+ && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
TjJcycxm jcycxm=new TjJcycxm();
jcycxm.setTjh(s);
jcycxm.setYqid(dictHosp.getCode());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 4e903f6..4ae85cd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -273,7 +273,7 @@
private void tbjiancha(String s) {
-
+ String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
try {
List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
@@ -284,6 +284,27 @@
List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
DynamicDataSourceContextHolder.clearDataSourceType();
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
+ for (LtkjExamJcsqd jcsqd : jcsqdList) {
+ if(jcsqd.getJgzt().contains("銆�") || jcsqd.getJgzt().contains("锛�") || jcsqd.getJgzt().contains(";")){
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
+ jcycxmService.deletedByTjh(s);
+ for (String jg : split) {
+ if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+ && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
+ TjJcycxm jcycxm=new TjJcycxm();
+ jcycxm.setTjh(s);
+ jcycxm.setYqid(yqbm);
+ String[] split1 = jcsqd.getJcxmid().split(";");
+ jcycxm.setProId(split1[0]);
+ jcycxm.setProName(jcsqd.getJcxmmc());
+ jcycxm.setCreateTime(new Date());
+ jcycxm.setJcjg(jg);
+ jcycxmService.save(jcycxm);
+ }
+ }
+ }
+ }
DynamicDataSourceContextHolder.clearDataSourceType();
}
} catch (Exception e) {
@@ -357,10 +378,11 @@
if(null !=list && !list.isEmpty()){
for (LtkjExamJcsqd jcsqd : list) {
if(jcsqd.getJgbx().contains("銆�")){
- String[] split = jcsqd.getJgzt().split("銆�");
+
+ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("銆倈锛泑;");
for (String jg : split) {
if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
&& !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")){
TjJcycxm jcycxm=new TjJcycxm();
jcycxm.setTjh(s);
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index da7386c..a80d879 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -5,6 +5,7 @@
import com.ltkj.LtkjApplication;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.service.*;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.joda.money.CurrencyUnit;
import org.joda.money.Money;
@@ -129,10 +130,22 @@
// BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10))));
// System.out.println(multiply);
- String a="鐧界粏鑳�(闄旽R)(WBC)";
- String s = a.replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "");
- System.out.println(s);
+ String a="涓诲姩鑴夌‖鍖栵紱\n" +
+ "宸﹀績鑸掑紶鍔熻兘鍑忎綆銆佹敹缂╁姛鑳芥甯革紱\n" +
+ "褰╄壊琛�娴佺ず锛氬悇鐡ｈ啘鏈鐥呯悊鎬ц繑娴併��";
+// String s = a.replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+// .replaceAll("[ 娴嬪畾妫�娴媇", "");
+
+ String[] split = a.replaceAll("\n", "").split("銆倈锛泑;");
+ for (String jg : split) {
+ if (StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+ && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+ && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")&& !jg.contains("鏃犳畩")) {
+ System.out.println(jg);
+ }
+ }
+
+// System.out.println(s);
}
--
Gitblit v1.8.0