Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -156,8 +156,8 @@
    <select id="selectPatMedOperationList" parameterType="com.smartor.domain.PatMedOperation"
            resultMap="PatMedOperationResult">
        <include refid="selectPatMedOperationVo"/>
        <where>
            del_flag='0'
        where 1=1
            and del_flag='0'
            <if test="patid != null ">
                and patid = #{patid}
            </if>
@@ -356,7 +356,6 @@
            <if test="opleveldesc != null  and opleveldesc != ''">
                and opleveldesc = #{opleveldesc}
            </if>
        </where>
    </select>

    <select id="selectPatMedOperationById" parameterType="Long"