diff --git a/src/main/java/com/iemr/flw/controller/BeneficiaryController.java b/src/main/java/com/iemr/flw/controller/BeneficiaryController.java
index 82b4cf7b..d7921ff0 100644
--- a/src/main/java/com/iemr/flw/controller/BeneficiaryController.java
+++ b/src/main/java/com/iemr/flw/controller/BeneficiaryController.java
@@ -66,7 +66,7 @@ public String getBeneficiaryDataByAsha(@RequestBody GetBenRequestHandler request
 
     }
     @RequestMapping(value = {"/eye_surgery/saveAll"}, method = RequestMethod.POST)
-    public ResponseEntity<?> saveEyeSurgery(@RequestBody List<EyeCheckupRequestDTO> eyeCheckupRequestDTOS) {
+    public ResponseEntity<?> saveEyeSurgery(@RequestBody List<EyeCheckupRequestDTO> eyeCheckupRequestDTOS,@RequestHeader(value = "JwtToken") String token) {
         Map<String, Object> response = new LinkedHashMap<>();
         logger.info("Eye Checkup Save Request: {}", eyeCheckupRequestDTOS);
 
@@ -77,7 +77,7 @@ public ResponseEntity<?> saveEyeSurgery(@RequestBody List<EyeCheckupRequestDTO>
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
             }
 
-            String responseObject = beneficiaryService.saveEyeCheckupVsit(eyeCheckupRequestDTOS);
+            String responseObject = beneficiaryService.saveEyeCheckupVsit(eyeCheckupRequestDTOS,token);
 
             if (responseObject != null) {
                 response.put("statusCode", HttpStatus.OK.value());
@@ -100,12 +100,12 @@ public ResponseEntity<?> saveEyeSurgery(@RequestBody List<EyeCheckupRequestDTO>
 
 
     @RequestMapping(value = {"/eye_surgery/getAll"}, method = RequestMethod.POST)
-    public ResponseEntity<?> getAllEyeSurgery(@RequestBody GetBenRequestHandler request) {
+    public ResponseEntity<?> getAllEyeSurgery(@RequestBody GetBenRequestHandler request,@RequestHeader(value = "JwtToken") String token) {
         Map<String, Object> response = new LinkedHashMap<>();
         logger.info("Eye Checkup Get Request: {}", request);
 
         try {
-            List<EyeCheckupRequestDTO> responseObject = beneficiaryService.getEyeCheckUpVisit(request);
+            List<EyeCheckupRequestDTO> responseObject = beneficiaryService.getEyeCheckUpVisit(request,token);
 
             if (responseObject != null && !responseObject.isEmpty()) {
                 response.put("statusCode", HttpStatus.OK.value());
diff --git a/src/main/java/com/iemr/flw/domain/iemr/DeliveryOutcome.java b/src/main/java/com/iemr/flw/domain/iemr/DeliveryOutcome.java
index 2b94cc7a..d3a1b56c 100644
--- a/src/main/java/com/iemr/flw/domain/iemr/DeliveryOutcome.java
+++ b/src/main/java/com/iemr/flw/domain/iemr/DeliveryOutcome.java
@@ -53,7 +53,6 @@ public class DeliveryOutcome {
     @Column(name = "still_birth")
     private Integer stillBirth;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MMM dd, yyyy, h:mm:ss a")
     @Column(name = "discharge_date")
     private Timestamp dateOfDischarge;
 
diff --git a/src/main/java/com/iemr/flw/domain/iemr/FilariasisCampaign.java b/src/main/java/com/iemr/flw/domain/iemr/FilariasisCampaign.java
index 869e9696..7e0916bd 100644
--- a/src/main/java/com/iemr/flw/domain/iemr/FilariasisCampaign.java
+++ b/src/main/java/com/iemr/flw/domain/iemr/FilariasisCampaign.java
@@ -24,10 +24,10 @@ public class FilariasisCampaign {
     @Column(name = "user_id", nullable = false)
     private Integer userId;
 
-    @Column(name = "no_of_families", nullable = false)
+    @Column(name = "number_of_families", nullable = false)
     private Integer numberOfFamilies = 0;
 
-    @Column(name = "no_of_individuals", nullable = false)
+    @Column(name = "number_of_individuals", nullable = false)
     private Integer numberOfIndividuals = 0;
 
     /**
diff --git a/src/main/java/com/iemr/flw/repo/iemr/EyeCheckUpVisitRepo.java b/src/main/java/com/iemr/flw/repo/iemr/EyeCheckUpVisitRepo.java
index c0e3df73..fd713c44 100644
--- a/src/main/java/com/iemr/flw/repo/iemr/EyeCheckUpVisitRepo.java
+++ b/src/main/java/com/iemr/flw/repo/iemr/EyeCheckUpVisitRepo.java
@@ -10,4 +10,5 @@
 public
 interface  EyeCheckUpVisitRepo extends JpaRepository<EyeCheckupVisit,Long> {
     List<EyeCheckupVisit> findByUserId(Integer userId);
+    List<EyeCheckupVisit> findByCreatedBy(String userName);
 }
diff --git a/src/main/java/com/iemr/flw/service/BeneficiaryService.java b/src/main/java/com/iemr/flw/service/BeneficiaryService.java
index 1db3026b..e69bc887 100644
--- a/src/main/java/com/iemr/flw/service/BeneficiaryService.java
+++ b/src/main/java/com/iemr/flw/service/BeneficiaryService.java
@@ -10,7 +10,7 @@ public interface BeneficiaryService {
 
     String getBenData(GetBenRequestHandler requestDTO, String authorisation) throws Exception;
 
-    String saveEyeCheckupVsit(List<EyeCheckupRequestDTO> eyeCheckupRequestDTOS);
+    String saveEyeCheckupVsit(List<EyeCheckupRequestDTO> eyeCheckupRequestDTOS,String token);
 
-    List<EyeCheckupRequestDTO> getEyeCheckUpVisit(GetBenRequestHandler request);
+    List<EyeCheckupRequestDTO> getEyeCheckUpVisit(GetBenRequestHandler request,String token);
 }
diff --git a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
index f5a75785..9d60729d 100644
--- a/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
@@ -521,7 +521,7 @@ public void fetchHealthIdByBenRegID(Long benRegID, String authorization, Map<Str
 
 
     @Override
-    public String saveEyeCheckupVsit(List<EyeCheckupRequestDTO> eyeCheckupRequestDTOS) {
+    public String saveEyeCheckupVsit(List<EyeCheckupRequestDTO> eyeCheckupRequestDTOS,String token) {
 
         try {
             for (EyeCheckupRequestDTO dto : eyeCheckupRequestDTOS) {
@@ -529,7 +529,7 @@ public String saveEyeCheckupVsit(List<EyeCheckupRequestDTO> eyeCheckupRequestDTO
 
                 visit.setBeneficiaryId(dto.getBeneficiaryId());
                 visit.setHouseholdId(dto.getHouseHoldId());
-                visit.setUserId(userRepo.getUserIdByName(jwtUtil.getUserNameFromStorage())); // cache se lena hai
+                visit.setUserId(jwtUtil.extractUserId(token));
                 visit.setCreatedBy(dto.getUserName());
                 StringBuilder sb = new StringBuilder();
 
@@ -558,8 +558,9 @@ public String saveEyeCheckupVsit(List<EyeCheckupRequestDTO> eyeCheckupRequestDTO
     }
 
     @Override
-    public List<EyeCheckupRequestDTO> getEyeCheckUpVisit(GetBenRequestHandler request) {
-        List<EyeCheckupVisit> visits = eyeCheckUpVisitRepo.findByUserId(request.getAshaId());
+    public List<EyeCheckupRequestDTO> getEyeCheckUpVisit(GetBenRequestHandler request,String token) {
+
+        List<EyeCheckupVisit> visits = eyeCheckUpVisitRepo.findByCreatedBy(jwtUtil.extractUsername(token));
 
         return visits.stream().map(v -> {
             EyeCheckupRequestDTO dto = new EyeCheckupRequestDTO();
diff --git a/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java
index 55756130..620ae6c6 100644
--- a/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/CampaignServiceImpl.java
@@ -231,8 +231,13 @@ public List<FilariasisCampaign> saveFilariasisCampaign(List<FilariasisCampaignDT
 
             // Parse number of children
             try {
-                String numberOfFamilies = campaignDTO.getFields().getNumberOfFamilies();
-                String numberOfIndividuals = campaignDTO.getFields().getNumberOfIndividuals();
+                String numberOfFamilies = (campaignDTO != null && campaignDTO.getFields() != null)
+                        ? campaignDTO.getFields().getNumberOfFamilies()
+                        : null;
+
+                String numberOfIndividuals = (campaignDTO != null && campaignDTO.getFields() != null)
+                        ? campaignDTO.getFields().getNumberOfIndividuals()
+                        : null;
                 if (numberOfFamilies != null && !numberOfFamilies.trim().isEmpty()) {
                     try {
                         // parse as double first, then cast to int
@@ -415,8 +420,19 @@ private FilariasisResponseDTO convertFilariasisDTO(FilariasisCampaign campaign)
         }
         filariasisCampaignListDTO.setEndDate(campaign.getEndDate());
         filariasisCampaignListDTO.setStartDate(campaign.getStartDate());
-        filariasisCampaignListDTO.setNumberOfIndividuals(Double.valueOf(campaign.getNumberOfIndividuals()));
-        filariasisCampaignListDTO.setNumberOfFamilies(Double.valueOf(campaign.getNumberOfFamilies()));
+        Double numberOfIndividuals = null;
+        Double numberOfFamilies = null;
+
+        if (campaign.getNumberOfIndividuals() != null) {
+            numberOfIndividuals = Double.valueOf(campaign.getNumberOfIndividuals());
+        }
+
+        if (campaign.getNumberOfFamilies() != null) {
+            numberOfFamilies = Double.valueOf(campaign.getNumberOfFamilies());
+        }
+
+        filariasisCampaignListDTO.setNumberOfIndividuals(numberOfIndividuals);
+        filariasisCampaignListDTO.setNumberOfFamilies(numberOfFamilies);
 
         dto.setFields(filariasisCampaignListDTO);
         return dto;
diff --git a/src/main/java/com/iemr/flw/service/impl/DiseaseControlServiceImpl.java b/src/main/java/com/iemr/flw/service/impl/DiseaseControlServiceImpl.java
index d5f009ea..1abf70f3 100644
--- a/src/main/java/com/iemr/flw/service/impl/DiseaseControlServiceImpl.java
+++ b/src/main/java/com/iemr/flw/service/impl/DiseaseControlServiceImpl.java
@@ -397,7 +397,7 @@ public Object getAllMalaria(GetDiseaseRequestHandler getDiseaseRequestHandler) {
 
         // Fetch and filter malaria disease records
         List<ScreeningMalaria> filteredList = diseaseMalariaRepository.findAll().stream()
-                .filter(disease -> Objects.equals(disease.getUserId(), getDiseaseRequestHandler.getUserId()))
+                .filter(disease -> Objects.equals(disease.getUserId(), getDiseaseRequestHandler.getAshaId()))
                 .collect(Collectors.toList());
 
         // Check if the list is empty
@@ -485,7 +485,7 @@ public Object getAllKalaAzar(GetDiseaseRequestHandler getDiseaseRequestHandler)
 
         // Fetch and filter Kala Azar disease records
         List<ScreeningKalaAzar> filteredList = diseaseKalaAzarRepository.findAll().stream()
-                .filter(disease -> (Objects.equals(disease.getUserId(), getDiseaseRequestHandler.getUserId())))
+                .filter(disease -> (Objects.equals(disease.getUserId(), getDiseaseRequestHandler.getAshaId())))
                 .collect(Collectors.toList());
 
         // Check if the list is empty
@@ -532,14 +532,14 @@ public Object getAllKalaAES(GetDiseaseRequestHandler getDiseaseRequestHandler) {
             return Collections.singletonMap("message", "No data found for AES.");
         }
 
-        return diseaseAESJERepository.findAll().stream().filter(diseaseAesje -> Objects.equals(diseaseAesje.getUserId(), getDiseaseRequestHandler.getUserId())).collect(Collectors.toList());
+        return diseaseAESJERepository.findAll().stream().filter(diseaseAesje -> Objects.equals(diseaseAesje.getUserId(), getDiseaseRequestHandler.getAshaId())).collect(Collectors.toList());
     }
 
 
     public Object getAllFilaria(GetDiseaseRequestHandler getDiseaseRequestHandler) {
 
         // Fetch and filter Filaria disease records
-        List<ScreeningFilariasis> filteredList = diseaseFilariasisRepository.findAll().stream().filter(screeningFilariasis -> Objects.equals(screeningFilariasis.getUserId(), getDiseaseRequestHandler.getUserId())).collect(Collectors.toList());
+        List<ScreeningFilariasis> filteredList = diseaseFilariasisRepository.findAll().stream().filter(screeningFilariasis -> Objects.equals(screeningFilariasis.getUserId(), getDiseaseRequestHandler.getAshaId())).collect(Collectors.toList());
 
         // Check if the list is empty
         if (filteredList.isEmpty()) {
@@ -575,7 +575,7 @@ public Object getAllLeprosy(GetDiseaseRequestHandler getDiseaseRequestHandler) {
 
         // Fetch and filter Leprosy disease records
         List<ScreeningLeprosy> filteredList = diseaseLeprosyRepository.findAll().stream()
-                .filter(disease -> Objects.equals(disease.getUserId(), getDiseaseRequestHandler.getUserId()))
+                .filter(disease -> Objects.equals(disease.getUserId(), getDiseaseRequestHandler.getAshaId()))
                 .collect(Collectors.toList());
 
         // Check if the list is empty
