~liusheng/smartor.git

			@@ -169,10 +169,10 @@
			<!-- </trim>-->

			insert into
			pat_archive(name,viptype,sex,idcardno,birthdate,age,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
			pat_archive(name,viptype,sex,idcardno,birthdate,birthplace,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,place_of_residence,nation,birthplace,native_place) values
			<foreach item="item" index="index" collection="list" separator=",">
			(#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
			(#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.birthplace},#{item.placeOfResidence},#{item.age},#{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.placeOfResidence},#{item.nation},#{item.birthplace},#{item.nativePlace}
			)
			@@ -186,6 +186,8 @@
			<if test="sex != null">sex = #{sex},</if>
			<if test="idcardno != null">idcardno = #{idcardno},</if>
			<if test="birthdate != null">birthdate = #{birthdate},</if>
			<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="sourcefrom != null">sourcefrom = #{sourcefrom},</if>
			<if test="archivetime != null">archivetime = #{archivetime},</if>
			@@ -223,11 +225,9 @@
			<select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
			resultMap="PatArchiveResult">

			select
			c.tagname as tag,
			b.tagid as tagid,
			SELECT
			a.patid,
			a.name,
			a.NAME,
			a.sex,
			a.nation,
			a.native_place,
			@@ -252,22 +252,24 @@
			a.isupload,
			a.upload_time,
			a.viptype,
			a.pattype
			from pat_archive a,pat_archivetag b ,base_tag c
			a.pattype,
			b.tagname AS tag,
			b.tagid AS tagid
			FROM
			pat_archive a
			LEFT JOIN pat_archivetag b ON a.patid = b.patid AND b.del_flag = 0
			<where>
			a.patid = b.patid and b.tagid = c.tagid
			a.del_flag = 0
			<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
			<if test="tagIds != null and tagIds != ''">and b.tagid in
			<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
			#{tagId}
			</foreach>
			</if>
			AND b.del_flag != 1
			AND c.del_flag != 1
			AND a.del_flag != 1

			</where>
			</select>

			@@ -277,7 +279,7 @@

			select
			a.patid,
			a.name,
			a.NAME,
			d.deptname,
			a.sex,
			a.nation,
			@@ -305,10 +307,14 @@
			a.upload_time,
			a.pattype,
			d.bed_no,
			d.starttime as inhosptime
			from pat_archive a,pat_med_inhosp d
			d.starttime AS inhosptime,
			t.tagname
			FROM
			pat_med_inhosp d
			JOIN pat_archive a ON a.patid = d.patid
			LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
			d.patid
			<where>
			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>
			@@ -384,9 +390,10 @@
			a.isupload,
			a.upload_time,
			a.pattype
			from pat_archive a, pat_med_outhosp d
			from pat_med_outhosp d JOIN pat_archive a ON a.patid = d.patid
			LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
			d.patid
			<where>
			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>
			@@ -452,9 +459,10 @@
			a.isupload,
			a.upload_time,
			a.pattype
			from pat_archive a, pat_med_physical d
			from pat_med_physical d JOIN pat_archive a ON a.patid = d.patid
			LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
			d.patid
			<where>
			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>