优化worklist和history查询功能

config/dev.ts

@@ -11,7 +11,7 @@ export default {
     stats: true,
   },
   defineConstants: {
-    MQTT_BROKER_URL_FROM_WEBPACK: '"ws://101.43.219.60:8083/mqtt"',
+    MQTT_BROKER_URL_FROM_WEBPACK: '"ws://192.168.110.112:8083/mqtt"',
   },
   mini: {},
   h5: {
@@ -20,7 +20,7 @@ export default {
     devServer: {
       proxy: {
         '/dr': {
-          target: 'http://101.43.219.60:7700', // 你的后端服务地址
+          target: 'http://192.168.110.112:6001', // 你的后端服务地址
           changeOrigin: true, // 允许跨域
           // pathRewrite: {
           //   '^/dr/api': '' // 可选，用于重写路径

src/pages/patient/components/SearchPanel.tsx

@@ -10,7 +10,7 @@ import {
   setAccNo,
   setStartTime,
   setEndTime,
-  setStatus,
+  // setStatus,
   setPage,
   setPageSize,
 } from '../../../states/patient/worklist/slices/searchSlice';
@@ -30,6 +30,9 @@ const SearchPanel: React.FC = () => {
   const accNo = useSelector((state: RootState) => state.search.acc_no);
   const startTime = useSelector((state: RootState) => state.search.start_time);
   const endTime = useSelector((state: RootState) => state.search.end_time);
+  const currentKey = useSelector(
+    (state: RootState) => state.BusinessFlow.currentKey
+  );
 
   return (
     <div className="flex flex-col gap-2 w-full">
@@ -97,7 +100,10 @@ const SearchPanel: React.FC = () => {
         type="primary"
         icon={<SearchOutlined />}
         onClick={() => {
-          dispatch(setStatus('Arrived,InProgress'));
+          // 根据 currentKey 确定 status
+          const status =
+            currentKey === 'worklist' ? 'Arrived,InProgress' : 'Completed';
+
           dispatch(setPage(1));
           dispatch(setPageSize(10));
           dispatch(
@@ -110,7 +116,7 @@ const SearchPanel: React.FC = () => {
                 access_number: accNo,
                 start_time: startTime,
                 end_time: endTime,
-                status: 'Arrived',
+                status: status,
               } as WorkFilter,
             })
           );

src/states/patient/worklist/slices/workSlice.ts

@@ -23,7 +23,7 @@ import {
   fetchTaskList,
 } from '../../../../API/patient/workActions';
 import store from '@/states/store';
-
+// 可以被historylist查询共用，filter由外部传递 todo 提取
 export const fetchWorkThunk = createFetchThunk<WorkFilter, work | workAnimal>(
   'worklist',
   async ({ page, pageSize, filters }) => {
@@ -121,7 +121,7 @@ const {
     start_time: '',
     end_time: '',
     access_number: '',
-    status: 'Arrived',
+    status: 'Arrived,InProgress',
     page: 1,
     page_size: 10,
   } satisfies WorkFilter