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