代码提交

liusheng

9 天以前 1d906908a013b6b991eeb0d9a116a04fdf0a7865

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

@@ -23,6 +23,7 @@
        <result property="idcardno" column="idcardno"/>
        <result property="birthdate" column="birthdate"/>
        <result property="age" column="age"/>
        <result property="age2" column="age2"/>
        <result property="sourcefrom" column="sourcefrom"/>
        <result property="archivetime" column="archivetime"/>
        <result property="archiveby" column="archiveby"/>
@@ -47,6 +48,7 @@
        <result property="bedNo" column="bedno"/>
        <result property="inhosptime" column="inhosptime"/>
        <result property="ageUnit" column="age_unit"/>
        <result property="ageUnit2" column="age_unit2"/>
        <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
        <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
        <result property="careFacilities" column="care_facilities"/>
@@ -58,6 +60,8 @@
        <result property="carePerson" column="care_person"/>
        <result property="casePersonAge" column="case_person_age"/>
        <result property="guid" column="guid"/>
        <result property="filterDrname" column="filter_drname"/>
        <result property="filterDrcode" column="filter_drcode"/>
    </resultMap>


@@ -80,6 +84,7 @@
        <result property="idcardno" column="idcardno"/>
        <result property="birthdate" column="birthdate"/>
        <result property="age" column="age"/>
        <result property="age2" column="age2"/>
        <result property="sourcefrom" column="sourcefrom"/>
        <result property="archivetime" column="archivetime"/>
        <result property="archiveby" column="archiveby"/>
@@ -105,6 +110,7 @@
        <result property="starttime" column="starttime"/>
        <result property="endtime" column="endtime"/>
        <result property="ageUnit" column="age_unit"/>
        <result property="ageUnit2" column="age_unit2"/>
        <result property="inhospno" column="inhospno"/>
        <result property="nurseId" column="nurse_id"/>
        <result property="nurseName" column="nurse_name"/>
@@ -113,6 +119,10 @@
        <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
        <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
        <result property="guid" column="guid"/>
        <result property="leavediagname" column="leavediagname"/>
        <result property="leaveicd10code" column="leaveicd10code"/>
        <result property="filterDrname" column="filter_drname"/>
        <result property="filterDrcode" column="filter_drcode"/>
    </resultMap>

    <sql id="selectPatArchiveVo">
@@ -120,14 +130,18 @@
               notrequired_flag,
               notrequiredreason,
               patientno,
               filter_drname,
               filter_drcode,
               patid_his,
               age_unit,
               age_unit2,
               sd_flag,
               name,
               sex,
               idcardno,
               birthdate,
               age,
               age2,
               nation,
               native_place,
               place_of_residence,
@@ -179,6 +193,9 @@
            <if test="patidHis != null ">and patid_his = #{patidHis}</if>
            <if test="sdFlag != null ">and sd_flag = #{sdFlag}</if>
            <if test="ageUnit != null ">and age_unit = #{ageUnit}</if>
            <if test="age != null ">and age = #{age}</if>
            <if test="age2 != null ">and age2 = #{age2}</if>
            <if test="ageUnit2 != null ">and age_unit2 = #{ageUnit2}</if>
            <if test="notrequiredFlag != null ">and notrequired_flag = #{notrequiredFlag}</if>
            <if test="notrequiredreason != null ">and notrequiredreason = #{notrequiredreason}</if>
            <if test="careFacilities != null ">and care_facilities = #{careFacilities}</if>
@@ -189,6 +206,8 @@
            <if test="medicareType != null ">and medicare_type = #{medicareType}</if>
            <if test="carePerson != null ">and care_person = #{carePerson}</if>
            <if test="casePersonAge != null ">and case_person_age = #{casePersonAge}</if>
            <if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
            <if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
        </where>
    </select>

@@ -197,6 +216,7 @@
        select
        a.id,
        a.age_unit,
        a.age_unit2,
        a.notrequired_flag,
        a.notrequiredreason,
        a.patientno,
@@ -208,6 +228,7 @@
        a.idcardtype,
        a.idcardno,
        a.age,
        a.age2,
        a.telcode,
        a.create_time,
        a.update_time,
@@ -220,11 +241,15 @@
        a.income,
        a.medicare_type,
        a.care_person,
        a.filter_drname,
        a.filter_drcode,
        a.case_person_age
        from pat_archive a,pat_archivetag b ,base_tag c
        <where>
            a.del_flag=0 and
            a.id = b.patid and b.tagid = c.tagid
            <if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
            <if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and idcardno = #{idcardno}</if>
            <if test="telcode != null  and telcode != ''">and telcode = #{telcode}</if>
