~liusheng/smartor.git

			@@ -24,6 +24,7 @@
			<result property="orgid" column="orgid"/>
			<result property="openid" column="openid"/>
			<result property="delFlag" column="del_flag"/>
			<result property="dept" column="deptname"/>
			<result property="updateBy" column="update_by"/>
			<result property="updateTime" column="update_time"/>
			<result property="createBy" column="create_by"/>
			@@ -32,6 +33,8 @@
			<result property="uploadTime" column="upload_time"/>
			<result property="tag" column="tag"/>
			<result property="pattype" column="pattype"/>
			<result property="bedNo" column="bedno"/>
			<result property="inhosptime" column="inhosptime"/>
			</resultMap>

			<sql id="selectPatArchiveVo">
			@@ -94,6 +97,7 @@
			a.birthdate
			from pat_archive a,pat_archivetag b ,base_tag c
			<where>
			a.del_flag=0 and
			a.patid = b.patid and b.tagid = c.tagid
			<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
			<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
			@@ -108,7 +112,7 @@

			<select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
			<include refid="selectPatArchiveVo"/>
			where patid = #{patid}
			where patid = #{patid} and del_flag=0
			</select>

			<insert id="insertPatArchive">
			@@ -266,10 +270,9 @@
			resultMap="PatArchiveResult">

			select
			c.tagname as tag,
			b.tagid as tagid,
			a.patid,
			a.name,
			d.deptname,
			a.sex,
			a.nation,
			a.native_place,
			@@ -293,22 +296,25 @@
			a.create_time,
			a.isupload,
			a.upload_time,
			a.pattype
			from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
			a.pattype,
			d.bed_no,
			d.starttime as inhosptime
			from pat_archive a,pat_med_inhosp d
			<where>
			a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
			a.patid = d.patid
			<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.patid = #{pid}</if>
			<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
			<if test="tagIds != null and tagIds != ''">and c.tagid in
			<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
			#{tagId}
			</foreach>
			</if>

			<if test="hospitalname != null and hospitalname != ''">
			AND d.hospitalname = #{hospitalname}
			</if>
			<if test="hospitaldistrictname != null and hospitaldistrictname != ''">
			AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
			</if>
			<if test="leaveicd10code != null and leaveicd10code != ''">
			AND d.leaveicd10code LIKE concat('%',#{leaveicd10code}, '%')
			</if>
			<if test="endtime != null">
			AND d.endtime = #{endtime}
			@@ -322,10 +328,14 @@
			<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>

			AND d.del_flag != 1
			AND b.del_flag != 1
			AND c.del_flag != 1
			AND a.del_flag != 1
			</where>
			</select>
			@@ -334,9 +344,10 @@
			resultMap="PatArchiveResult">

			select
			c.tagname as tag,
			b.tagid as tagid,
			-- c.tagname as tag,
			-- b.tagid as tagid,
			a.patid,
			d.deptname,
			a.name,
			a.sex,
			a.nation,
			@@ -362,19 +373,25 @@
			a.isupload,
			a.upload_time,
			a.pattype
			from pat_archive a,pat_archivetag b ,base_tag c, pat_med_outhosp d
			-- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_outhosp d
			from pat_archive a, pat_med_outhosp d
			<where>
			a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
			a.patid = d.patid
			<if test="pid != null and pid != ''">and a.patid = #{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>
			<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
			<if test="tagIds != null and tagIds != ''">and c.tagid in
			<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
			#{tagId}
			</foreach>
			<!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
			<!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
			<!-- #{tagId}-->
			<!-- </foreach>-->
			<!-- </if>-->
			<if test="hospitaldistrictname != null and hospitaldistrictname != ''">
			AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
			</if>

			<if test="diagname != null and diagname != ''">
			AND d.diagname LIKE concat('%',#{diagname}, '%')
			</if>
			<if test="hospitalname != null and hospitalname != ''">
			AND d.hospitalname = #{hospitalname}
			</if>
			@@ -389,8 +406,8 @@
			</if>

			AND d.del_flag != 1
			AND b.del_flag != 1
			AND c.del_flag != 1
			-- AND b.del_flag != 1
			-- AND c.del_flag != 1
			AND a.del_flag != 1
			</where>
			</select>
			@@ -399,11 +416,12 @@
			resultMap="PatArchiveResult">

			select
			c.tagname as tag,
			b.tagid as tagid,
			a.patid,
			-- c.tagname as tag,
			-- b.tagid as tagid,
			a.patid as id,
			a.name,
			a.sex,
			d.deptname,
			a.nation,
			a.native_place,
			a.place_of_residence,
			@@ -427,19 +445,25 @@
			a.isupload,
			a.upload_time,
			a.pattype
			from pat_archive a,pat_archivetag b ,base_tag c, pat_med_physical d
			-- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_physical d
			from pat_archive a, pat_med_physical d
			<where>
			a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
			a.patid = d.patid
			<if test="pid != null and pid != ''">and a.patid = #{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>
			<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
			<if test="tagIds != null and tagIds != ''">and c.tagid in
			<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
			#{tagId}
			</foreach>
			<!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
			<!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
			<!-- #{tagId}-->
			<!-- </foreach>-->
			<!-- </if>-->
			<if test="hospitaldistrictname != null and hospitaldistrictname != ''">
			AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
			</if>

			<if test="diagname != null and diagname != ''">
			AND d.diagname LIKE concat('%',#{diagname}, '%')
			</if>
			<if test="hospitalname != null and hospitalname != ''">
			AND d.hospitalname = #{hospitalname}
			</if>
			@@ -455,11 +479,11 @@
			</if>

			AND d.del_flag != 1
			AND b.del_flag != 1
			AND c.del_flag != 1
			-- AND b.del_flag != 1
			-- AND c.del_flag != 1
			AND a.del_flag != 1
			</where>

			</select>

			</mapper>
			</mapper>