1.新增同德药品采集、宣教功能 2.处理新华采集BUG 3.新增service_subtask的院区ID 4.采集同德的入院申请单信息 5.给出院表新...

liusheng

9 天以前 ec6b75cfebe87ad118aba001708e686bf28e2fde

 smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml

@@ -419,10 +419,12 @@
        pmo.drcode, pmo.drname, pmo.nurse_id, pmo.nurse_name
        from pat_med_operation pmo
        join pat_med_operation_item pmoi
        on pmoi.opcode = pmo.opcode
        on pmoi.opid = pmo.opid
        where
        pmo.del_flag = '0'
        and pmoi.del_flag = '0'
        and pmo.opid is not null
        and pmoi.opid is not null
        <if test="operationid != null ">
            and pmoi.operationid = #{operationid}
        </if>
@@ -486,6 +488,27 @@
        <if test="patid != null">
            and pmo.patid = #{patid}
        </if>
        <if test="deptCodes != null and deptCodes.size()>0">
            AND pmo.deptcode IN
            <foreach collection="deptCodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
            </foreach>
        </if>
        <if test="wardCodes != null and wardCodes.size()>0">
            AND pmo.hospitaldistrictcode IN
            <foreach collection="wardCodes" item="wardCode" open="(" separator=","
                     close=")">
                #{wardCode}
            </foreach>
        </if>
        <if test="opLevelCodes != null and opLevelCodes.size()>0">
            AND pmoi.oplevelcode IN
            <foreach collection="opLevelCodes" item="levelCode" open="(" separator=","
                     close=")">
                #{levelCode}
            </foreach>
        </if>
    </select>

</mapper>