smartor.git - Gitblit

			@@ -79,6 +79,9 @@
			<result property="visitCount" column="visit_count"/>
			<result property="isVisitAgain" column="is_visit_again"/>
			<result property="upid" column="upid"/>
			<result property="visitTime" column="visit_time"/>
			<result property="visitDeptName" column="visit_dept_name"/>
			<result property="visitDeptCode" column="visit_dept_code"/>
			</resultMap>

			<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
			@@ -94,6 +97,9 @@
			task_guid,
			patfrom,
			upid,
			visit_dept_name,
			visit_dept_code,
			visit_time,
			inhospid,
			visit_count,
			is_visit_again,
			@@ -287,12 +293,21 @@
			<if test="excep != null ">and excep = #{excep}</if>
			<if test="nurseName != null ">and nurse_name = #{nurseName}</if>
			<if test="score != null">and score = #{score}</if>
			<if test="visitCount != null">and visit_count = #{visitCount}</if>
			<!-- <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
			<if test="visitCount != null and visitCount == 1">
			AND visit_count = 1
			</if>
			<if test="visitCount != null and visitCount > 1">
			AND visit_count > 1
			</if>
			<if test="remark != null">and remark = #{remark}</if>
			<if test="suggest != null">and suggest = #{suggest}</if>
			<if test="createBy != null">and create_by = #{createBy}</if>
			<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
			<if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
			<if test="visitTime != null">and visit_time = #{visitTime}</if>
			<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
			<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
			</where>
			<if test="sort != null and sort==0">order by endtime asc</if>
			<if test="sort != null and sort==1">order by endtime desc</if>
			@@ -319,6 +334,8 @@
			<if test="upid != null ">and upid = #{upid}</if>
			<if test="visitCount != null ">and visit_count = #{visitCount}</if>
			<if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if>
			<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
			<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
			</where>

			</select>
			@@ -370,6 +387,9 @@
			<if test="endtime != null ">and endtime = #{endtime}</if>
			<if test="excep != null ">and excep = #{excep}</if>
			<if test="nurseName != null ">and nurse_name = #{nurseName}</if>
			<if test="visitTime != null ">and visit_time = #{visitTime}</if>
			<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
			<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
			</where>

			</select>
			@@ -467,6 +487,9 @@
			<if test="visitCount != null ">visit_count,</if>
			<if test="isVisitAgain != null ">is_visit_again,</if>
			<if test="upid != null ">upid,</if>
			<if test="visit_time != null ">visitTime,</if>
			<if test="visitDeptCode != null">visit_dept_code,</if>
			<if test="visitDeptName != null">visit_dept_name,</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="sendname != null">#{sendname},</if>
			@@ -545,6 +568,9 @@
			<if test="visitCount != null ">#{visitCount},</if>
			<if test="isVisitAgain != null ">#{isVisitAgain},</if>
			<if test="upid != null ">#{upid},</if>
			<if test="visitTime != null ">#{visitTime},</if>
			<if test="visitDeptCode != null">#{visitDeptCode},</if>
			<if test="visitDeptName != null">#{visitDeptName},</if>
			</trim>
			</insert>

			@@ -628,6 +654,9 @@
			<if test="visitCount != null ">visit_count=#{visitCount},</if>
			<if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
			<if test="upid != null ">upid=#{upid},</if>
			<if test="visitTime != null ">visit_time=#{visitTime},</if>
			<if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			</trim>
			where id = #{id}
			</update>
			@@ -712,6 +741,9 @@
			<if test="patguid != null ">patguid=#{patguid},</if>
			<if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
			<if test="upid != null ">upid=#{upid},</if>
			<if test="visitTime != null ">visit_time=#{visitTime},</if>
			<if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			</trim>
			<where>
			<if test="patid != null ">and patid = #{patid}</if>
			@@ -798,6 +830,9 @@
			<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
			<if test="patguid != null ">patguid=#{patguid},</if>
			<if test="upid != null ">upid=#{upid},</if>
			<if test="visitTime != null ">visit_time=#{visitTime},</if>
			<if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			</trim>
			where patid = #{patid} and taskid = #{taskid}
			</update>
			@@ -881,6 +916,9 @@
			<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
			<if test="patguid != null ">patguid=#{patguid},</if>
			<if test="upid != null ">upid=#{upid},</if>
			<if test="visitTime != null ">visit_time=#{visitTime},</if>
			<if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
			<if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
			</trim>
			where task_guid = #{taskGuid} and task_name = #{taskName}
			</update>
			@@ -925,6 +963,8 @@
			AND endtime > #{startTime}
			AND endtime <= #{endTime}
			</if>
			<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
			<if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
			</where>
			</select>

			@@ -943,6 +983,7 @@
			senderdetail,
			type,
			taskid,
			visit_time,
			templateid,
			templatename,
			senddate,
			@@ -999,6 +1040,8 @@
			task_guid,
			leavediagname,
			patguid,
			visitDeptCode,
			visitDeptName,
			leaveicd10code
			FROM service_subtask,
			JSON_TABLE(send_time_slot, '$[*]' COLUMNS (