@@ -239,6 +264,15 @@
    <select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
        <include refid="selectPatArchiveVo"/>
        where id = #{id} and del_flag=0
    </select>

    <select id="selectPatArchiveByPatnos" resultMap="PatArchiveResult">
        SELECT id, patientno
        FROM pat_archive
        WHERE patientno IN
        <foreach item="patno" collection="patnos" open="(" separator="," close=")">
            #{patno}
        </foreach>
    </select>

    <insert id="insertPatArchiveSingle" parameterType="com.smartor.domain.PatArchive" useGeneratedKeys="true"
@@ -262,6 +296,7 @@
            <if test="guid != null">guid,</if>
            <if test="birthdate != null">birthdate,</if>
            <if test="age != null">age,</if>
            <if test="age2 != null">age2,</if>
            <if test="sourcefrom != null">sourcefrom,</if>
            <if test="archivetime != null">archivetime,</if>
            <if test="archiveby != null">archiveby,</if>
@@ -278,6 +313,7 @@
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="ageUnit != null">age_unit,</if>
            <if test="ageUnit2 != null">age_unit2,</if>
            <if test="notrequiredFlag != null ">notrequired_flag,</if>
            <if test="notrequiredreason != null ">notrequiredreason,</if>
            <if test="careFacilities != null ">care_facilities,</if>
@@ -288,6 +324,8 @@
            <if test="medicareType != null ">medicare_type,</if>
            <if test="carePerson != null ">care_person,</if>
            <if test="casePersonAge != null ">case_person_age,</if>
            <if test="filterDrname != null ">filter_drname,</if>
            <if test="filterDrcode != null ">filter_drcode,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="patientno != null">#{patientno},</if>
@@ -307,6 +345,7 @@
            <if test="guid != null">#{guid},</if>
            <if test="birthdate != null">#{birthdate},</if>
            <if test="age != null">#{age},</if>
            <if test="age2 != null">#{age2},</if>
            <if test="sourcefrom != null">#{sourcefrom},</if>
            <if test="archivetime != null">#{archivetime},</if>
            <if test="archiveby != null">#{archiveby},</if>
@@ -323,6 +362,7 @@
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="ageUnit != null">#{ageUnit},</if>
            <if test="ageUnit2 != null">#{ageUnit2},</if>
            <if test="notrequiredFlag != null ">#{notrequiredFlag},</if>
            <if test="notrequiredreason != null ">#{notrequiredreason},</if>
            <if test="careFacilities != null ">#{careFacilities},</if>
@@ -333,21 +373,23 @@
            <if test="medicareType != null ">#{medicareType},</if>
            <if test="carePerson != null ">#{carePerson},</if>
            <if test="casePersonAge != null ">#{casePersonAge},</if>
            <if test="filterDrname != null ">#{filterDrname},</if>
            <if test="filterDrcode != null ">#{filterDrcode},</if>
        </trim>
    </insert>

    <insert id="insertPatArchive">
    <insert id="insertPatArchive" useGeneratedKeys="true" keyProperty="id">
        insert into
        pat_archive(name,viptype,sex,idcardno,birthdate,place_of_residence,age,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
        ,create_by,create_time,isupload,upload_time,pattype,nation,birthplace,native_place,patientno,patid_his,sd_flag,age_unit,notrequired_flag,notrequiredreason,care_facilities,case_path,
        degree_of_education,marital_status,income,medicare_type,care_person,case_person_age)
        pat_archive(name,viptype,sex,idcardno,birthdate,place_of_residence,age,age2,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
        ,create_by,create_time,isupload,upload_time,pattype,nation,birthplace,native_place,patientno,patid_his,sd_flag,age_unit,age_unit2,notrequired_flag,notrequiredreason,care_facilities,case_path,
        degree_of_education,marital_status,income,medicare_type,care_person,case_person_age,filter_drname,filter_drcode)
        values
        <foreach item="item" index="index" collection="list" separator=",">
            (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.placeOfResidence},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
            (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.placeOfResidence},#{item.age},#{item.age2},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
            ,#{item.telcode},#{item.archiveby},#{item.idcardtype},#{item.orgid},#{item.openid},#{item.dduserid},#{item.updateBy},
            #{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.nation},#{item.birthplace},#{item.nativePlace},#{item.patientno},
            #{item.patidHis},#{item.sdFlag},#{item.ageUnit},#{item.notrequiredFlag},#{item.notrequiredreason}
            ,#{item.careFacilities},#{item.casePath},#{item.degreeOfEducation},#{item.maritalStatus},#{item.income},#{item.medicareType},#{item.carePerson},#{item.casePersonAge})
            #{item.patidHis},#{item.sdFlag},#{item.ageUnit},#{item.ageUnit2},#{item.notrequiredFlag},#{item.notrequiredreason}
            ,#{item.careFacilities},#{item.casePath},#{item.degreeOfEducation},#{item.maritalStatus},#{item.income},#{item.medicareType},#{item.carePerson},#{item.casePersonAge},#{item.filterDrname},#{item.filterDrcode})
        </foreach>
    </insert>

