From 0c91527d745790246f993cf54ab36951ff2b9df1 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 22 五月 2025 13:41:45 +0800
Subject: [PATCH] fix: 修复客户提交的患者姓名为空的问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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 d4cb7e2..9ca4f68 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
@@ -130,9 +130,15 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
- model.setUserID(scApp.getUserId());
+// 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("涓浗"); // 璁剧疆鎮ｈ�呭浗绫�
@@ -168,7 +182,7 @@
model.setCondition(tbOrders.getRemark()); // 璁剧疆澶囨敞淇℃伅
}
-
+ model.setPrice(tbOrders.getBookingPrice().doubleValue());
model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
model.setReferrals(scApp.getReferrals()); // 璁剧疆鎺ㄤ粙浜哄悕绉颁负鏈烘瀯鍚嶇О
// model.setUnitRemarks("鍟嗘埛闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆鍟嗘埛澶囨敞
@@ -212,7 +226,7 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
- model.setUserID(scApp.getUserId());
+// model.setUserID(scApp.getUserId());
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
@@ -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()); // 璁剧疆杞叆鍖婚櫌
@@ -252,6 +275,7 @@
model.setOfferPrice(tbOrders.getBookingPrice().doubleValue()); // 鐢熸垚鎶ヤ环
+ model.setPrice(tbOrders.getBookingPrice().doubleValue());
model.setReferrals(scApp.getReferrals()); // 璁剧疆鎺ㄤ粙浜哄悕绉颁负鏈烘瀯鍚嶇О
// model.setUnitRemarks("鍟嗘埛闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆鍟嗘埛澶囨敞
model.setPayQRcodeURL(scApp.getPayUrl());
--
Gitblit v1.9.1