From 6e15fdc74abb44be1cedb2f71b6b25bec9c269d0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 二月 2025 11:11:04 +0800
Subject: [PATCH] zjh20250228
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 25 ++++++++++++++++++++++++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 18 +++++++++++-------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 6 ++++++
3 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index ec13e19..3f840e6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -19,6 +19,8 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.hisDto.*;
+import com.ltkj.hosp.mapper.TjOrderDetailMapper;
+import com.ltkj.hosp.mapper.TjOrderRemarkMapper;
import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
@@ -171,6 +173,12 @@
private ITjRulesService rulesService;
@Autowired
private ITjProAdvicerulesService tjProAdvicerulesService;
+
+ @Autowired
+ private TjOrderDetailMapper detailMapper;
+
+ @Autowired
+ private TjOrderRemarkMapper remarkMapper;
@@ -745,7 +753,10 @@
//濡傛灉璇ラ」鐩瓨鍦� 鍒� 涓嶄繚瀛�
TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
- if(null !=orderDetail) continue;
+// if(null !=orderDetail) continue;
+ if(null !=orderDetail) {
+ detailMapper.updateTjOrderDetailDel(orderDetail.getOrderDetailId().toString());
+ }
TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
if (null != projects) {
@@ -788,6 +799,12 @@
if(!projectList.isEmpty()){
List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
for (TjProject project : list) {
+
+ TjOrderRemark orderRemark = orderRemarkService.getTjOrderRemarkByTjNumAndProParentId(order.getTjNumber(), String.valueOf(project.getProId()));
+ if(null !=orderRemark){
+ remarkMapper.updateTjOrderRemarkdel(orderRemark.getRemarkId().toString());
+ }
+
TjOrderRemark tjOrderRemark = new TjOrderRemark();
tjOrderRemark.setProId(project.getProId());
tjOrderRemark.setProName(project.getProName());
@@ -802,6 +819,12 @@
tjOrderRemark.setJxbz(jxbz);
orderRemarkService.save(tjOrderRemark);
+
+ TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), project.getProId().toString());
+ if(null !=orderDetail) {
+ detailMapper.updateTjOrderDetailDel(orderDetail.getOrderDetailId().toString());
+ }
+
TjOrderDetail detail1 = new TjOrderDetail();
detail1.setTjStatus(0L);
detail1.setOrderId(tjFlowingWater.getOrderId());
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 3014b3a..d70edd2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -289,4 +289,10 @@
"a.update_time=SYSDATE()\n" +
"WHERE a.order_id=#{orderId} and isnull(a.jxbz)")
void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(@Param("orderId") String orderId,@Param("ls")String ls);
+
+
+ @Update("UPDATE tj_order_detail a SET\n" +
+ "a.deleted=1 \n" +
+ "WHERE a.order_detail_id=#{id}")
+ void updateTjOrderDetailDel(@Param("id") String id);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 52c516b..871d133 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -102,13 +102,13 @@
@Select("SELECT b.pro_id FROM tj_package_project a " +
"LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
- "WHERE b.type !=2 AND b.pro_id = a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
+ "WHERE b.deleted=0 and b.type !=2 AND b.pro_id = a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
List<Long> getTjProIdsByTjNumAndPacIc(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
@Select("SELECT b.pro_id FROM tj_package_project a " +
"LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
- "WHERE b.type !=2 AND b.pro_id != a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
+ "WHERE b.deleted=0 and b.type !=2 AND b.pro_id != a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
@@ -133,7 +133,7 @@
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
// " re.type != 2 AND\n" +
- " re.tj_number = #{tjNumber} and pro.need_report='Y'" +
+ " re.deleted=0 and re.tj_number = #{tjNumber} and pro.need_report='Y'" +
" <when test='sfzpacs == true'> " +
" AND dep.org_type = 2"+
" </when>"+
@@ -218,7 +218,7 @@
@Select({"<script>", "SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id ",
- " WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
+ " WHERE a.deleted=0 and b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} and a.dept_id in ",
"<foreach collection='split' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach>",
@@ -228,7 +228,7 @@
@Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
"\n" +
- "WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
+ "WHERE a.deleted=0 and b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber);
@@ -253,7 +253,7 @@
" LEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" +
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
- " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' " +
+ " re.deleted=0 and re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' " +
" AND dep.org_type in (1,2 )"+
"</script>"})
List<CsProVo> ysjcGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber);
@@ -279,7 +279,7 @@
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
// " re.type != 2 AND\n" +
- " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" +
+ " re.deleted=0 and re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%'" +
" AND dep.org_type = 1"+
"</script>"})
List<CsProVo> cSWebGetProByTjNumAndOrderIdJy(String tjNumber);
@@ -289,4 +289,8 @@
List<TjOrderRemark> shoufeiyemianyishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
List<TjOrderRemark> shoufeiyemianweishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
+
+
+ @Update("UPDATE tj_order_remark a SET a.deleted=1 WHERE a.remark_id=#{remarkId}")
+ void updateTjOrderRemarkdel(@Param("remarkId")String remarkId);
}
--
Gitblit v1.8.0