Fix Bug #571: AI修复

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -61,21 +61,36 @@
                            SELECT 1 FROM wor_service_request ws
                            WHERE ws.prescription_no = drf.prescription_no 
                              AND ws.delete_flag = '0'
-                             AND ws.status_enum = 3
-                       ) THEN 5
-                       WHEN EXISTS (
-                           SELECT 1 FROM wor_service_request ws
-                           WHERE ws.prescription_no = drf.prescription_no 
-                             AND ws.delete_flag = '0'
-                             AND ws.status_enum = 1
-                       ) THEN 4
+                             AND ws.status_enum = 2
+                       ) THEN 2
                        ELSE 1
                    END AS computed_status
-            FROM wor_request_form drf
-            LEFT JOIN sys_patient ap ON ap.ID = drf.patient_id
+            FROM doc_request_form drf
+            LEFT JOIN his_patient ap ON drf.patient_id = ap.id
             WHERE drf.delete_flag = '0'
         ) sub
         ORDER BY sub.create_time DESC
     </select>
 
+    <!-- Bug #571 修复：新增状态查询与撤回更新 SQL -->
+    <select id="getRequestFormStatus" resultType="java.lang.Integer">
+        SELECT ws.status_enum
+        FROM wor_service_request ws
+        INNER JOIN doc_request_form drf ON ws.prescription_no = drf.prescription_no
+        WHERE drf.id = #{requestFormId}
+          AND ws.delete_flag = '0'
+          AND drf.delete_flag = '0'
+        LIMIT 1
+    </select>
+
+    <update id="revokeRequestForm">
+        UPDATE wor_service_request
+        SET status_enum = 1,
+            update_time = #{updateTime}
+        WHERE prescription_no = (
+            SELECT prescription_no FROM doc_request_form WHERE id = #{requestFormId}
+        )
+          AND delete_flag = '0'
+    </update>
+
 </mapper>