@@ -361,6 +403,7 @@
            <if test="placeOfResidence != null">place_of_residence = #{placeOfResidence},</if>
            <if test="birthplace != null">birthplace = #{birthplace},</if>
            <if test="age != null">age = #{age},</if>
            <if test="age2 != null">age2 = #{age2},</if>
            <if test="sourcefrom != null">sourcefrom = #{sourcefrom},</if>
            <if test="archivetime != null">archivetime = #{archivetime},</if>
            <if test="archiveby != null">archiveby = #{archiveby},</if>
@@ -381,6 +424,7 @@
            <if test="viptype != null">patid_his = #{patidHis},</if>
            <if test="viptype != null">sd_flag = #{sdFlag},</if>
            <if test="ageUnit != null">age_unit = #{ageUnit},</if>
            <if test="ageUnit2 != null">age_unit2 = #{ageUnit2},</if>
            <if test="notrequiredFlag != null ">notrequired_flag = #{notrequiredFlag},</if>
            <if test="notrequiredreason != null ">notrequiredreason = #{notrequiredreason},</if>
            <if test="careFacilities != null ">care_facilities = #{careFacilities},</if>
@@ -392,22 +436,26 @@
            <if test="carePerson != null ">care_person = #{carePerson},</if>
            <if test="casePersonAge != null ">case_person_age = #{casePersonAge},</if>
            <if test="guid != null ">guid = #{guid},</if>
            <if test="filterDrname != null ">filter_drname = #{filterDrname},</if>
            <if test="filterDrcode != null ">filter_drcode = #{filterDrcode},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deletePatArchiveByPatid" parameterType="Long">
        delete
        from pat_archive
    <update id="deletePatArchiveByPatid" parameterType="Long">
        update pat_archive
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id = #{id}
    </delete>
    </update>

    <delete id="deletePatArchiveByPatids" parameterType="String">
        delete from pat_archive where id in
    <update id="deletePatArchiveByPatids" parameterType="String">
        update pat_archive set del_flag =1 where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
    </update>

    <select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
            resultMap="PatArchiveOthreInfoResult">
@@ -415,6 +463,7 @@
        SELECT
        a.id,
        a.age_unit,
        a.age_unit2,
        a.patid_his,
        a.notrequired_flag,
        a.notrequiredreason,
@@ -428,6 +477,7 @@
        a.birthplace,
        a.idcardno,
        a.birthdate,
        a.age2,
        a.age,
        a.sourcefrom,
        a.archivetime,
@@ -446,6 +496,8 @@
        a.upload_time,
        a.viptype,
        a.pattype,
        a.filter_drname,
        a.filter_drcode,
        b.tagname AS tag,
        b.tagid AS tagid
        FROM
@@ -453,6 +505,7 @@
        LEFT JOIN pat_archivetag b ON a.id = b.patid AND b.del_flag = 0
        <where>
            a.del_flag = 0
            and a.orgid = #{orgid}
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
            <if test="notrequiredFlag != null  and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
@@ -464,18 +517,19 @@
                    #{tagId}
                </foreach>
            </if>

        </where>
        order by a.update_time desc
        <if test="pn != null  and ps != null">limit ${pn},${ps}</if>

    </select>


    <select id="selectPatArchiveInfoByInhosp" parameterType="com.smartor.domain.PatArchiveReq"
            resultMap="PatArchiveOthreInfoResult">

        select
        a.id,
        a.age_unit,
        a.age_unit2,
        a.inhospno,
        a.notrequired_flag,
        a.notrequiredreason,
@@ -495,6 +549,7 @@
        a.idcardno,
        a.birthdate,
        a.age,
        a.age2,
        a.sourcefrom,
        a.archivetime,
        a.archiveby,
@@ -512,12 +567,13 @@
        a.isupload,
        a.upload_time,
        a.pattype,
        a.filter_drname,
        a.filter_drcode,
        d.bed_no,
        d.starttime,
        d.endtime,
        d.nurse_name,
        d.nurse_id,
        d.endtime,
        d.out_way_id,
        d.leavehospitaldistrictname AS leavehospitaldistrictname,
        d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
