diff --git a/lib/core/service/patient_medical_file/lab_order/labs_service.dart b/lib/core/service/patient_medical_file/lab_order/labs_service.dart
index 6a129780..62f7174c 100644
--- a/lib/core/service/patient_medical_file/lab_order/labs_service.dart
+++ b/lib/core/service/patient_medical_file/lab_order/labs_service.dart
@@ -220,17 +220,17 @@ class LabsService extends BaseService {
     }, body: _allSpecialLabResultRequestModel.toJson());
   }
 
-  Future<void> getLabAttachments(PatiantInformtion patient,{required labAccessNumber, required FileName, required FileHash}) async {
-
+  Future<void> getLabAttachments(PatiantInformtion patient, {required labAccessNumber, required FileName, required FileHash, required projectID, required setupID}) async {
     hasError = false;
     Map<String, dynamic> body = Map();
     body['FileHash'] = [FileHash??FileName??""];
-
+    body['ProjectID'] = projectID;
+    body['SetupID'] = setupID;
    // if(ProjectViewModel.getVidaPlusStatus()){
      body['Lang'] = "en"??"";
      body['Internationalization'] = false;
    // } else {
-      body['LabAccessionNumber'] = labAccessNumber??"";
+    body['LabAccessionNumber'] = labAccessNumber ?? "";
     // }
     await baseAppClient.postPatient(GET_ATTACHMENT, patient: patient, onSuccess: (dynamic response, int statusCode) {
       labAttachment.clear();
diff --git a/lib/core/viewModel/labs_view_model.dart b/lib/core/viewModel/labs_view_model.dart
index 136d71a5..13c70d5e 100644
--- a/lib/core/viewModel/labs_view_model.dart
+++ b/lib/core/viewModel/labs_view_model.dart
@@ -160,10 +160,10 @@ class LabsViewModel extends BaseViewModel {
       setState(ViewState.Idle);
   }
 
-  Future getLabAttachments(PatiantInformtion patient,{ dynamic labAccessNumber, dynamic FileName, dynamic FileHash, UploadedDocument? uploadedDocument}) async {
+  Future getLabAttachments(PatiantInformtion patient,{dynamic labAccessNumber, dynamic FileName, dynamic FileHash, UploadedDocument? uploadedDocument, dynamic projectID, String? setupID}) async {
     setState(ViewState.Busy);
 
-    await _labsService.getLabAttachments(patient,labAccessNumber: labAccessNumber, FileName: FileName, FileHash:uploadedDocument?.fileData );
+    await _labsService.getLabAttachments(patient,labAccessNumber: labAccessNumber, FileName: FileName, FileHash:uploadedDocument?.fileData, projectID: projectID, setupID: setupID);
     if (_labsService.hasError) {
       error = _labsService.error;
       setState(ViewState.Error);
diff --git a/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart
index 188e3f2f..b22be730 100644
--- a/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart
+++ b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart
@@ -189,24 +189,25 @@ class LabResultWidget extends StatelessWidget {
                                   child: InkWell(
                                     onTap: () async {
                                       var labAccessNumber = patientLabResultList[index].LabAccessionNo;
-                                      if (patientLabResultList[index].FileNameWithExtensionList?.isNotEmpty == true || patientLabResultList[index].FileNameWithExtensionList?.length == 1) {
-                                        await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: patientLabResultList[index].FileNameWithExtensionList?.first);
-                                        model.openPDF();
-                                        return;
-                                      }
-
-                                      if (patientLabResultList[index].UploadedDocuments?.isNotEmpty == true || patientLabResultList[index].UploadedDocuments?.length == 1) {
-                                        await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, uploadedDocument: patientLabResultList[index].UploadedDocuments?.first);
-                                        model.openPDF();
-                                        return;
-                                      }
+                                      // if (patientLabResultList[index].FileNameWithExtensionList?.isNotEmpty == true || patientLabResultList[index].FileNameWithExtensionList?.length == 1) {
+                                      //   await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: patientLabResultList[index].FileNameWithExtensionList?.first);
+                                      //   model.openPDF();
+                                      //   return;
+                                      // }
+                                      //
+                                      // if (patientLabResultList[index].UploadedDocuments?.isNotEmpty == true || patientLabResultList[index].UploadedDocuments?.length == 1) {
+                                      //   await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, uploadedDocument: patientLabResultList[index].UploadedDocuments?.first);
+                                      //   model.openPDF();
+                                      //   return;
+                                      // }
 
                                       showUploadedDocumentsBottomSheet(
                                         context,
                                         documents: patientLabResultList[index].UploadedDocuments,
                                         fileName: patientLabResultList[index].FileNameWithExtensionList,
                                         labAccessNumber: labAccessNumber,
-                                      );
+                                          projectID: int.parse(patientLabResultList[index].projectID!),
+                                          setupID: patientLabResultList[index].setupID);
                                     },
                                     child: Row(
                                       mainAxisAlignment: MainAxisAlignment.center,
@@ -360,6 +361,8 @@ class LabResultWidget extends StatelessWidget {
     List<UploadedDocument>? documents,
     List<String>? fileName,
     String? labAccessNumber,
+    int? projectID,
+    String? setupID,
   }) {
     const double kItemHeight = 66.0; // ListTile with contentPadding: 10
     final double screenHeight = MediaQuery.of(context).size.height;
@@ -439,11 +442,11 @@ class LabResultWidget extends StatelessWidget {
                             onTap: () async {
                               Navigator.pop(context);
                               if (documents?.isNotEmpty == true) {
-                                await model.getLabAttachments(patient, uploadedDocument: documents![index]);
+                                await model.getLabAttachments(patient, uploadedDocument: documents![index], projectID: projectID, setupID: setupID);
                                 model.openPDF();
                               }
                               if (fileName?.isNotEmpty == true) {
-                                await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: fileName![index]);
+                                await model.getLabAttachments(patient, labAccessNumber: labAccessNumber, FileName: fileName![index], projectID: projectID, setupID: setupID);
                                 model.openPDF();
                               }
                             },