diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index ec834bd46..0b0351431 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -19,16 +19,7 @@ drf.requester_id, drf.create_time, ap.NAME AS patient_name, - CASE - WHEN MIN(wsr.status_enum) = 1 THEN 0 - WHEN MIN(wsr.status_enum) = 2 THEN 1 - WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2 - WHEN MIN(wsr.status_enum) = 3 THEN 4 - WHEN MIN(wsr.status_enum) = 4 THEN 3 - WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7 - WHEN MIN(wsr.status_enum) = 8 THEN 6 - ELSE NULL - END AS status + drf.status FROM doc_request_form AS drf LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id AND ae.delete_flag = '0' @@ -46,16 +37,7 @@ AND drf.create_time <= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second') - AND CASE - WHEN MIN(wsr.status_enum) = 1 THEN 0 - WHEN MIN(wsr.status_enum) = 2 THEN 1 - WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2 - WHEN MIN(wsr.status_enum) = 3 THEN 4 - WHEN MIN(wsr.status_enum) = 4 THEN 3 - WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7 - WHEN MIN(wsr.status_enum) = 8 THEN 6 - ELSE NULL - END = #{status}::integer + AND drf.status = #{status}::integer AND (drf.prescription_no ILIKE '%' || #{keyword} || '%' @@ -71,7 +53,7 @@ )) GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json, - drf.requester_id, drf.create_time, ap.name + drf.requester_id, drf.create_time, ap.name, drf.status