~liusheng/smartor.git

			@@ -27,7 +27,6 @@
			<result property="isupload" column="isupload"/>
			<result property="uploadTime" column="upload_time"/>
			<result property="deptNames" column="dept_names"/>
			<result property="labelInfo" column="label_info"/>
			<result property="campus" column="campus"/>
			<result property="suitway" column="suitway"/>
			<result property="otherdata" column="otherdata"/>
			@@ -63,7 +62,6 @@
			isupload,
			upload_time,
			dept_names,
			label_info,
			campus,
			suitway,
			script_score,
			@@ -73,16 +71,45 @@

			<select id="selectSvyLibTemplateList" parameterType="com.smartor.domain.SvyLibTemplateReq"
			resultMap="SvyLibTemplateResult">
			select a.svyid, a.categoryid, a.svycode, a.svyname, a.description, a.introduce,a.submitprompt, a.templateid,
			a.version,a.centerlibrarycode, a.centerlibraryid, a.islocal, a.isenable, a.orgid, a.del_flag, a.create_by,
			a.create_time, a.update_by, a.update_time, a.isupload,
			a.upload_time,a.dept_names,a.value_type,a.label_info,a.reply,
			a.campus,a.suitway,a.script_score,a.score_type,a.otherdata
			,c.icdname from svy_lib_template
			a,icd10_association b,icd10 c
			SELECT
			a.svyid,
			a.categoryid,
			a.svycode,
			a.svyname,
			a.description,
			a.introduce,
			a.submitprompt,
			a.templateid,
			a.version,
			a.centerlibrarycode,
			a.centerlibraryid,
			a.islocal,
			a.isenable,
			a.orgid,
			a.del_flag,
			a.create_by,
			a.create_time,
			a.update_by,
			a.update_time,
			a.isupload,
			a.upload_time,
			a.dept_names,
			a.value_type,
			a.reply,
			a.campus,
			a.suitway,
			a.script_score,
			a.score_type,
			a.otherdata,
			b.icd10code,
			b.icd10name
			FROM
			svy_lib_template a
			LEFT JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
			icd10_association group by outid) b ON a.del_flag = 0
			AND a.svyid = b.outid
			<where>
			a.del_flag=0 and
			a.svyid=b.SVYID and b.ICD10CODE=c.icdcode
			a.del_flag=0
			<if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
			<if test="svyid != null ">and a.svyid = #{svyid}</if>
			<if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
			@@ -121,7 +148,6 @@
			<if test="isupload != null">isupload,</if>
			<if test="uploadTime != null">upload_time,</if>
			<if test="deptNames != null">dept_names,</if>
			<if test="labelInfo != null">label_info,</if>
			<if test="campus != null">campus,</if>
			<if test="suitway != null">suitway,</if>
			<if test="otherdata != null">otherdata,</if>
			@@ -152,7 +178,6 @@
			<if test="isupload != null">#{isupload},</if>
			<if test="uploadTime != null">#{uploadTime},</if>
			<if test="deptNames != null">#{deptNames},</if>
			<if test="labelInfo != null">#{labelInfo},</if>
			<if test="campus != null">#{campus},</if>
			<if test="suitway != null">#{suitway},</if>
			<if test="otherdata != null">#{otherdata},</if>
			@@ -187,7 +212,6 @@
			<if test="isupload != null">isupload = #{isupload},</if>
			<if test="uploadTime != null">upload_time = #{uploadTime},</if>
			<if test="deptNames != null">dept_names=#{deptNames},</if>
			<if test="labelInfo != null">label_info=#{labelInfo},</if>
			<if test="campus != null">campus=#{campus},</if>
			<if test="suitway != null">suitway=#{suitway},</if>
			<if test="otherdata != null">otherdata=#{otherdata},</if>