@@ -525,11 +581,13 @@
        FROM
        pat_med_inhosp d
        JOIN pat_archive a ON a.id = d.patid
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
        ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            and d.orgid = #{orgid}
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
            <if test="pid != null  and pid != ''">and a.id = #{id}</if>
@@ -577,6 +635,21 @@
                    #{leaveldeptcode}
                </foreach>
            </if>

            <if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size()>0">
                AND d.hospitaldistrictcode IN
                <foreach collection="hospitaldistrictcodes" item="hospitaldistrictcode" open="(" separator=","
                         close=")">
                    #{hospitaldistrictcode}
                </foreach>
            </if>
            <if test="deptcodes != null and deptcodes.size() > 0">
                AND d.deptcode IN
                <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                         close=")">
                    #{deptcode}
                </foreach>
            </if>
            <if test="pids != null">
                AND a.id NOT IN
                <foreach collection="pids" item="pid" open="(" separator="," close=")">
@@ -587,15 +660,17 @@
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
        order by a.update_time desc
        -- order by a.update_time desc
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>

    </select>

    <select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
            resultMap="PatArchiveOthreInfoResult">

        select
        a.id,
        a.age_unit,
        a.age_unit2,
        a.patid_his,
        a.sd_flag,
        a.patientno,
@@ -614,6 +689,7 @@
        a.idcardno,
        a.birthdate,
        a.age,
        a.age2,
        a.viptype,
        a.sourcefrom,
        a.archivetime,
@@ -630,13 +706,18 @@
        a.create_time,
        a.isupload,
        a.upload_time,
        a.filter_drname,
        a.filter_drcode,
        t.tagname,
        a.pattype
        from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
        ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            and d.orgid = #{orgid}
            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -671,7 +752,8 @@
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
        order by a.update_time desc
        -- order by a.update_time desc
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
    </select>

    <select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
@@ -680,6 +762,7 @@
        select
        a.id,
        a.age_unit,
        a.age_unit2,
        a.name,
        a.notrequired_flag,
        a.notrequiredreason,
@@ -699,6 +782,7 @@
        a.idcardno,
        a.birthdate,
        a.age,
        a.age2,
        a.sourcefrom,
        a.archivetime,
        a.archiveby,
