陈昶聿
20 小时以前 2943d0bb77c843bcf19645a366f98b8592efece9
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -221,7 +221,6 @@
        <result property="futypedesc" column="futypedesc"/>
        <result property="fuadvice" column="fuadvice"/>
        <result property="fuspecialadvice" column="fuspecialadvice"/>
        <result property="inhospMydFlag" column="inhosp_myd_flag"/>
    </resultMap>
    <resultMap type="com.smartor.domain.PatMedOuthosp" id="PatMedOuthospResult">
@@ -396,6 +395,10 @@
        <result property="deptname" column="deptname"/>
        <result property="hospitaldistrictcode" column="hospitaldistrictcode"/>
        <result property="hospitaldistrictname" column="hospitaldistrictname"/>
        <result property="leaveldeptcode" column="leaveldeptcode"/>
        <result property="leaveldeptname" column="leaveldeptname"/>
        <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
        <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
        <result property="roomno" column="roomno"/>
        <result property="bedNo" column="bed_no"/>
        <result property="drcode" column="drcode"/>
@@ -655,7 +658,6 @@
        b.leavehospitaldistrictname,
        b.leavehospitaldistrictid,
        b.deptid,
        b.inhosp_myd_flag,
        b.leaveldeptid
        FROM
        healthy_inhosp b
@@ -824,6 +826,7 @@
        o.paname,
        o.opreqid,
        o.opreqcode,
        o.canceltime,
        o.opsstatus,
        o.optypecode,
        o.optypename,
@@ -873,6 +876,10 @@
        o.deptname ,
        o.hospitaldistrictcode,
        o.hospitaldistrictname ,
        o.deptcode as leaveldeptcode,
        o.deptname as leaveldeptname,
        o.hospitaldistrictcode as leavehospitaldistrictcode,
        o.hospitaldistrictname as leavehospitaldistrictname,
        o.roomno  ,
        o.bed_no ,
        o.drcode  ,
@@ -881,7 +888,7 @@
        o.nurse_name ,
        o.check_flag ,
        o.long_task_reason,
        o.opid ,
        null as opid ,
        o.opcode ,
        o.opdesc,
        o.oplevelcode ,
@@ -891,6 +898,9 @@
        where 1=1
        <if test="orgid != null and orgid != ''">
            AND o.orgid = #{orgid}
        </if>
        <if test="opreqid != null and opreqid != ''">
            AND o.opreqid = #{opreqid}
        </if>
        <if test="lastStartTime != null and lastStartTime != ''">
            and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
@@ -904,7 +914,7 @@
            resultMap="PatMedOperationItemResult">
        select
               oi.operationid,
               oi.opid,
               null as opid,
               oi.opcode,
               oi.opdesc,
               oi.main_flag,
@@ -934,6 +944,9 @@
        <if test="opid != null and opid != ''">
            AND oi.opid = #{opid}
        </if>
        <if test="operationid != null and operationid != ''">
            AND oi.operationid = #{operationid}
        </if>
        <if test="lastStartTime != null and lastStartTime != ''">
            and oi.last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
        </if>