From 9a76ada1b01a1f00482d8ec35a948fd8724bccb1 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 19 五月 2025 10:22:23 +0800
Subject: [PATCH] 修改日志保留时长
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
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 cb45766..e6b5ae0 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
@@ -25,6 +25,7 @@
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
+import com.ltkj.hosp.vo.ProFcListVo;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.hosp.vodomain.UpdateOrderRemarkVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
@@ -1685,16 +1686,20 @@
}
} else {
- String[] split = tjOrderDetail.getProResult().split("[銆�,锛�:锛�.\\s]+");
+ String regex = configService.selectConfigByKey("jcycjgfgzz");
+ if(StringUtil.isBlank(regex)) regex="銆倈锛泑;|,|锛�";
+ String[] split = tjOrderDetail.getProResult().replaceAll("\n", "").split(regex);
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- 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");
- Object nr = maps.get("nr");
- if (null != bt || null != nr) mapList.add(maps);
+ if(StringUtil.isNotBlank(s)){
+ s = s.replaceAll("\n", "").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");
+ Object nr = maps.get("nr");
+ if (null != bt || null != nr) mapList.add(maps);
+ }
}
}
tjOrderDetail.setAdvices(mapList);
@@ -1889,5 +1894,30 @@
return AjaxResult.success();
}
+ /**
+ * 鏌ヨ澶嶆煡椤圭洰鍒楄〃
+ * @param tjNum 浣撴鍙�
+ * @param type 澶嶆煡鐘舵�� 0鏈鏌ョ姸鎬� 1澶嶆煡鐘舵��
+ * @return
+ */
+ @GetMapping("/getFcList")
+ public AjaxResult getFcList(@RequestParam("tjNum") String tjNum,@RequestParam("type") Integer type){
+ TjOrder order = orderService.getOrderByTjNum(tjNum);
+ if (order == null)
+ return AjaxResult.error();
+ List<ProFcListVo> list = detailService.getFcList(order.getOrderId(),type);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 澶嶆煡椤圭洰鎻愪氦
+ * @param json
+ * @return
+ */
+ @PostMapping("/UpdFcPro")
+ public AjaxResult updFcPro(@RequestBody String json) {
+ return detailService.updFcPro(json);
+ }
+
}
--
Gitblit v1.8.0