@@ -714,13 +798,18 @@
        a.create_time,
        a.isupload,
        a.upload_time,
        a.filter_drname,
        a.filter_drcode,
        t.tagname,
        a.pattype
        from pat_med_physical d JOIN pat_archive a ON a.id = d.patid
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
        ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            and d.orgid = #{orgid}
            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -756,16 +845,18 @@
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
        order by a.update_time desc
        -- order by a.update_time desc
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
    </select>

    <select id="selectPatArchiveInfoByInhospQC" parameterType="com.smartor.domain.PatArchiveReq"
            resultMap="PatArchiveOthreInfoResult">

        select * from (
        select
        distinct a.idcardno,
        a.idcardno,
        a.id,
        a.age_unit,
        a.age_unit2,
        a.inhospno,
        a.notrequired_flag,
        a.notrequiredreason,
@@ -777,6 +868,8 @@
        d.deptcode,
        d.drcode,
        d.drname,
        d.leavediagname,
        d.leaveicd10code,
        a.sex,
        a.nation,
        a.native_place,
@@ -784,6 +877,7 @@
        a.birthplace,
        a.birthdate,
        a.age,
        a.age2,
        a.sourcefrom,
        a.archivetime,
        a.archiveby,
@@ -801,6 +895,8 @@
        a.isupload,
        a.upload_time,
        a.pattype,
        a.filter_drname,
        a.filter_drcode,
        d.bed_no,
        d.starttime,
        d.endtime,
@@ -813,11 +909,13 @@
        FROM
        pat_med_inhosp d
        JOIN pat_archive a ON a.id = d.patid
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
        ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            and d.orgid = #{orgid}
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
            <if test="pid != null  and pid != ''">and a.id = #{id}</if>
@@ -836,20 +934,22 @@
            <if test="endtime != null">
                AND d.endtime = #{endtime}
            </if>
            <if test="drname != null and drname != ''">
                AND d.drname LIKE concat('%',#{drname}, '%')
            </if>
            <if test="drcode != null">
                AND d.drcode = #{drcode}
            </if>
            <if test="allhosp != null and allhosp == 1 ">and d.endtime is null</if>
            <if test="allhosp != null and allhosp == 4 ">and d.endtime is not null</if>
            <if test="visitno != null and visitno != ''">
                AND d.inhospno = #{visitno}
            </if>
            <if test="deptname != null and deptname != ''">
                and d.deptname LIKE concat('%', #{deptname}, '%')
            </if>
            <if test="drname != null and drname != ''">
                AND d.drname LIKE concat('%',#{drname}, '%')
            </if>
            <if test="diagname != null and diagname != ''">
                AND d.diagname LIKE concat('%',#{diagname}, '%')
            </if>
            <if test="deptname != null and deptname != ''">
                AND d.deptname LIKE concat('%',#{deptname}, '%')
            <if test="leavediagname != null and leavediagname != ''">
                AND d.leavediagname LIKE concat('%',#{leavediagname}, '%')
            </if>
            <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size()>0">
                AND d.leavehospitaldistrictcode IN
@@ -865,6 +965,21 @@
                    #{leaveldeptcode}
                </foreach>
            </if>
            <if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size()>0">
                AND d.hospitaldistrictcode IN
                <foreach collection="hospitaldistrictcodes" item="hospitaldistrictcode" open="(" separator=","
                         close=")">
                    #{hospitaldistrictcode}
                </foreach>
            </if>
            <if test="deptcodes != null and deptcodes.size() > 0">
                AND d.deptcode IN
                <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                         close=")">
                    #{deptcode}
                </foreach>
            </if>

            <if test="pids != null">
                AND a.id NOT IN
                <foreach collection="pids" item="pid" open="(" separator="," close=")">
@@ -875,16 +990,18 @@
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
        order by a.update_time desc
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
        ) as tmp
    </select>

    <select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
            resultMap="PatArchiveOthreInfoResult">

        select
        distinct a.idcardno,
        a.idcardno,
        a.id,
        a.age_unit,
        a.age_unit2,
        a.patid_his,
        a.sd_flag,
        a.patientno,
@@ -902,6 +1019,7 @@
        a.birthplace,
        a.birthdate,
        a.age,
        a.age2,
        a.viptype,
        a.sourcefrom,
        a.archivetime,
@@ -918,13 +1036,18 @@
        a.create_time,
        a.isupload,
        a.upload_time,
        a.filter_drname,
        a.filter_drcode,
        t.tagname,
        a.pattype
        from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
        ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            and d.orgid = #{orgid}
            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -934,8 +1057,8 @@
            </if>
            <if test="notrequiredFlag != null  and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
            </if>
            <if test="diagname != null and diagname != ''">
                AND d.diagname LIKE concat('%',#{diagname}, '%')
            <if test="leavediagname != null and leavediagname != ''">
                AND d.diagname LIKE concat('%',#{leavediagname}, '%')
            </if>
            <if test="hospitalname != null and hospitalname != ''">
                AND d.hospitalname = #{hospitalname}
@@ -949,6 +1072,9 @@
            <if test="drname != null and drname != ''">
                AND d.drname LIKE concat('%',#{drname}, '%')
            </if>
            <if test="drcode != null">
                AND d.drcode = #{drcode}
            </if>
            <if test="pids != null">
                AND a.id NOT IN
                <foreach collection="pids" item="pid" open="(" separator="," close=")">
@@ -959,16 +1085,17 @@
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
        order by a.update_time desc
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
    </select>

    <select id="selectPatArchiveInfoByPhysicalQC" parameterType="com.smartor.domain.PatArchiveReq"
            resultMap="PatArchiveOthreInfoResult">

        select
        distinct a.idcardno,
        a.idcardno,
        a.id,
        a.age_unit,
        a.age_unit2,
        a.name,
        a.notrequired_flag,
        a.notrequiredreason,
@@ -987,6 +1114,9 @@
        a.viptype,
        a.birthdate,
        a.age,
        a.filter_drname,
        a.filter_drcode,
        a.age2,
        a.sourcefrom,
        a.archivetime,
        a.archiveby,
@@ -1002,13 +1132,16 @@
        a.create_time,
        a.isupload,
        a.upload_time,
        t.tagname,
        a.pattype
        from pat_med_physical d JOIN pat_archive a ON a.id = d.patid
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
        LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
        ) t ON t.patid =
        d.patid
        <where>
            d.del_flag != 1
            AND a.del_flag != 1
            and d.orgid = #{orgid}
            <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
            <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -1044,6 +1177,7 @@
                AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
            </if>
        </where>
        order by a.update_time desc
        -- order by a.update_time desc
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
    </select>
</mapper>