From 21f801019a066d4eb412b2499c92a73cbb8cd69b Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 18 Mar 2026 14:07:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(System=E6=9C=8D=E5=8A=A1):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=89=E7=9C=BC=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=94=9F=E6=97=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将身份证号提取的生日字符串转换为 Date 对象 - 解决达梦数据库中 Druid 类型转换异常问题 --- .../java/org/jeecg/modules/system/task/AnYanUserInfoJob.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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() .eq(SysUser::getWorkNo, existingUser.getWorkNo()) - .set(SysUser::getBirthday, IdcardUtil.getBirthByIdCard(idNo)) + .set(SysUser::getBirthday, birthDate) ); } } From 156ccde7514c5f0b0f02eda9135ae1a8bceb41b5 Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Wed, 18 Mar 2026 15:16:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=BAMAP?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E7=94=A8=E5=8F=8C=E5=BC=95=E5=8F=B7=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=88=AB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consultation/mapper/ConDoctorMapper.java | 36 +++++++++---------- .../mapper/xml/ConCostStatisticsMapper.xml | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) 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 , MPJBaseMapper> getDocCountStatList(); @Select("SELECT\n" + @@ -238,9 +238,9 @@ public interface ConDoctorMapper extends BaseMapper , MPJBaseMapper , MPJBaseMapper> getDeptCountStatList(); @Select("SELECT\n" + @@ -260,9 +260,9 @@ public interface ConDoctorMapper extends BaseMapper , MPJBaseMapper , MPJBaseMapper> getDepartmentCountStatList(); @Select("SELECT\n" + @@ -284,9 +284,9 @@ public interface ConDoctorMapper extends BaseMapper , MPJBaseMapper , MPJBaseMapper> 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 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 <> '4' From d1e2f707aee2429328900d4c31e7db2197a7b6ba Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Wed, 18 Mar 2026 16:08:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=94=E6=80=A5=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/service/impl/DataDiagnosisServiceImpl.java | 2 +- .../data/service/impl/DataEmergencyServiceImpl.java | 2 +- .../data/service/impl/DataResourceServiceImpl.java | 2 +- .../emergency/mapper/xml/EmergencySeriousDiseaseMapper.xml | 6 +++--- health-watch/health-watch-start/src/main/resources/.env | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) 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 tableNames = Collections.singletonList("emergency_serious_disease"); + List tableNames = Collections.singletonList("QH_EME_SERIOUS_DIS"); Map 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 - from emergency_serious_disease a + from QH_EME_SERIOUS_DIS a and a.del_flag = '0' and a.status = 1 @@ -84,7 +84,7 @@ resultType="com.renkang.emergency.entity.EmergencySeriousDisease"> select - from emergency_serious_disease a + from QH_EME_SERIOUS_DIS a and a.del_flag = '0' and a.status = 1 and user_id = #{userId} @@ -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