From e86f71e8bad848b782b20919ba24ac63d290c687 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期二, 02 一月 2024 18:25:47 +0800
Subject: [PATCH] 职业健康报表既往病史sql
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index d8c96a4..996055d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -509,7 +509,16 @@
TjReservation tjReservation = tjReservationService.selectTjReservationById(id);
if (null != tjReservation) {
if (null != tjReservation.getPacId()) {
- tjReservation.setPacName(packageService.getById(tjReservation.getPacId()).getPacName());
+ TjPackage aPackage = packageService.getById(tjReservation.getPacId());
+ if(null !=aPackage){
+ tjReservation.setPacName(aPackage.getPacName());
+ }
+ TjDwDept dwDept = dwDeptService.getById(tjReservation.getPacId());
+
+ if(null !=dwDept){
+ tjReservation.setPacName(dwDept.getDwName());
+ }
+
}
if (null != tjReservation.getProIds()) {
List<String> proNames = new ArrayList<>();
--
Gitblit v1.8.0