|
@@ -528,26 +528,30 @@
|
|
|
(
|
|
|
SELECT
|
|
|
d.id AS id,
|
|
|
- d.NAME AS NAME
|
|
|
+ e.NAME AS NAME
|
|
|
FROM
|
|
|
med_behospital_info a,
|
|
|
med_home_page b,
|
|
|
- med_qcresult_detail c,
|
|
|
- qc_cases_entry d
|
|
|
+ med_qcresult_info c,
|
|
|
+ med_qcresult_detail d,
|
|
|
+ qc_cases_entry e
|
|
|
WHERE
|
|
|
a.is_deleted = 'N'
|
|
|
AND b.is_deleted = 'N'
|
|
|
AND c.is_deleted = 'N'
|
|
|
AND d.is_deleted = 'N'
|
|
|
+ and e.is_deleted='N'
|
|
|
AND a.hospital_id = b.hospital_id
|
|
|
AND a.hospital_id = c.hospital_id
|
|
|
+ and a.hospital_id = d.hospital_id
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
- AND c.cases_id = d.cases_id
|
|
|
- AND c.cases_entry_id = d.id
|
|
|
+ AND a.behospital_code = d.behospital_code
|
|
|
+ AND d.cases_id = e.cases_id
|
|
|
+ AND d.cases_entry_id = e.id
|
|
|
<![CDATA[AND a.qc_type_id <>0 ]]>
|
|
|
<if test="filterPageVO.casesId != null and filterPageVO.casesId != ''">
|
|
|
- AND c.cases_id = #{filterPageVO.casesId}
|
|
|
+ AND d.cases_id = #{filterPageVO.casesId}
|
|
|
</if>
|
|
|
<if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
|
|
|
AND a.hospital_id = #{filterPageVO.hospitalId}
|
|
@@ -559,7 +563,7 @@
|
|
|
<![CDATA[AND a.leave_hospital_date < DATE(#{filterPageVO.endDate})]]>
|
|
|
</if>
|
|
|
<if test="filterPageVO.name != null and filterPageVO.name != ''">
|
|
|
- AND d.name like CONCAT('%', #{filterPageVO.name},'%')
|
|
|
+ AND e.name like CONCAT('%', #{filterPageVO.name},'%')
|
|
|
</if>
|
|
|
<if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
|
|
|
AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
|
|
@@ -570,22 +574,26 @@
|
|
|
FROM
|
|
|
med_behospital_info a,
|
|
|
med_home_page b,
|
|
|
- med_qcresult_detail c,
|
|
|
- qc_cases_entry d
|
|
|
+ med_qcresult_info c,
|
|
|
+ med_qcresult_detail d,
|
|
|
+ qc_cases_entry e
|
|
|
WHERE
|
|
|
a.is_deleted = 'N'
|
|
|
AND b.is_deleted = 'N'
|
|
|
AND c.is_deleted = 'N'
|
|
|
AND d.is_deleted = 'N'
|
|
|
+ and e.is_deleted='N'
|
|
|
AND a.hospital_id = b.hospital_id
|
|
|
AND a.hospital_id = c.hospital_id
|
|
|
+ and a.hospital_id = d.hospital_id
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
- AND c.cases_id = d.cases_id
|
|
|
- AND c.cases_entry_id = d.id
|
|
|
+ AND a.behospital_code = d.behospital_code
|
|
|
+ AND d.cases_id = e.cases_id
|
|
|
+ AND d.cases_entry_id = e.id
|
|
|
<![CDATA[AND a.qc_type_id <>0 ]]>
|
|
|
<if test="filterPageVO.casesId != null and filterPageVO.casesId != ''">
|
|
|
- AND c.cases_id = #{filterPageVO.casesId}
|
|
|
+ AND d.cases_id = #{filterPageVO.casesId}
|
|
|
</if>
|
|
|
<if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
|
|
|
AND a.hospital_id = #{filterPageVO.hospitalId}
|
|
@@ -597,7 +605,7 @@
|
|
|
<![CDATA[AND a.leave_hospital_date < DATE(#{filterPageVO.endDate})]]>
|
|
|
</if>
|
|
|
<if test="filterPageVO.name != null and filterPageVO.name != ''">
|
|
|
- AND d.name like CONCAT('%', #{filterPageVO.name},'%')
|
|
|
+ AND e.name like CONCAT('%', #{filterPageVO.name},'%')
|
|
|
</if>
|
|
|
<if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
|
|
|
AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
|
|
@@ -860,35 +868,39 @@
|
|
|
(
|
|
|
SELECT
|
|
|
d.id,
|
|
|
- d.NAME,
|
|
|
+ e.NAME,
|
|
|
a.beh_dept_id AS deptId,
|
|
|
a.beh_dept_name AS deptName
|
|
|
FROM
|
|
|
med_behospital_info a,
|
|
|
med_home_page b,
|
|
|
- med_qcresult_detail c,
|
|
|
- qc_cases_entry d,
|
|
|
- sys_user_dept e
|
|
|
+ med_qcresult_info c,
|
|
|
+ med_qcresult_detail d,
|
|
|
+ qc_cases_entry e,
|
|
|
+ sys_user_dept f
|
|
|
WHERE
|
|
|
a.is_deleted = 'N'
|
|
|
AND b.is_deleted = 'N'
|
|
|
AND c.is_deleted = 'N'
|
|
|
AND d.is_deleted = 'N'
|
|
|
AND e.is_deleted = 'N'
|
|
|
+ AND f.is_deleted = 'N'
|
|
|
AND a.hospital_id = b.hospital_id
|
|
|
AND a.hospital_id = c.hospital_id
|
|
|
- AND a.hospital_id = e.hospital_id
|
|
|
+ AND a.hospital_id = d.hospital_id
|
|
|
+ AND a.hospital_id = f.hospital_id
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
- AND c.cases_id = d.cases_id
|
|
|
- AND c.cases_entry_id = d.id
|
|
|
- AND a.beh_dept_id = e.dept_id
|
|
|
+ AND a.behospital_code = d.behospital_code
|
|
|
+ AND d.cases_id = e.cases_id
|
|
|
+ AND d.cases_entry_id = e.id
|
|
|
+ AND a.beh_dept_id = f.dept_id
|
|
|
<![CDATA[AND a.qc_type_id <>0 ]]>
|
|
|
<if test="filterPageByDeptVO.casesId != null and filterPageByDeptVO.casesId != ''">
|
|
|
- AND c.cases_id = #{filterPageByDeptVO.casesId}
|
|
|
+ AND d.cases_id = #{filterPageByDeptVO.casesId}
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.userId!=null">
|
|
|
- AND e.user_id = #{filterPageByDeptVO.userId}
|
|
|
+ AND f.user_id = #{filterPageByDeptVO.userId}
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.hospitalId != null and filterPageByDeptVO.hospitalId != ''">
|
|
|
AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
|
|
@@ -900,7 +912,7 @@
|
|
|
<![CDATA[AND a.leave_hospital_date < DATE(#{filterPageByDeptVO.endDate})]]>
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.name != null and filterPageByDeptVO.name != ''">
|
|
|
- AND d.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
|
|
|
+ AND e.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
|
|
|
AND a.beh_dept_name like CONCAT('%', #{filterPageByDeptVO.deptName},'%')
|
|
@@ -914,29 +926,33 @@
|
|
|
FROM
|
|
|
med_behospital_info a,
|
|
|
med_home_page b,
|
|
|
- med_qcresult_detail c,
|
|
|
- qc_cases_entry d,
|
|
|
- sys_user_dept e
|
|
|
+ med_qcresult_info c,
|
|
|
+ med_qcresult_detail d,
|
|
|
+ qc_cases_entry e,
|
|
|
+ sys_user_dept f
|
|
|
WHERE
|
|
|
a.is_deleted = 'N'
|
|
|
AND b.is_deleted = 'N'
|
|
|
AND c.is_deleted = 'N'
|
|
|
AND d.is_deleted = 'N'
|
|
|
AND e.is_deleted = 'N'
|
|
|
+ AND f.is_deleted = 'N'
|
|
|
AND a.hospital_id = b.hospital_id
|
|
|
AND a.hospital_id = c.hospital_id
|
|
|
- AND a.hospital_id = e.hospital_id
|
|
|
+ AND a.hospital_id = d.hospital_id
|
|
|
+ AND a.hospital_id = f.hospital_id
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
- AND c.cases_id = d.cases_id
|
|
|
- AND c.cases_entry_id = d.id
|
|
|
- AND a.beh_dept_id = e.dept_id
|
|
|
+ AND a.behospital_code = d.behospital_code
|
|
|
+ AND d.cases_id = e.cases_id
|
|
|
+ AND d.cases_entry_id = e.id
|
|
|
+ AND a.beh_dept_id = f.dept_id
|
|
|
<![CDATA[AND a.qc_type_id <>0 ]]>
|
|
|
<if test="filterPageByDeptVO.casesId != null and filterPageByDeptVO.casesId != ''">
|
|
|
- AND c.cases_id = #{filterPageByDeptVO.casesId}
|
|
|
+ AND d.cases_id = #{filterPageByDeptVO.casesId}
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.userId!=null">
|
|
|
- AND e.user_id = #{filterPageByDeptVO.userId}
|
|
|
+ AND f.user_id = #{filterPageByDeptVO.userId}
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.hospitalId != null and filterPageByDeptVO.hospitalId != ''">
|
|
|
AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
|
|
@@ -948,13 +964,13 @@
|
|
|
<![CDATA[AND a.leave_hospital_date < DATE(#{filterPageByDeptVO.endDate})]]>
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.name != null and filterPageByDeptVO.name != ''">
|
|
|
- AND d.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
|
|
|
+ AND e.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
|
|
|
AND a.beh_dept_name like CONCAT('%', #{filterPageByDeptVO.deptName},'%')
|
|
|
</if>
|
|
|
<if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
|
|
|
- AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName},'%')
|
|
|
+ AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName},'%')
|
|
|
</if>
|
|
|
) t2
|
|
|
GROUP BY
|