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-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java | 2 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java | 7 +++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java | 10 +++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 26 ++++++++++++++++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java | 7 +++++++
5 files changed, 45 insertions(+), 7 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();
+ }
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index 039f8a6..5fb1f8c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -19,6 +19,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 浣撴椤圭洰鏄庣粏瀵硅薄 tj_order_detail
@@ -218,13 +219,20 @@
@TableField(exist = false)
private String ycbz;
-
/**
* 鍗曚綅
*/
@TableField(exist = false)
private String unit;
+ @TableField(exist = false)
+ private String bt;
+
+ @TableField(exist = false)
+ private String nr;
+ @TableField(exist = false)
+ private List<Map<String,Object>> advices;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
index b9ab218..86fa268 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.mapper;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjRuleAdvice;
@@ -72,4 +73,10 @@
@Select("SELECT b.* FROM tj_order_detail_rules a LEFT JOIN tj_rules b ON a.Aid=b.Aid WHERE a.tj_number=#{tjNum} AND a.pro_id=#{proId}")
List<TjRules> getTjRulesListByTjNumAndProId(@Param("tjNum") String tjNum,@Param("proId") Long proId);
+
+
+ @Select("SELECT a.advice_bt bt, a.advice_nr nr FROM tj_rules a JOIN tj_project b ON b.pro_id=a.pro_id\n" +
+ "\n" +
+ "WHERE b.lis_xmbm=#{proId} AND a.sign=#{ycbz}")
+ List<Map<String,Object>> getyichangxiangmujianyiguize(@Param("proId") String proId,@Param("ycbz") String ycbz);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
index 8769277..279768c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.service;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjRules;
@@ -19,4 +20,5 @@
List<TjRules> getTjRulesListByTjNumAndProId(String tjNum,Long proId);
+ List<Map<String,Object>> getyichangxiangmujianyiguize(String proId, String ycbz);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
index 78ae224..8cfc723 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
@@ -1,6 +1,8 @@
package com.ltkj.hosp.service.impl;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
@@ -35,4 +37,9 @@
public List<TjRules> getTjRulesListByTjNumAndProId(String tjNum, Long proId) {
return mapper.getTjRulesListByTjNumAndProId(tjNum,proId);
}
+
+ @Override
+ public List<Map<String,Object>> getyichangxiangmujianyiguize(String proId, String ycbz) {
+ return mapper.getyichangxiangmujianyiguize(proId,ycbz);
+ }
}
--
Gitblit v1.8.0