From aa17e1c55a7093a95f506c0343c6dcfe49d91161 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 21 十月 2024 17:52:26 +0800
Subject: [PATCH] 体检状态判断修改

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 2f3b4d1..c8cf8c4 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
@@ -942,9 +942,9 @@
             //            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
             tjReservation.setIsExpire(1);
             tjReservationService.updateById(tjReservation);
-            if (null != tjReservation.getTeamNo()) {
+            if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
                 tjOrder.setTjType("1");
-            } else {
+            } else if (tjOrder.getTjType().equals("2")){
                 tjOrder.setTjType("2");
             }
         }

--
Gitblit v1.8.0