tx-lims-after.git

			@@ -29,6 +29,7 @@
			SELECT
			a.*,
			ios.ins_state,
			ios.is_out,
			ios.laboratory son_laboratory,
			ios.verify_tell,
			verify_user,
			@@ -53,7 +54,7 @@
			io.send_time,
			isa.id sampleId,
			isa.sample sample,
			isa.sample_code sampleCode,
			isa.sample_code ,
			userName,
			userNameId,
			checkName,
			@@ -80,6 +81,9 @@
			ORDER BY ins_sample_id
			)isu2 ON isu2.ins_sample_id = isa.id
			WHERE io.state = 1 and send_time is not null
			<if test="sampleCode !=null and sampleCode!=''">
			and (isa.sample_code like CONCAT ('%', #{sampleCode},'%') )
			</if>
			<if test="userName !=null and userName!=''">
			and ( (userName like CONCAT ('%', #{userName},'%') )
			or (checkName like CONCAT ('%', #{userName},'%') ) )
			@@ -94,6 +98,7 @@
			ios.create_time
			) b
			where ins_state is not null
			and (is_out is null or is_out !=1)
			and son_laboratory=#{sonLaboratory}
			and state =1
			<if test="laboratory!=null and laboratory!=''">
			@@ -150,7 +155,7 @@
			</if>
			OR isu.user_id is NULL
			) a
			ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and a.sampleId=ios.ins_sample_id
			ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and a.sampleId=ios.ins_sample_id
			left join
			(SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM
			ins_sample_user where son_laboratory=#{sonLaboratory} GROUP BY ins_sample_id) md where td.id = md.id
			@@ -180,6 +185,7 @@
			inspection_item_class_en,
			inspection_item_subclass,
			inspection_item_subclass_en,

			ip.factory ip_factory,
			ip.laboratory ip_laboratory,
			ip.sample_type ip_sample_type,
			@@ -269,6 +275,7 @@
			ipr.before_note,
			ipr.after_check,
			ipr.after_note,
			ipr.test_result,
			ipr2.frequency,
			ipr2.often,
			ipr2.port,
			@@ -341,6 +348,7 @@
			ipr.before_note,
			ipr.after_check,
			ipr.after_note,
			ipr.test_result,
			ipr2.frequency,
			ipr2.often,
			ipr2.port,
			@@ -373,21 +381,21 @@
			</select>
			<select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
			select isa.*,
			ios.num num1,
			ip.id ip_id,
			ios.num num1,
			ip.id ip_id,
			inspection_item,
			inspection_item_en,
			inspection_item_subclass,
			inspection_item_subclass_en,
			inspection_item_class,
			inspection_item_class_en,
			ip.factory ip_factory,
			ip.laboratory ip_laboratory,
			ip.sample_type ip_sample_type,
			ip.sample ip_sample,
			ip.model ip_model,
			ip.factory ip_factory,
			ip.laboratory ip_laboratory,
			ip.sample_type ip_sample_type,
			ip.sample ip_sample,
			ip.model ip_model,
			son_laboratory,
			ip.unit ip_unit,
			ip.unit ip_unit,
			price,
			man_hour,
			man_hour_group,
			@@ -403,13 +411,13 @@
			ask,
			tell,
			`last_value`,
			ip.ins_result ip_ins_result,
			ip.ins_result ip_ins_result,
			state,
			ip.ins_sample_id,
			ip.create_user ip_create_user,
			ip.update_user ip_update_user,
			ip.create_time ip_create_time,
			ip.update_time ip_update_time,
			ip.create_user ip_create_user,
			ip.update_user ip_update_user,
			ip.create_time ip_create_time,
			ip.update_time ip_update_time,
			template_id,

			ip.method_s
			@@ -422,21 +430,21 @@
			</select>
			<select id="selectSampleProductListByOrder2Id2" resultMap="sampleDto">
			select isa.*,
			ios.num num1,
			ip.id ip_id,
			ios.num num1,
			ip.id ip_id,
			inspection_item,
			inspection_item_en,
			inspection_item_subclass,
			inspection_item_subclass_en,
			inspection_item_class,
			inspection_item_class_en,
			ip.factory ip_factory,
			ip.laboratory ip_laboratory,
			ip.sample_type ip_sample_type,
			ip.sample ip_sample,
			ip.model ip_model,
			ip.factory ip_factory,
			ip.laboratory ip_laboratory,
			ip.sample_type ip_sample_type,
			ip.sample ip_sample,
			ip.model ip_model,
			son_laboratory,
			ip.unit ip_unit,
			ip.unit ip_unit,
			price,
			man_hour,
			man_hour_group,
			@@ -452,13 +460,13 @@
			ask,
			tell,
			`last_value`,
			ip.ins_result ip_ins_result,
			ip.ins_result ip_ins_result,
			state,
			ip.ins_sample_id,
			ip.create_user ip_create_user,
			ip.update_user ip_update_user,
			ip.create_time ip_create_time,
			ip.update_time ip_update_time,
			ip.create_user ip_create_user,
			ip.update_user ip_update_user,
			ip.create_time ip_create_time,
			ip.update_time ip_update_time,
			template_id,
			ip.method_s
			from ins_sample isa
			@@ -543,6 +551,7 @@
			ipr.before_note,
			ipr.after_check,
			ipr.after_note,
			ipr.test_result,
			ipr2.frequency,
			ipr2.often,
			ipr2.port,
			@@ -613,6 +622,7 @@
			ipr.before_note,
			ipr.after_check,
			ipr.after_note,
			ipr.test_result,
			ipr2.frequency,
			ipr2.often,
			ipr2.port,
			@@ -681,6 +691,7 @@
			ipr.before_note,
			ipr.after_check,
			ipr.after_note,
			ipr.test_result,
			ipr2.frequency,
			ipr2.often,
			ipr2.port,
			@@ -821,6 +832,7 @@
			<result property="beforeNote" column="before_note" jdbcType="VARCHAR"/>
			<result property="afterCheck" column="after_check" jdbcType="VARCHAR"/>
			<result property="afterNote" column="after_note" jdbcType="VARCHAR"/>
			<result property="testResult" column="test_result" jdbcType="VARCHAR"/>
			<result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
			</resultMap>
			<resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">