From e45e74e5ae207f7642be9a88ed99b593de89fb3b Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 24 六月 2026 16:54:46 +0800
Subject: [PATCH] 1.0
---
backend/src/main/java/com/sinata/appointment/service/AppointmentApplicationService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/backend/src/main/java/com/sinata/appointment/service/AppointmentApplicationService.java b/backend/src/main/java/com/sinata/appointment/service/AppointmentApplicationService.java
index 9f318ca..d87666c 100644
--- a/backend/src/main/java/com/sinata/appointment/service/AppointmentApplicationService.java
+++ b/backend/src/main/java/com/sinata/appointment/service/AppointmentApplicationService.java
@@ -196,6 +196,7 @@
vo.setLocalUnitText(defaultText(buildJsonNameText(order.getPassLocalUnitNames())));
vo.setPlateNoText(defaultText(loadOrderPlateText(id)));
vo.setVisitReasonText(defaultText(buildVisitReasonText(order, reasonNameMap)));
+ vo.setVisitReasonOther(defaultText(trimToNull(order.getVisitReasonOther())));
vo.setVisitTimeMode(trimToNull(order.getVisitTimeMode()));
vo.setVisitTimeSlot(trimToNull(order.getVisitTimeSlot()));
vo.setVisitStartText(defaultText(resolveVisitStartText(order)));
@@ -471,6 +472,7 @@
vo.setLocalUnitText(defaultText(buildJsonNameText(order.getPassLocalUnitNames())));
vo.setPlateNoText(defaultText(firstNonBlank(orderPlateText, joinUniqueTexts(visitorRows, AppointmentVisitor::getPlateNo), null)));
vo.setVisitReasonText(defaultText(buildVisitReasonText(order, reasonNameMap)));
+ vo.setVisitReasonOther(defaultText(trimToNull(order.getVisitReasonOther())));
vo.setVisitTimeText(defaultText(buildVisitTimeText(order)));
vo.setVisitorNamesText(defaultText(joinUniqueTexts(visitorRows, AppointmentVisitor::getName)));
vo.setStatus(order.getStatus());
@@ -545,6 +547,7 @@
row.setLocalUnitText(summary.getLocalUnitText());
row.setPlateNoText(defaultText(summary.getPlateNoText()));
row.setVisitReasonText(summary.getVisitReasonText());
+ row.setVisitReasonOther(summary.getVisitReasonOther());
row.setVisitTimeText(summary.getVisitTimeText());
row.setDisplayStatusText(summary.getDisplayStatusText());
MpVisitor visitor = visitorRow == null ? null : visitorMap.get(visitorRow.getMpVisitorId());
@@ -787,8 +790,7 @@
return null;
}
if ("OTHER".equalsIgnoreCase(code)) {
- String other = trimToNull(row.getVisitReasonOther());
- return StringUtils.hasText(other) ? other : "其他";
+ return "其他";
}
String reasonName = reasonNameMap.get(code);
return StringUtils.hasText(reasonName) ? reasonName : code;
--
Gitblit v1.7.1