From e54ecd3c3cdf57c25d7dad004173ee46364fceec Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 20 六月 2024 22:14:59 +0800
Subject: [PATCH] zjh 本地 2024/06/20 --2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java | 3 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java | 3 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 15 +++++++++++++++
4 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index d71ee6b..eacdf66 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1918,6 +1918,7 @@
for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
Map<String, Object> map = new HashMap<>();
Long pacId = entry.getValue().get(0).getPacId();
+ map.put("proPrantId",entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
map.put("pacName", aPackage.getPacName());
@@ -1967,6 +1968,7 @@
for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
Map<String, Object> map = new HashMap<>();
Long pacId = entry.getValue().get(0).getPacId();
+ map.put("proPrantId",entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
map.put("pacName", aPackage.getPacName());
@@ -2543,5 +2545,18 @@
return AjaxResult.error(e.getMessage());
}
}
+
+
+ @GetMapping("/delTbBycusCardIdAndProId")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛韬唤璇佸彿鍜岄」鐩埗椤筰d鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ @Transactional
+ public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusCardId,
+ @RequestParam @ApiParam(value = "鐖堕」id") String proId) {
+
+ if (transitionService.delTbBycusCardIdAndProId(cusCardId,proId)) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("璁板綍涓嶅瓨鍦�!");
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index b0933a7..708e8e2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -72,6 +72,9 @@
@Delete("DELETE FROM tb_transition WHERE tj_num=#{tjNum}")
public boolean deletedTbTransitionByTjNum(String tjNum);
+ @Delete("DELETE FROM tb_transition WHERE isnull(tj_num) and cus_id=#{cdId} and parent_pro_id=#{proId}")
+ public boolean delTbBycusCardIdAndProId(@Param("cdId") String cdId,@Param("proId")String proId);
+
@Update("UPDATE tb_transition a SET "+
"a.tj_num=null" +
" WHERE a.tj_num=#{tjNum}")
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index f0fa86c..916b346 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -85,6 +85,9 @@
public boolean deletedTbTransitionByTjNum(String tjNum);
+
+ public boolean delTbBycusCardIdAndProId(String cdId,String proId);
+
//鏍规嵁韬唤璇佸彿鍜屽椁恑d鏌ヨ鍜岄」鐩甶d
public List<TbTransition> getTbTransitionListByCusIdAndPacIdAndProId(String cusId,String proId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index 48b3a70..f3be10c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -102,6 +102,11 @@
}
@Override
+ public boolean delTbBycusCardIdAndProId(String cdId, String proId) {
+ return tbTransitionMapper.delTbBycusCardIdAndProId(cdId,proId);
+ }
+
+ @Override
public boolean updateTbTransitionByTjNum(String tjNum) {
return tbTransitionMapper.updateTbTransitionByTjNum(tjNum);
}
--
Gitblit v1.8.0