smartor.git - Gitblit

			@@ -28,6 +28,7 @@
			<result property="archivetime" column="archivetime"/>
			<result property="archiveby" column="archiveby"/>
			<result property="telcode" column="telcode"/>
			<result property="telshortcode" column="telshortcode"/>
			<result property="relativetelcode" column="relativetelcode"/>
			<result property="idcardtype" column="idcardtype"/>
			<result property="orgid" column="orgid"/>
			@@ -90,6 +91,7 @@
			<result property="archivetime" column="archivetime"/>
			<result property="archiveby" column="archiveby"/>
			<result property="telcode" column="telcode"/>
			<result property="telshortcode" column="telshortcode"/>
			<result property="relativetelcode" column="relativetelcode"/>
			<result property="idcardtype" column="idcardtype"/>
			<result property="orgid" column="orgid"/>
			@@ -153,6 +155,7 @@
			archivetime,
			archiveby,
			telcode,
			telshortcode,
			relativetelcode,
			idcardtype,
			orgid,
			@@ -186,7 +189,6 @@
			<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
			<if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
			<if test="telcode != null and telcode != ''">and telcode = #{telcode}</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
			<if test="id != null and id != ''">and id = #{id}</if>
			<if test="isupload != null ">and isupload = #{isupload}</if>
			<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
			@@ -211,7 +213,7 @@
			<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>
			<if test="campusid != null ">and campusid = #{campusid}</if>
			<if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
			</select>


			@@ -280,6 +282,15 @@
			</foreach>
			</select>

			<select id="selectPatArchiveByPatidHiss" resultMap="PatArchiveResult">
			SELECT id, patid_his
			FROM pat_archive
			WHERE patid_his IN
			<foreach item="patidHis" collection="patidHiss" open="(" separator="," close=")">
			#{patidHis}
			</foreach>
			</select>

			<insert id="insertPatArchiveSingle" parameterType="com.smartor.domain.PatArchive" useGeneratedKeys="true"
			keyProperty="id">
			insert into pat_archive
			@@ -306,6 +317,7 @@
			<if test="archivetime != null">archivetime,</if>
			<if test="archiveby != null">archiveby,</if>
			<if test="telcode != null">telcode,</if>
			<if test="telshortcode != null">telshortcode,</if>
			<if test="relativetelcode != null">relativetelcode,</if>
			<if test="idcardtype != null">idcardtype,</if>
			<if test="orgid != null">orgid,</if>
			@@ -356,6 +368,7 @@
			<if test="archivetime != null">#{archivetime},</if>
			<if test="archiveby != null">#{archiveby},</if>
			<if test="telcode != null">#{telcode},</if>
			<if test="telshortcode != null">#{telshortcode},</if>
			<if test="relativetelcode != null">#{relativetelcode},</if>
			<if test="idcardtype != null">#{idcardtype},</if>
			<if test="orgid != null">#{orgid},</if>
			@@ -415,6 +428,7 @@
			<if test="archivetime != null">archivetime = #{archivetime},</if>
			<if test="archiveby != null">archiveby = #{archiveby},</if>
			<if test="telcode != null">telcode = #{telcode},</if>
			<if test="telshortcode != null">telshortcode = #{telshortcode},</if>
			<if test="relativetelcode != null">relativetelcode = #{relativetelcode},</if>
			<if test="idcardtype != null">idcardtype = #{idcardtype},</if>
			<if test="orgid != null">orgid = #{orgid},</if>
			@@ -491,6 +505,7 @@
			a.archivetime,
			a.archiveby,
			a.telcode,
			a.telshortcode,
			a.relativetelcode,
			a.idcardtype,
			a.orgid,
			@@ -564,6 +579,7 @@
			a.archivetime,
			a.archiveby,
			a.telcode,
			a.telshortcode,
			a.relativetelcode,
			a.idcardtype,
			a.orgid,
			@@ -702,6 +718,7 @@
			a.archivetime,
			a.archiveby,
			a.telcode,
			a.telshortcode,
			a.relativetelcode,
			a.idcardtype,
			a.orgid,
			@@ -795,6 +812,7 @@
			a.archivetime,
			a.archiveby,
			a.telcode,
			a.telshortcode,
			a.relativetelcode,
			a.idcardtype,
			a.orgid,
			@@ -887,6 +905,7 @@
			a.archivetime,
			a.archiveby,
			a.telcode,
			a.telshortcode,
			a.relativetelcode,
			a.idcardtype,
			a.orgid,
			@@ -912,10 +931,9 @@
			d.leavehospitaldistrictcode AS leavehospitaldistrictcode
			FROM
			pat_med_inhosp d
			JOIN pat_archive a ON a.id = d.patid
			LEFT JOIN pat_archive a ON a.id = d.patid
			where 1=1
			and 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>
			@@ -985,7 +1003,7 @@
			</if>

			<if test="pids != null">
			AND a.id NOT IN
			AND d.patid NOT IN
			<foreach collection="pids" item="pid" open="(" separator="," close=")">
			#{pid}
			</foreach>
			@@ -1122,6 +1140,7 @@
			a.archivetime,
			a.archiveby,
			a.telcode,
			a.telshortcode,
			a.relativetelcode,
			a.idcardtype,
			a.orgid,
			@@ -1180,12 +1199,10 @@

			<!-- 住院患者总数统计（去重） -->
			<select id="countPatArchiveInfoByInhospQC" parameterType="com.smartor.domain.PatArchiveReq" resultType="long">
			SELECT COUNT(DISTINCT a.id)
			SELECT COUNT(DISTINCT d.patid)
			FROM pat_med_inhosp d
			JOIN pat_archive a ON a.id = d.patid
			WHERE 1=1
			AND 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>
			@@ -1229,7 +1246,7 @@
			</foreach>
			</if>
			<if test="pids != null">
			AND a.id NOT IN
			AND d.patid NOT IN
			<foreach collection="pids" item="pid" open="(" separator="," close=")">
			#{pid}
			</foreach>