提交

backend/app/api/sample_reception.py

@@ -209,6 +209,8 @@ async def list_pending_samples(
     pageSize: int = Query(10, ge=1, le=100),
     keyword: Optional[str] = None,
     sourceType: Optional[str] = None,
+    etaTimeStart: Optional[str] = Query(None, alias="etaTimeStart"),
+    etaTimeEnd: Optional[str] = Query(None, alias="etaTimeEnd"),
     db: Session = Depends(get_db),
     user: dict = Depends(require_menu_code("biz:sampleReception:list")),
 ):
@@ -216,7 +218,10 @@ async def list_pending_samples(
         tenant_no = _get_tenant_no(db, user)
         items, total = sr_svc.list_pending_protocol_samples(
             db, page=page, page_size=pageSize, tenant_no=tenant_no, keyword=keyword,
-            source_type=sourceType, user_info=user,
+            source_type=sourceType,
+            eta_time_start=etaTimeStart,
+            eta_time_end=etaTimeEnd,
+            user_info=user,
         )
         return success_response(_page_payload(items, total, page, pageSize))
     except PermissionError as e:
@@ -231,6 +236,8 @@ async def list_received_samples(
     pageSize: int = Query(10, ge=1, le=100),
     keyword: Optional[str] = None,
     sourceType: Optional[str] = None,
+    receptionTimeStart: Optional[str] = Query(None, alias="receptionTimeStart"),
+    receptionTimeEnd: Optional[str] = Query(None, alias="receptionTimeEnd"),
     db: Session = Depends(get_db),
     user: dict = Depends(require_menu_code("biz:sampleReception:list")),
 ):
@@ -238,7 +245,10 @@ async def list_received_samples(
         tenant_no = _get_tenant_no(db, user)
         items, total = sr_svc.list_received_protocol_samples(
             db, page=page, page_size=pageSize, tenant_no=tenant_no, keyword=keyword,
-            source_type=sourceType, user_info=user,
+            source_type=sourceType,
+            reception_time_start=receptionTimeStart,
+            reception_time_end=receptionTimeEnd,
+            user_info=user,
         )
         return success_response(_page_payload(items, total, page, pageSize))
     except PermissionError as e: