From dcd7d62c2bf627d22dfa042b7d92a913af6378c3 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 12:26:45 +0800
Subject: [PATCH] zjh20241205-3

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java |    5 +++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java            |    8 ++++++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java         |    2 ++
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java  |    5 +++++
 4 files changed, 20 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 d124182..71287d4 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
@@ -1717,6 +1717,11 @@
                 transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
                 List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
                 if (null != ppList && !ppList.isEmpty()) {
+                    String string = transitionService.panduantaocanshifouchongfu(cusId,pacId);
+                    if(!StringUtils.isBlank(string)){
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: "+string);
+                    }
                     transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
                 }
             }
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 c404c7b..9312fb3 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
@@ -281,4 +281,12 @@
             "</script>"
     })
     BigDecimal getLisPriceByTjNumAndInParentProId(@Param("tjNum") String tjNum, @Param("parentProId") List<String> parentProId);
+
+
+
+    @Select("SELECT GROUP_CONCAT(c.pro_name SEPARATOR ' ; ' ) FROM tj_package_project b JOIN tj_project c ON c.pro_id=b.pro_id\n" +
+            "\n" +
+            "WHERE b.pro_id IN(SELECT DISTINCT a.parent_pro_id FROM tb_transition a WHERE a.cus_id=#{idCard} AND ISNULL(a.tj_num))" +
+            "AND b.pac_id=#{pacId}")
+    String panduantaocanshifouchongfu(@Param("idCard") String idCard,@Param("pacId") Long pacId);
 }
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 08fcf4c..f3b1786 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
@@ -129,4 +129,6 @@
      boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId,String tjNumber);
 
     void deleteTjOrderDetailByjxbz(String bldh);
+
+    String panduantaocanshifouchongfu(String idCard,Long pacId);
 }
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 f44053f..a985920 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
@@ -212,4 +212,9 @@
     public void deleteTjOrderDetailByjxbz(String bldh) {
         tbTransitionMapper.deleteTjOrderDetailByjxbz(bldh);
     }
+
+    @Override
+    public String panduantaocanshifouchongfu(String idCard,Long pacId) {
+        return tbTransitionMapper.panduantaocanshifouchongfu(idCard,pacId);
+    }
 }

--
Gitblit v1.8.0