From 882f7ad646786ed96bb28533bcb5b4b496185eaf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 11 十二月 2024 11:59:06 +0800
Subject: [PATCH] zjh202412011
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 f8f75d5..472fb96 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
@@ -120,6 +120,8 @@
private HisApiConfigService hisApiConfigService;
@Autowired
private RedissonClient redissonClient;
+ @Autowired
+ private ITjRulesService rulesService;
// public void csdsrw() throws InterruptedException {
@@ -1612,11 +1614,6 @@
- /**
- * 鎬绘淇敼澶囨敞
- *
- * @return
- */
@GetMapping ("/getzongjianyishengchakanyichangxiangmu")
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰鎺ュ彛")
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
@@ -1627,7 +1624,7 @@
}
private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
- asyncService.updateCheckType(tjNumber);
+// asyncService.updateCheckType(tjNumber);
TjOrder one = orderService.getOrderByTjNum(tjNumber);
if (one == null) {
@@ -1643,6 +1640,13 @@
List<TjOrderDetail> dels = new ArrayList<>();
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),tjOrderDetail.getYcbz());
+ if(null !=maps && !maps.isEmpty()){
+ tjOrderDetail.setAdvices(maps);
+ }
+ }
+
dels.add(tjOrderDetail);
}
}
@@ -1660,4 +1664,14 @@
return AjaxResult.success("璇ヤ汉鍛樻病鏈変綋妫�椤圭洰鏁版嵁锛�");
}
+ @GetMapping ("/getyichangxiangmujianyiguize")
+ @ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰寤鸿瑙勫垯鎺ュ彛")
+ public AjaxResult getyichangxiangmujianyiguize(@RequestParam String proId,@RequestParam String ycbz) {
+ if (StrUtil.isNotBlank(proId) && StrUtil.isNotBlank(ycbz)) {
+ List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,ycbz);
+ return AjaxResult.success(map);
+ }
+ return AjaxResult.error();
+ }
+
}
--
Gitblit v1.8.0