diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml index 185f934..19a88a3 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMaintainMapper.xml @@ -12,7 +12,7 @@ aem.host_model as hostModel, aem.host_serial_num as hostSerialNum, aem.battery_life as batteryLife, - aem.`status` AS STATUS, + aem."status" AS STATUS, aem.control_org_name AS controlDept, aem.manage_user_name AS custodian, aem.manage_user_mobile AS custodianTel, @@ -53,7 +53,7 @@ aem.NAME AS NAME, aem.org_code AS orgCode, aem.CODE AS code, - aem.`status` AS STATUS, + aem."status" AS STATUS, aem.control_org_name AS controlDept, aem.custodian AS custodian, aem.custodian_tel AS custodianTel, @@ -89,7 +89,7 @@ t2.manage_user_name, t2.manage_user_mobile FROM - `aed_equipment_maintain` t1 + "aed_equipment_maintain" t1 LEFT JOIN aed_equipment_manger t2 ON t1.equipment_id = t2.id diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentTrainMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentTrainMapper.xml index 0213ba8..f33082c 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentTrainMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentTrainMapper.xml @@ -56,7 +56,7 @@ t2.install_address, t2.status FROM - `aed_equipment_train` t1 + "aed_equipment_train" t1 LEFT JOIN aed_equipment_manger t2 ON t1.equipment_id = t2.id and t1.flag = #{trainType} diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencyProfessionUserMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencyProfessionUserMapper.xml index 753270b..396c269 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencyProfessionUserMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencyProfessionUserMapper.xml @@ -6,7 +6,7 @@ DELETE t1 FROM emergency_schedules_new_item t1 INNER JOIN emergency_new_schedules t2 ON t1.schedules_id = t2.id - WHERE t2.schedules_time > NOW() + WHERE t2.schedules_time > SYSDATE AND t1.user_id = #{userId} @@ -28,7 +28,7 @@ and t1.type = #{type} - AND t1.realname like concat('%',#{name},'%') + AND t1.realname like '%' || #{name} || '%' and t1.center_id in diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySchedulesNewMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySchedulesNewMapper.xml index ba17e9e..5b1611a 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySchedulesNewMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/EmergencySchedulesNewMapper.xml @@ -6,8 +6,8 @@ FROM emergency_schedules_new_item t1 LEFT JOIN emergency_new_schedules t2 ON t1.schedules_id = t2.id WHERE - YEAR ( t2.schedules_time ) = #{year} - AND MONTH ( t2.schedules_time ) = #{month} + EXTRACT(YEAR FROM t2.schedules_time) = #{year} + AND EXTRACT(MONTH FROM t2.schedules_time) = #{month} and t2.schedules_time is not null AND t1.user_id = #{userId} 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 9503a7c..369741c 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 @@ -51,13 +51,13 @@ and a.del_flag = '0' and a.status = 1 - AND a.realname like concat('%',#{emergencySeriousDisease.realname},'%') + AND a.realname like '%' || #{emergencySeriousDisease.realname} || '%' - AND a.reservation_office like concat('%',#{emergencySeriousDisease.reservationOffice},'%') + AND a.reservation_office like '%' || #{emergencySeriousDisease.reservationOffice} || '%' - AND a.reservation_doctor like concat('%',#{emergencySeriousDisease.reservationDoctor},'%') + AND a.reservation_doctor like '%' || #{emergencySeriousDisease.reservationDoctor} || '%' AND a.hospital_id = #{emergencySeriousDisease.hospitalId} @@ -66,10 +66,10 @@ AND a.register_category = #{emergencySeriousDisease.registerCategory} - AND DATE(a.desire_time) = DATE(#{emergencySeriousDisease.desireTime}) + AND TRUNC(a.desire_time) = TRUNC(#{emergencySeriousDisease.desireTime}) - AND DATE(a.reservation_time) = DATE(#{emergencySeriousDisease.reservationTime}) + AND TRUNC(a.reservation_time) = TRUNC(#{emergencySeriousDisease.reservationTime}) AND a.operator_id = #{emergencySeriousDisease.operatorId} @@ -88,15 +88,16 @@ and a.del_flag = '0' and a.status = 1 and user_id = #{userId} - AND (`state` 4 or state = 7) + AND ("state" 4 or state = 7) - AND `state` ]]> 4 and state != 7 + AND "state" ]]> 4 and state != 7 order by a.create_time desc - + \ No newline at end of file diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/OrderMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/OrderMapper.xml index 408a750..e7fb083 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/OrderMapper.xml +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/xml/OrderMapper.xml @@ -38,11 +38,11 @@ salvage_user_sex = #{sex} - and salvage_user_depart like concat('', #{depart}, '%') + and salvage_user_depart like #{depart} || '%' and del_flag = 0 - GROUP BY Initiator_type; + GROUP BY Initiator_type diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/IEmergencyCenterServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/IEmergencyCenterServiceImpl.java index 0973a1f..361f53c 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/IEmergencyCenterServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/IEmergencyCenterServiceImpl.java @@ -332,9 +332,18 @@ public class IEmergencyCenterServiceImpl extends ServiceImpl() + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(EmergencyCenterAdmin::getUserId, GlobalUtils.getLoginUser().getId()) - .orderByDesc(EmergencyCenterAdmin::getCreateTime).last("limit 1")); + .orderByDesc(EmergencyCenterAdmin::getCreateTime); + + Page page = new Page<>(1, 1); + IPage pageResult = centerAdminService.page(page, wrapper); + + EmergencyCenterAdmin centerAdmin = null; + if (pageResult.getRecords() != null && !pageResult.getRecords().isEmpty()) { + centerAdmin = pageResult.getRecords().get(0); + } + if (ObjectUtil.isEmpty(centerAdmin)) { return new EmergencyCenter(); } @@ -354,7 +363,7 @@ public class IEmergencyCenterServiceImpl extends ServiceImpl(); @@ -366,7 +375,7 @@ public class IEmergencyCenterServiceImpl extends ServiceImpl list = list(centerWrapper); + center = CollUtil.isEmpty(list) ? null : list.get(0); } if (ObjectUtil.isNotEmpty(center)) { // 值班时间