From 8fd4cd9253102f196a1d01933e7f54385aafcc17 Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Fri, 6 Mar 2026 17:22:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(consultation):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BE=BE=E6=A2=A6=E6=95=B0=E6=8D=AE=E5=BA=93=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 SQL 中的 `type` 字段使用双引号转义为 `\"TYPE\"`
- 解决达梦数据库保留关键字导致的查询异常
- 影响模块:
  - ConDoctorSchedulingMapper.xml
  - ConDepartmentMapper.xml
---
 .../consultation/mapper/ConDoctorSchedulingMapper.java        | 2 +-
 .../renkang/consultation/mapper/xml/ConDepartmentMapper.xml   | 3 +--
 .../consultation/mapper/xml/ConDoctorSchedulingMapper.xml     | 2 +-
 .../com/renkang/consultation/mapper/xml/ConResourceMapper.xml | 4 ++--
 .../renkang/consultation/mapper/xml/ConSessionViewMapper.xml  | 2 +-
 .../java/com/renkang/HealthConsultationCloudApplication.java  | 3 ++-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorSchedulingMapper.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorSchedulingMapper.java
index ea8574b..c3146f7 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorSchedulingMapper.java
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorSchedulingMapper.java
@@ -38,7 +38,7 @@ public interface ConDoctorSchedulingMapper extends BaseMapper<ConDoctorSchedulin
     @Update("update con_doctor_scheduling set del_flag = 1 WHERE status = '1' and del_flag = '0' and user_id = #{userId}")
     public int deleteDoctorSchedule(String userId);
 
-    @Select("SELECT * FROM con_doctor_scheduling WHERE status = '1' and del_flag = '0' and user_id = #{userId} and scheduling_date >= DATE(NOW()) and week = #{week}")
+    @Select("SELECT * FROM con_doctor_scheduling WHERE status = '1' and del_flag = '0' and user_id = #{userId} and scheduling_date >= TRUNC(SYSDATE) and week = #{week}")
     public List<ConDoctorSchedulingDO> selectDoctorSchedulingByWeekAndUserId(String userId, String week);
 
     Boolean updateBatchById(@Param("list") List<ConDoctorScheduling> schedulingList);
diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDepartmentMapper.xml b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDepartmentMapper.xml
index 5a008b0..84cce23 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDepartmentMapper.xml
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDepartmentMapper.xml
@@ -137,12 +137,11 @@
 
     <select id="selectHospitalDepartmentId" resultType="com.renkang.consultation.entity.ConDepartmentDO">
         select
-            distinct  a.department_id as "id",
+            a.department_id as "id",
             b.department_name as "departmentName"
         from hospital_department a left join con_department b on a.department_id = b.id
         where a.hospital_id = #{hospitalId} and b.office_level = 1
         GROUP BY a.department_id,b.department_name
-        order by b.tf_top desc,b.sort
     </select>
 
     <select id="getMedicalDepartmentList" resultType="com.renkang.consultation.vo.MedicalDepartmentVO">
diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDoctorSchedulingMapper.xml b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDoctorSchedulingMapper.xml
index 03d9d14..33a5b49 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDoctorSchedulingMapper.xml
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConDoctorSchedulingMapper.xml
@@ -6,7 +6,7 @@
             UPDATE con_doctor_scheduling
             SET
             week = #{item.week},
-            `type` = #{item.type},
+            "TYPE" = #{item.type},
             am_num = #{item.amNum},
             pm_num = #{item.pmNum},
             tf_jump_holiday = #{item.tfJumpHoliday},
diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConResourceMapper.xml b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConResourceMapper.xml
index b2b2586..df7f8d0 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConResourceMapper.xml
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConResourceMapper.xml
@@ -31,8 +31,8 @@
     </select>
 
     <select id="selectBatchIds" resultType="com.renkang.consultation.entity.ConResource">
-        SELECT id, resource_name, longitude, latitude, type, second_type, aidrange, gd_id, url, province, city, area,
-        address, level, img, synopsis, sort, status, del_flag, create_by, create_time, update_by, update_time, memo,
+        SELECT id, resource_name, longitude, latitude, "TYPE", second_type, aidrange, gd_id, url, province, city, area,
+        address, "LEVEL", img, synopsis, sort, "STATUS", del_flag, create_by, create_time, update_by, update_time, memo,
         key_departments, user_score, user_score_num, resource_detail, tf_top
         FROM con_resource
         WHERE id IN
diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionViewMapper.xml b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionViewMapper.xml
index 290a264..6d5f2d6 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionViewMapper.xml
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionViewMapper.xml
@@ -55,7 +55,7 @@
     <!--@mbg.generated-->
     id, member_id, from_account, to_account, end_time, content_type, reservation_time, 
     session_type, from_name, member_name, to_name, im_id, session_time, third_account, 
-    third_name, cost, char_date, medical_records_id, `status`, del_flag, create_by, create_time, 
+    third_name, cost, char_date, medical_records_id, "STATUS", del_flag, create_by, create_time, 
     update_by, update_time, memo, content_status, session_date, week, am_pm, scheduling_date_id, 
     job_status, member_sex, member_age, session_status, doctor_start_time, doctor_end_time, 
     reject_reason, reason_type, org_code, from_type, tf_reply, reply_time, user_tf_reply, 
diff --git a/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java b/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java
index dd5fc7e..af7278c 100644
--- a/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java
+++ b/health-consultation/health-consultation-start/src/main/java/com/renkang/HealthConsultationCloudApplication.java
@@ -2,9 +2,10 @@ package com.renkang;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"})
+@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"},exclude = QuartzAutoConfiguration .class)
 @EnableFeignClients(basePackages = {"com.renkang", "org.jeecg"})
 public class HealthConsultationCloudApplication {