陈昶聿
2026-05-13 de428dd223bfc4a3b80578e8371f0915c77abaf4
【市一】定时任务优化
已修改4个文件
23 ■■■■ 文件已修改
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -115,6 +115,7 @@
            //同步住院病人信息
            List<Map<String, Object>> syncTemp = syncList.stream().filter(row -> row.get("syncName").equals("pat_med_inhosp")).collect(Collectors.toList());
            if (syncTemp.size() > 0) {
                log.info("startTime:" + syncTemp.get(0).get("startTime") + ", endTime: ", endTime);
                count += syncMedInhosp(syncTemp.get(0).get("startTime") + "", endTime);
                utilsMapper.updateSql("update sys_sync_time set startTime='" + endTime + "' where syncName='pat_med_inhosp' ");
            }
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -477,10 +477,10 @@
            <if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
            <if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
            <if test="lastStartTime != null and lastStartTime != ''">
                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
                and last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
            </if>
            <if test="lastEndTime != null and lastEndTime != ''">
                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
                and last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
            </if>
            <if test="pageSize != null and pageSize!='' ">and rownum&lt;#{pageSize}</if>
@@ -559,16 +559,16 @@
        healthy_inhosp b
        where 1=1
            <if test="startOutHospTime != null ">
                and to_char(b.endtime, 'YYYY-MM-DD HH24:MI:SS') &gt;=to_char(#{startOutHospTime},'YYYY-MM-DD HH24:MI:SS')
                and b.endtime &gt;= #{startOutHospTime}
            </if>
            <if test="endOutHospTime != null ">
                and to_char(b.endtime, 'YYYY-MM-DD HH24:MI:SS') &lt;= to_char(#{endOutHospTime},'YYYY-MM-DD HH24:MI:SS')
                and b.endtime &lt;= #{endOutHospTime}
            </if>
            <if test="startInHospTime != null ">
                and to_char(starttime, 'YYYY-MM-DD HH24:MI:SS') &gt;= to_char(#{startInHospTime},'YYYY-MM-DD HH24:MI:SS')
                and starttime &gt;= #{startInHospTime}
            </if>
            <if test="endInHospTime != null ">
                and to_char(starttime, 'YYYY-MM-DD HH24:MI:SS') &lt;=to_char(#{endInHospTime},'YYYY-MM-DD HH24:MI:SS')
                and starttime &lt;= #{endInHospTime}
            </if>
            <if test="inhospno != null ">and b.inhospno = #{inhospno}</if>
            <if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
@@ -581,10 +581,10 @@
            <if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
            <if test="orgid != null ">and b.orgid = #{orgid}</if>
            <if test="lastStartTime != null and lastStartTime != ''">
                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
                and last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
            </if>
            <if test="lastEndTime != null and lastEndTime != ''">
                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
                and last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
            </if>
    </select>
@@ -714,4 +714,4 @@
    </select>
</mapper>
</mapper>
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2416,7 +2416,7 @@
     * @return
     */
    @Override
//    @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
    @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
    public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
        log.info("getSfStatistics的入参为:{}", serviceSubtaskCountReq);
        String groupKey = "drcode";
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -396,7 +396,7 @@
        <if test="orgid != null and orgid != ''">
            and orgid = #{orgid}
        </if>
        <if test="serialnum != null ">
        <if test="serialnum != null and serialnum != ''">
            and b.serialnum = #{serialnum}
        </if>
        order by b.inhospid desc