From ae8a948289175ee300414901075fd24e6fb9ba97 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期五, 09 五月 2025 10:17:55 +0800
Subject: [PATCH] fix:Remark 和 Complaint 检测为空则不处理

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index 9f0414a..9923bc5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -148,8 +148,20 @@
             model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
             model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌
 //        model.setPtServices("绉戝" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮h�呮墍鍦ㄧ瀹�
-            model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
-            model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
+
+            //濡傛灉璇婃柇淇℃伅涓虹┖锛屽垯涓嶈缃瘖鏂俊鎭�
+            if(tbOrders.getComplaint() != null && !tbOrders.getComplaint().equals(""))
+            {
+                model.setPtDiagnosis(tbOrders.getComplaint()); // 璁剧疆璇婃柇淇℃伅
+            }
+
+            //濡傛灉澶囨敞淇℃伅涓虹┖锛屽垯涓嶈缃娉ㄤ俊鎭�
+            if(tbOrders.getRemark() != null && !tbOrders.getRemark().equals(""))
+            {
+                model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
+            }
+
+
 //        model.setDoctor("鍖荤敓" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮h�呭尰鐢�
 //        model.setDoctorPhone("13" + (int) (Math.random() * 900000000 + 100000000)); // 闅忔満鐢熸垚鎮h�呭尰鐢熺數璇�
             model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环

--
Gitblit v1.9.1