From b814abb328d65253e1ecf0a2ed1055d09506c414 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 06 三月 2024 10:23:34 +0800
Subject: [PATCH] zjh 本地 2024/03/6 -1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |    6 +++++-
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java                 |    3 +++
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java  |    3 +++
 ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java                  |    1 +
 4 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 5877bb7..a453965 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -652,6 +652,9 @@
                 if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                     for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                         if(remark.getProId().equals(tjOrderDetail.getProId())){
+                            if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
+                                tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+                            }
                             dels.add(tjOrderDetail);
                         }
                     }
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 914a6e3..210b2f4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -835,7 +835,11 @@
                     if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
                         TjPdfVO tjPdfVO = new TjPdfVO();
                         tjPdfVO.setProName(tjOrderDetail.getProName());
-                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
+                        if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
+                            tjPdfVO.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+                        }else {
+                            tjPdfVO.setProResult(tjOrderDetail.getProResult());
+                        }
                         tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
                         tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
                         tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index 27573d3..c17652a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -210,6 +210,9 @@
     @TableField(exist = false)
     private String cusName;
 
+    @TableField(exist = false)
+    private String ycbz;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java
index bdc2e3e..2768a7d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHybgd.java
@@ -23,4 +23,5 @@
     private String shsj;
     private String shys;
     private String tpurl;
+    private String ycbz;
 }

--
Gitblit v1.8.0