smartor.git - Gitblit

			@@ -47,7 +47,9 @@
			<result property="patname" column="patname"/>
			<result property="patno" column="patno"/>
			<result property="inhospstate" column="inhospstate"/>
			<result property="checkFlag" column="check_flag"/>
			<result property="deptcheckFlag" column="deptcheck_flag"/>
			<result property="wardcheckFlag" column="wardcheck_flag"/>
			<result property="diagcheckFlag" column="diagcheck_flag"/>
			<result property="age" column="age"/>
			<result property="sex" column="sex"/>
			<result property="telcode" column="telcode"/>
			@@ -88,7 +90,9 @@
			out_way_name,
			nurse_id,
			nurse_name,
			check_flag,
			deptcheck_flag,
			wardcheck_flag,
			diagcheck_flag,
			inhospstate,
			patno,
			long_task_reason,
			@@ -143,7 +147,9 @@
			b.patname,
			b.out_way_id,
			b.out_way_name,
			b.check_flag,
			b.deptcheck_flag,
			b.wardcheck_flag,
			b.diagcheck_flag,
			b.inhospstate,
			b.patno,
			b.inhospno,
			@@ -191,7 +197,8 @@
			b.futypecode,
			b.futypedesc,
			b.fuadvice,
			b.fuspecialadvice
			b.fuspecialadvice,
			a.idcardno
			FROM
			pat_med_inhosp b
			JOIN
			@@ -202,7 +209,7 @@
			a.del_flag = 0
			AND b.del_flag = 0
			AND a.idcardno IS NOT NULL
			<if test="startOutHospTime != null">
			<!--<if test="startOutHospTime != null">
			AND STR_TO_DATE(b.endtime,'%Y-%m-%d') >= STR_TO_DATE(#{startOutHospTime},'%Y-%m-%d')
			</if>
			<if test="endOutHospTime != null">
			@@ -215,6 +222,18 @@
			</if>
			<if test="endInHospTime != null">
			AND STR_TO_DATE(b.starttime, '%Y-%m-%d') <= STR_TO_DATE(#{startInHospTime}, '%Y-%m-%d')
			</if>-->
			<if test="startOutHospTime != null ">and date_format(b.endtime,'%y%m%d') >=
			date_format(#{startOutHospTime},'%y%m%d')
			</if>
			<if test="endOutHospTime != null ">and date_format(b.endtime,'%y%m%d') <=
			date_format(#{endOutHospTime},'%y%m%d')
			</if>
			<if test="startInHospTime != null ">and date_format(b.starttime,'%y%m%d') >=
			date_format(#{startInHospTime},'%y%m%d')
			</if>
			<if test="endInHospTime != null ">and date_format(b.starttime,'%y%m%d') <=
			date_format(#{endInHospTime},'%y%m%d')
			</if>
			<if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
			'%')
			@@ -231,7 +250,9 @@
			<if test="patno != null ">and b.patno = #{patno}</if>
			<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
			<if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
			<if test="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
			<if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
			<if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
			<if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
			<if test="cry != null and cry == 0 ">and b.endtime is null</if>
			<if test="cry != null and cry == 1 ">and b.endtime is not null</if>
			<if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
			@@ -288,7 +309,9 @@
			b.out_way_name,
			b.nurse_id,
			b.nurse_name,
			b.check_flag,
			b.deptcheckFlag,
			b.diagcheckFlag,
			b.wardcheckFlag,
			b.inhospstate,
			b.patno,
			b.inhospno,
			@@ -357,7 +380,9 @@
			<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
			<if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
			<if test="patno != null ">and b.patno = #{patno}</if>
			<if test="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
			<if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
			<if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
			<if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
			<if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
			<if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
			<if test="leavediagname != null and leavediagname != ''">and b.leavediagname like concat('%',
			@@ -439,7 +464,9 @@
			<if test="patname!= null">patname,</if>
			<if test="patno != null">patno,</if>
			<if test="inhospstate != null">inhospstate,</if>
			<if test="checkFlag != null">check_flag,</if>
			<if test="deptcheckFlag != null">deptcheck_flag,</if>
			<if test="wardcheckFlag != null">wardcheck_flag,</if>
			<if test="diagcheckFlag != null">diagcheck_flag,</if>
			<if test="longTaskReason != null">long_task_reason,</if>
			<if test="nurseId != null ">nurse_id,</if>
			<if test="nurseName != null ">nurse_name,</if>
			@@ -499,7 +526,9 @@
			<if test="patname!= null">#{patname},</if>
			<if test="patno != null">#{patno},</if>
			<if test="inhospstate != null">#{inhospstate},</if>
			<if test="checkFlag != null">#{checkFlag},</if>
			<if test="deptcheckFlag != null">#{deptcheckFlag},</if>
			<if test="wardcheckFlag != null">#{wardcheckFlag},</if>
			<if test="diagcheckFlag != null">#{diagcheckFlag},</if>
			<if test="longTaskReason != null">#{longTaskReason},</if>
			<if test="nurseId != null ">#{nurseId},</if>
			<if test="nurseName != null ">#{nurseName},</if>
			@@ -563,7 +592,9 @@
			<if test="patname!= null">patname = #{patname},</if>
			<if test="patno != null">patno = #{patno},</if>
			<if test="inhospstate != null">inhospstate = #{inhospstate},</if>
			<if test="checkFlag != null">check_flag = #{checkFlag},</if>
			<if test="deptcheckFlag != null">deptcheck_flag = #{deptcheckFlag},</if>
			<if test="wardcheckFlag != null">wardcheck_flag = #{wardcheckFlag},</if>
			<if test="diagcheckFlag != null">diagcheck_flag = #{diagcheckFlag},</if>
			<if test="longTaskReason != null">long_task_reason = #{longTaskReason},</if>
			<if test="nurseId != null ">nurse_id = #{nurseId},</if>
			<if test="nurseName != null ">nurse_name = #{nurseName},</if>
			@@ -615,7 +646,7 @@
			FROM pat_med_outhosp
			<where>
			del_flag=0
			<if test="deptcodeList != null">
			<if test="deptcodeList != null and deptcodeList.size() > 0">
			and deptcode in
			<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
			#{deptcode}
			@@ -632,7 +663,7 @@
			<where>
			del_flag=0
			and inhospstate=0
			<if test="deptcodeList != null">
			<if test="deptcodeList != null and deptcodeList.size() > 0">
			and deptcode in
			<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
			#{deptcode}
			@@ -647,7 +678,7 @@
			<where>
			del_flag=0
			and inhospstate=1
			<if test="deptcodeList != null">
			<if test="deptcodeList != null and deptcodeList.size() > 0">
			and deptcode in
			<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
			#{deptcode}
			@@ -662,7 +693,7 @@
			<where>
			del_flag=0
			and inhospstate=1
			<if test="deptcodeList != null">
			<if test="deptcodeList != null and deptcodeList.size() > 0">
			and deptcode in
			<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
			#{deptcode}
			@@ -672,8 +703,6 @@
			</if>
			) AS combined
			GROUP BY deptname;


			</select>
			<select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
			resultType="com.smartor.domain.PatMedRes">
			@@ -694,7 +723,7 @@
			and date_format(endtime,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
			and date_format(endtime,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
			</if>
			<if test="deptcodeList != null">
			<if test="deptcodeList != null and deptcodeList.size() > 0">
			and deptcode in
			<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
			#{deptcode}