renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/xc' into xc

Browse Source
This commit is contained in:
hejiayang
2026-03-18 16:42:45 +08:00
parent 01982703f4 d1e2f707ae
commit bac673f2e8
8 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataDiagnosisServiceImpl.java
+1 -1
View File
@@ -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();
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataEmergencyServiceImpl.java
+1 -1
View File
@@ -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
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/data/service/impl/DataResourceServiceImpl.java
+1 -1
View File
@@ -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
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySeriousDiseaseMapper.xml
+3 -3
View File
@@ -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