smartor.git - Gitblit

			@@ -92,6 +92,7 @@
			<result property="continueContent" column="continue_content"/>
			<result property="continueCount" column="continue_count"/>
			<result property="continueTimeNext" column="continue_time_next"/>
			<result property="operationItemId" column="operation_item_id"/>
			</resultMap>

			<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
			@@ -212,6 +213,7 @@
			continue_content,
			continue_count,
			continue_time_next,
			operation_item_id,
			task_situation
			from service_subtask
			</sql>
			@@ -344,8 +346,9 @@
			</if>
			</if>
			<if test="deptOrDistrict==2">
			AND (1=1
			<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
			AND (leavehospitaldistrictcode IN
			AND leavehospitaldistrictcode IN
			<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
			separator=","
			close=")">
			@@ -355,14 +358,15 @@
			<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
			OR deptcode IN
			<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
			close="))">
			close=")">
			#{leaveldeptcode}
			</foreach>
			</if>
			</if>)
			</if>
			<if test="deptOrDistrict==3">
			AND (1=1
			<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
			AND (leavehospitaldistrictcode IN
			AND leavehospitaldistrictcode IN
			<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
			separator=","
			close=")">
			@@ -370,17 +374,19 @@
			</foreach>
			</if>
			<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
			and visit_dept_code IN
			AND visit_dept_code IN
			<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
			close="))">
			close=")">
			#{visitDeptCode}
			</foreach>
			</if>
			)
			</if>

			<if test="deptOrDistrict==4">
			AND (1=1
			<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
			AND (leavehospitaldistrictcode IN
			AND leavehospitaldistrictcode IN
			<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
			separator=","
			close=")">
			@@ -390,10 +396,11 @@
			<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
			OR visit_dept_code IN
			<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
			close="))">
			close=")">
			#{visitDeptCode}
			</foreach>
			</if>
			)
			</if>

			<if test="visitTime != null">
			@@ -641,6 +648,8 @@
			AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d')
			</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
			<if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
			<if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
			<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
			<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
			<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
			@@ -720,6 +729,8 @@
			AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d')
			</if>
			<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
			<if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
			<if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
			<if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
			<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
			<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
			@@ -851,6 +862,7 @@
			<if test="continueCount != null ">continue_count,</if>
			<if test="continueTimeNext != null ">continue_time_next,</if>
			<if test="continueContent != null ">continue_content,</if>
			<if test="operationItemId != null ">operation_item_id,</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="sendname != null">#{sendname},</if>
			@@ -942,6 +954,7 @@
			<if test="continueCount != null ">#{continueCount},</if>
			<if test="continueTimeNext != null ">#{continueTimeNext,jdbcType=TIMESTAMP},</if>
			<if test="continueContent != null ">#{continueContent},</if>
			<if test="operationItemId != null ">#{operationItemId},</if>
			</trim>
			</insert>

			@@ -1038,6 +1051,7 @@
			<if test="continueCount != null ">continue_count = #{continueCount},</if>
			<if test="continueTimeNext != null ">continue_time_next = #{continueTimeNext,jdbcType=TIMESTAMP},</if>
			<if test="continueContent != null ">continue_content = #{continueContent},</if>
			<if test="operationItemId != null ">operation_item_id = #{operationItemId},</if>
			</trim>
			where id = #{id}
			</update>
			@@ -1238,6 +1252,9 @@
			<if test="continueContent != null ">continue_content = #{continueContent},</if>
			</trim>
			where patid = #{patid} and taskid = #{taskid}
			<if test="id != null ">
			and id = #{id}
			</if>
			</update>

			<update id="updateServiceSubtaskByTaskGuid" parameterType="com.smartor.domain.ServiceSubtask">