diff --git a/src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java b/src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java
index fb1ab66f..475a4002 100644
--- a/src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java
+++ b/src/main/java/com/iemr/mmu/data/doctor/CancerGynecologicalExamination.java
@@ -22,7 +22,9 @@
 package com.iemr.mmu.data.doctor;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -33,9 +35,13 @@
 import jakarta.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.Expose;
 
+import lombok.Data;
+
 @Entity
+@Data
 @Table(name = "t_cancergynecologicalexamination")
 public class CancerGynecologicalExamination {
 	@Id
@@ -92,10 +98,19 @@ public class CancerGynecologicalExamination {
 	@Column(name = "RTIOrSTIDetail")
 	private String rTIOrSTIDetail;
 
+	@Expose
+	@Transient
+	@JsonProperty("fileIDs")
+	private List<String> fileIDs;
+
 	@Expose
 	@Column(name = "FilePath")
 	private String filePath;
 
+	@Expose
+	@Transient
+	private ArrayList<Map<String, String>> files;
+	
 	@Expose
 	@Column(name = "ExperiencedPostCoitalBleeding")
 	private Boolean experiencedPostCoitalBleeding;
@@ -422,4 +437,14 @@ public void setVisitCode(Long visitCode) {
 		this.visitCode = visitCode;
 	}
 
+
+	public ArrayList<Map<String, String>> getFiles() {
+		return files;
+	}
+
+	public void setFiles(ArrayList<Map<String, String>> files) {
+		this.files = files;
+	}
+
+
 }
diff --git a/src/main/java/com/iemr/mmu/service/cancerScreening/CSNurseServiceImpl.java b/src/main/java/com/iemr/mmu/service/cancerScreening/CSNurseServiceImpl.java
index b6b15f22..77364bbd 100644
--- a/src/main/java/com/iemr/mmu/service/cancerScreening/CSNurseServiceImpl.java
+++ b/src/main/java/com/iemr/mmu/service/cancerScreening/CSNurseServiceImpl.java
@@ -63,10 +63,14 @@
 import com.iemr.mmu.repo.nurse.BenPersonalCancerDietHistoryRepo;
 import com.iemr.mmu.repo.nurse.BenPersonalCancerHistoryRepo;
 import com.iemr.mmu.repo.nurse.BenVisitDetailRepo;
+import com.iemr.mmu.utils.AESEncryption.AESEncryptionDecryption;
 
 @Service
 public class CSNurseServiceImpl implements CSNurseService {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+	@Autowired
+	private AESEncryptionDecryption aESEncryptionDecryption;
 	private BenFamilyCancerHistoryRepo benFamilyCancerHistoryRepo;
 	private BenPersonalCancerHistoryRepo benPersonalCancerHistoryRepo;
 	private BenPersonalCancerDietHistoryRepo benPersonalCancerDietHistoryRepo;
@@ -593,10 +597,41 @@ public CancerBreastExamination getBenCancerBreastExaminationData(Long benRegID,
 	}
 
 	public CancerGynecologicalExamination getBenCancerGynecologicalExaminationData(Long benRegID, Long visitCode) {
-		CancerGynecologicalExamination cancerGynecologicalExamination = cancerGynecologicalExaminationRepo
-				.getBenCancerGynecologicalExaminationDetails(benRegID, visitCode);
-		return cancerGynecologicalExamination;
-	}
+    CancerGynecologicalExamination cancerGynecologicalExamination = cancerGynecologicalExaminationRepo
+            .getBenCancerGynecologicalExaminationDetails(benRegID, visitCode);
+
+    if (cancerGynecologicalExamination != null) {
+
+        String filePathStr = cancerGynecologicalExamination.getFilePath();
+
+        if (filePathStr != null && !filePathStr.trim().isEmpty()) {
+            ArrayList<Map<String, String>> fileList = new ArrayList<>();
+            String[] fileIds = filePathStr.split(",");
+
+            for (String str : fileIds) {
+                if (str != null && !str.trim().isEmpty()) {
+                    try {
+                        String decryptedFilePath = aESEncryptionDecryption.decrypt(str);  // Decrypt
+                        String[] tempArr = decryptedFilePath.split("/");
+                        String fileName = tempArr[tempArr.length - 1];
+
+                        Map<String, String> fileMap = new HashMap<>();
+                        fileMap.put("filePath", str);
+                        fileMap.put("fileName", fileName);
+
+                        fileList.add(fileMap);
+                    } catch (Exception e) {
+                        e.printStackTrace(); 
+                    }
+                }
+            }
+
+            cancerGynecologicalExamination.setFiles(fileList);  
+        }
+    }
+
+    return cancerGynecologicalExamination;
+}
 
 	public CancerSignAndSymptoms getBenCancerSignAndSymptomsData(Long benRegID, Long visitCode) {
 		CancerSignAndSymptoms cancerSignAndSymptoms = cancerSignAndSymptomsRepo
diff --git a/src/main/java/com/iemr/mmu/service/cancerScreening/CSServiceImpl.java b/src/main/java/com/iemr/mmu/service/cancerScreening/CSServiceImpl.java
index c65f38f2..23fdf9d8 100644
--- a/src/main/java/com/iemr/mmu/service/cancerScreening/CSServiceImpl.java
+++ b/src/main/java/com/iemr/mmu/service/cancerScreening/CSServiceImpl.java
@@ -595,6 +595,11 @@ public int updateBenExaminationDetail(JsonObject jsnOBJ) throws Exception {
 			CancerGynecologicalExamination cancerGynecologicalExamination = InputMapper.gson()
 					.fromJson(jsnOBJ.get("gynecologicalDetails"), CancerGynecologicalExamination.class);
 
+			if (cancerGynecologicalExamination.getFileIDs() != null) {
+    				cancerGynecologicalExamination.setFilePath(
+        			String.join(",", cancerGynecologicalExamination.getFileIDs()));
+				} 
+
 			int ID = cSNurseServiceImpl.updateCancerGynecologicalExaminationDetails(cancerGynecologicalExamination);
 			if (ID > 0) {
 				// gynecologicalDetails stored successfully...
@@ -977,6 +982,12 @@ public Long saveBenExaminationDetails(JsonObject requestOBJ, Long benVisitID, St
 						.fromJson(examinationOBJ.get("gynecologicalDetails"), CancerGynecologicalExamination.class);
 				cancerGynecologicalExamination.setBenVisitID(benVisitID);
 				cancerGynecologicalExamination.setVisitCode(benVisitCode);
+
+				if (cancerGynecologicalExamination.getFileIDs() != null) {
+    				cancerGynecologicalExamination.setFilePath(
+        			String.join(",", cancerGynecologicalExamination.getFileIDs()));
+				} 
+
 				Long ID = cSNurseServiceImpl.saveCancerGynecologicalExaminationData(cancerGynecologicalExamination);
 				if (ID != null && ID > 0) {
 					// gynecologicalDetails stored successfully...