From e961d2daa7f0fab9257ec411491cb23ab8a6c919 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 22 五月 2025 17:42:55 +0800
Subject: [PATCH] fix: 修复地址不显示的问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 0b35ee0..f53cd8c 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
@@ -132,7 +132,13 @@
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
model.setUserID(scApp.getUserId());
- model.setOrdType(tbOrders.getTypeCode().intValue());
+ //璁剧疆璁㈠崟绫诲瀷
+ if(tbOrders.getTypeCode() == 0) {
+ model.setOrdType(1);
+ } else {
+ model.setOrdType(tbOrders.getTypeCode().intValue());
+ }
+
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
// model.setCoTies("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
@@ -140,8 +146,16 @@
Calendar calendar = Calendar.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
+
+ if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals(""))
+ {
+ model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ }
+ else
+ {
+ model.setPtName("鎮ｈ��"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
- model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
@@ -223,9 +237,18 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
- model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ if(tbOrders.getPatientName() != null && !tbOrders.getPatientName().equals(""))
+ {
+ model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
+ }
+ else
+ {
+ model.setPtName("鎮ｈ��"); // 闅忔満鐢熸垚鎮ｈ�呭鍚�
+ }
+
+
model.setPtAge(tbOrders.getAge()); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
- model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
+ model.setPtSex(tbOrders.getSex() == 1 ? "鐢�" : "濂�");
// model.setPtNat("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
model.setOutHosp(tbOrders.getLocalAddress()); // 璁剧疆杞嚭鍖婚櫌
model.setInHosp(tbOrders.getSendAddress()); // 璁剧疆杞叆鍖婚櫌
--
Gitblit v1.9.1