From 52ee6ca100d1fb7aa4108e588d9125f942d1a624 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期三, 19 八月 2026 09:28:41 +0800
Subject: [PATCH] fix: update portal and merchant detail displays

---
 talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java b/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java
index 4db741c..1495ae6 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java
@@ -357,7 +357,10 @@
         if (merchant == null || merchant.isEmpty()) {
             throw new BusinessException(ErrorCode.NOT_FOUND, message);
         }
-        if (expectedType != null && !expectedType.equalsIgnoreCase(text(merchant, "merchantType", "merchant_type"))) {
+        String actualType = text(merchant, "merchantType", "merchant_type");
+        boolean medicalType = "medical".equalsIgnoreCase(expectedType)
+                && ("medical".equalsIgnoreCase(actualType) || "healthCheck".equalsIgnoreCase(actualType) || "免费体检".equals(actualType));
+        if (expectedType != null && !medicalType && !expectedType.equalsIgnoreCase(actualType)) {
             throw new BusinessException(ErrorCode.CONFLICT, message);
         }
         return merchant;

--
Gitblit v1.7.1