diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorMapper.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorMapper.java
index c4ce3e6..19bbd4a 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorMapper.java
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConDoctorMapper.java
@@ -222,15 +222,15 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
             "FROM\n" +
             "  (\n" +
             "    SELECT\n" +
-            "      conr.resource_name hospitalName,\n" +
-            "      count(doct.resource_id) docCount \n" +
+            "      conr.resource_name \"hospitalName\",\n" +
+            "      count(doct.resource_id) \"docCount\" \n" +
             "    FROM\n" +
             "      qh_con_resource conr\n" +
             "      LEFT JOIN qh_con_doctor doct ON conr.id = doct.resource_id \n" +
             "     WHERE conr.del_flag = 0 and doct.del_flag = 0 and doct.doctor_status = '1' \n" +
-            "    GROUP BY conr.id)  a\n" +
+            "    GROUP BY conr.resource_name)  a\n" +
             "ORDER BY\n" +
-            "  docCount DESC")
+            "  \"docCount\" DESC")
     List<Map<String, Object>> getDocCountStatList();
 
     @Select("SELECT\n" +
@@ -238,9 +238,9 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
             "FROM\n" +
             "  (\n" +
             "    SELECT\n" +
-            "      LEFT(org_code, 6) orgCode,\n" +
-            "      SUM(CASE WHEN c.session_type = '2' THEN 1 ELSE 0 END) AS consultHelperCount,\n" +
-            "      SUM(CASE WHEN c.session_type = '1' THEN 1 ELSE 0 END) AS consultDocCount\n" +
+            "      LEFT(org_code, 6) \"orgCode\",\n" +
+            "      SUM(CASE WHEN c.session_type = '2' THEN 1 ELSE 0 END) AS \"consultHelperCount\",\n" +
+            "      SUM(CASE WHEN c.session_type = '1' THEN 1 ELSE 0 END) AS \"consultDocCount\"\n" +
             "    FROM\n" +
             "      qh_con_session c \n" +
             "    WHERE\n" +
@@ -252,7 +252,7 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
             "    GROUP BY\n" +
             "  LEFT(org_code, 6)) a \n" +
             "ORDER BY\n" +
-            "  consultHelperCount DESC")
+            "  \"consultHelperCount\" DESC")
     List<Map<String, Object>> getDeptCountStatList();
 
     @Select("SELECT\n" +
@@ -260,9 +260,9 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
             "FROM\n" +
             "  (\n" +
             "    SELECT\n" +
-            "      cre.department_name departmentName,\n" +
-            "      SUM(CASE WHEN c.content_type = '1' THEN 1 ELSE 0 END) AS consultImCount,\n" +
-            "      SUM(CASE WHEN c.content_type = '2' THEN 1 ELSE 0 END) AS consultVedioCount\n" +
+            "      cre.department_name \"departmentName\",\n" +
+            "      SUM(CASE WHEN c.content_type = '1' THEN 1 ELSE 0 END) AS \"consultImCount\",\n" +
+            "      SUM(CASE WHEN c.content_type = '2' THEN 1 ELSE 0 END) AS \"consultVedioCount\"\n" +
             "    FROM\n" +
             "      qh_con_session c\n" +
             "      LEFT JOIN qh_con_doctor d ON c.to_account = d.id\n" +
@@ -274,9 +274,9 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
             "      AND c.session_type = '1' \n" +
             "      AND cre.id IS NOT NULL \n" +
             "    GROUP BY\n" +
-            "  cre.id) a \n" +
+            "  cre.department_name) a \n" +
             "ORDER BY\n" +
-            "  consultImCount DESC")
+            "  \"consultImCount\" DESC")
     List<Map<String, Object>> getDepartmentCountStatList();
 
     @Select("SELECT\n" +
@@ -284,9 +284,9 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
             "FROM\n" +
             "  (\n" +
             "    SELECT\n" +
-            "      cre.resource_name hospitalName,\n" +
-            "      SUM(CASE WHEN c.content_type = '1' THEN 1 ELSE 0 END) AS consultImCount,\n" +
-            "      SUM(CASE WHEN c.content_type = '2' THEN 1 ELSE 0 END) AS consultVedioCount\n" +
+            "      cre.resource_name \"hospitalName\",\n" +
+            "      SUM(CASE WHEN c.content_type = '1' THEN 1 ELSE 0 END) AS \"consultImCount\",\n" +
+            "      SUM(CASE WHEN c.content_type = '2' THEN 1 ELSE 0 END) AS \"consultVedioCount\"\n" +
             "    FROM\n" +
             "      qh_con_session c\n" +
             "      LEFT JOIN qh_con_doctor d ON c.to_account = d.id\n" +
@@ -298,8 +298,8 @@ public interface ConDoctorMapper extends BaseMapper<ConDoctor> , MPJBaseMapper<C
             "      AND c.session_type = '1' \n" +
             "      AND cre.id IS NOT NULL \n" +
             "    GROUP BY\n" +
-            "  cre.id) a \n" +
+            "  cre.resource_name) a \n" +
             "ORDER BY\n" +
-            "  consultImCount DESC")
+            "  \"consultImCount\" DESC")
     List<Map<String, Object>> getHospitalCountStatList();
 }
diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConCostStatisticsMapper.xml b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConCostStatisticsMapper.xml
index 0224936..9b61374 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConCostStatisticsMapper.xml
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConCostStatisticsMapper.xml
@@ -83,7 +83,7 @@
     </select>
 
     <select id="groupByMonthList" resultType="java.util.HashMap">
-        SELECT COUNT(cs.content_type) cou, cs.content_type
+        SELECT COUNT(cs.content_type) "cou", cs.content_type "contentType"
         FROM qh_con_session cs
         where cs.content_type is not null
         and cs.content_type &lt;&gt; '4'
@@ -93,7 +93,7 @@
 
 
     <select id="groupByTypehList" resultType="java.util.HashMap">
-        SELECT COUNT(cs.content_type) cou, cs.content_type, cs.session_status
+        SELECT COUNT(cs.content_type) "cou", cs.content_type "contentType", cs.session_status "sessionStatus"
         FROM qh_con_session cs
         where cs.content_type is not null
         and cs.content_type &lt;&gt; '4'
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataDiagnosisServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataDiagnosisServiceImpl.java
index 28c1d5d..2de1566 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataDiagnosisServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataDiagnosisServiceImpl.java
@@ -76,7 +76,7 @@ public class DataDiagnosisServiceImpl implements DataDiagnosisService {
 
     @Override
     public TableInfo tableStructure() {
-        List<String> tableNames = Collections.singletonList("emergency_serious_disease");
+        List<String> tableNames = Collections.singletonList("QH_EME_SERIOUS_DIS");
         Map<String, ColumnMetaData> columnInfo = analyzeTableManager.columnInfo(tableNames, DiagnosisData.class);
         TableCreateInfo createInfo = getTableCreateInfo();
         TableInfo tableInfo = new TableInfo();
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataEmergencyServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataEmergencyServiceImpl.java
index 93c902d..ff80290 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataEmergencyServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataEmergencyServiceImpl.java
@@ -32,7 +32,7 @@ public class DataEmergencyServiceImpl implements DataEmergencyService {
     @Override
     public TableInfo tableStructure() {
         return new TableInfo(new TableCreateInfo(TableInfoEnum.DEFAULT),
-                analyzeTableManager.columnInfo(Collections.singletonList("emergency_profession_user"), EmergencyProfessionUser.class));
+                analyzeTableManager.columnInfo(Collections.singletonList("QH_EME_PROFESS_USER"), EmergencyProfessionUser.class));
     }
 
     @Override
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataResourceServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataResourceServiceImpl.java
index 9451a7d..88c4572 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataResourceServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataResourceServiceImpl.java
@@ -76,7 +76,7 @@ public class DataResourceServiceImpl implements DataResourceService {
     @Override
     public TableInfo tableStructure() {
         return new TableInfo(new TableCreateInfo(TableInfoEnum.DEFAULT),
-                analyzeTableManager.columnInfo(Collections.singletonList("emergency_resource"), ResourceData.class));
+                analyzeTableManager.columnInfo(Collections.singletonList("QH_EME_RESOURCE"), ResourceData.class));
     }
 
     @Override
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySeriousDiseaseMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySeriousDiseaseMapper.xml
index 2b73a7b..1e03929 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySeriousDiseaseMapper.xml
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySeriousDiseaseMapper.xml
@@ -47,7 +47,7 @@
             resultType="com.renkang.emergency.entity.EmergencySeriousDisease">
         select
         <include refid="EmergencySeriousDiseaseColumns"/>
-        from emergency_serious_disease a
+        from QH_EME_SERIOUS_DIS a
         <where>
             and a.del_flag = '0' and a.status = 1
             <if test="emergencySeriousDisease.realname != null">
@@ -84,7 +84,7 @@
             resultType="com.renkang.emergency.entity.EmergencySeriousDisease">
         select
         <include refid="EmergencySeriousDiseaseColumns"/>
-        from emergency_serious_disease a
+        from QH_EME_SERIOUS_DIS a
         <where>
             and a.del_flag = '0' and a.status = 1 and user_id = #{userId}
             <if test="state != null and state != '' and state == '1'.toString()">
@@ -103,7 +103,7 @@
                      count(1)     AS num
               FROM QH_EME_SCHED_NEW_ITEM t1
                        LEFT JOIN QH_EME_NEW_SCHEDULES t2 ON t1.schedules_id = t2.id
-                       LEFT JOIN emergency_profession_user t3 ON t3.center_id = t2.center_id
+                       LEFT JOIN QH_EME_PROFESS_USER t3 ON t3.center_id = t2.center_id
               WHERE t3.user_id = #{userId}
                 AND TRUNC(t2.schedules_time) = TRUNC(SYSDATE)
         GROUP BY
diff --git a/health-watch/health-watch-start/src/main/resources/.env b/health-watch/health-watch-start/src/main/resources/.env
index a90a1ff..9e9cbbf 100644
--- a/health-watch/health-watch-start/src/main/resources/.env
+++ b/health-watch/health-watch-start/src/main/resources/.env
@@ -4,6 +4,6 @@ NACOS_SERVER_ADDR=192.168.1.80:8848
 NACOS_USERNAME=xjuser
 NACOS_PASSWORD=Aa135790!123
 NACOS_NAMESPACE=xjxc-space-common
-NACOS_NAMESPACE_DISCOVERY=xjxc-space-common
+NACOS_NAMESPACE_DISCOVERY=workspace_lian
 NACOS_GROUP=dev
 FILE_SERVER_URL=http://fileserver.yg.dt.io
\ No newline at end of file
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/task/AnYanUserInfoJob.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/task/AnYanUserInfoJob.java
index 077f47f..7fc3877 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/task/AnYanUserInfoJob.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/task/AnYanUserInfoJob.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.system.task;
 
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -108,9 +109,11 @@ public class AnYanUserInfoJob {
                         }
                         if (ObjectUtil.isNull(existingUser.getBirthday())) {
                             //同步生日
+                            String birthStr = IdcardUtil.getBirthByIdCard(idNo);
+                            Date birthDate = DateUtil.parse(birthStr, "yyyyMMdd");
                             sysUserService.update(new LambdaUpdateWrapper<SysUser>()
                                     .eq(SysUser::getWorkNo, existingUser.getWorkNo())
-                                    .set(SysUser::getBirthday, IdcardUtil.getBirthByIdCard(idNo))
+                                    .set(SysUser::getBirthday, birthDate)
                             );
                         }
                     }