From 5489d624e6642b459ecf8d143c548ac8a980a8c8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 15 一月 2025 11:36:14 +0800
Subject: [PATCH] zjh20250115
---
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-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 19 ++++++++++++++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java | 4 ++++
4 files changed, 29 insertions(+), 3 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 f6edc34..c92e1f5 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
@@ -1657,10 +1657,23 @@
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(),tjNumber);
- if(null !=maps && !maps.isEmpty()){
- tjOrderDetail.setAdvices(maps);
+ if(!tjOrderDetail.getDeptId().equals("2")){
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber);
+ if(null !=maps && !maps.isEmpty()){
+ tjOrderDetail.setAdvices(maps);
+ }
+ }else {
+ String[] split = tjOrderDetail.getProResult().split("銆�");
+ List<Map<String,Object>> mapList=new ArrayList<>();
+ for (String s : split) {
+ Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ if(null !=maps && !maps.isEmpty()){
+ mapList.add(maps);
+ }
+ }
+ tjOrderDetail.setAdvices(mapList);
}
+
}
dels.add(tjOrderDetail);
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 2a60f50..1c814f1 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
@@ -88,4 +88,8 @@
" #{tjnum,mode=IN,jdbcType=VARCHAR} )")
List<Map<String,Object>> getyichangxiangmujianyiguize1(@Param("xmbm") String xmbm,@Param("proId")String proId,
@Param("ycbz")String ycbz,@Param("tjnum")String tjnum);
+
+ @Select("call tj_ycjgjy_jc(\n" +
+ " #{jcjg,mode=IN,jdbcType=VARCHAR} )")
+ Map<String, Object> getyichangxiangmujianyiguizeJianCha(String jcjg);
}
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 e578519..9035622 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
@@ -21,4 +21,6 @@
List<TjRules> getTjRulesListByTjNumAndProId(String tjNum,Long proId);
List<Map<String,Object>> getyichangxiangmujianyiguize(String xmbm,String proId, String ycbz,String tjnum);
+
+ Map<String,Object> getyichangxiangmujianyiguizeJianCha(String jcjg);
}
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 e2277d9..28ac998 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
@@ -48,4 +48,11 @@
map.put("tjnum",tjnum);
return mapper.getyichangxiangmujianyiguize1(xmbm,proId,ycbz,tjnum);
}
+
+ @Override
+ public Map<String, Object> getyichangxiangmujianyiguizeJianCha(String jcjg) {
+ Map<String, Object> map=new HashMap<>();
+ map.put("jcjg",jcjg);
+ return mapper.getyichangxiangmujianyiguizeJianCha(jcjg);
+ }
}
--
Gitblit v1.8.0