Vb/counselling

src/main/java/com/iemr/flw/controller/DynamicFormResponseController.java

@@ -98,10 +98,13 @@ public ResponseEntity<ApiResponse> getById(@RequestParam Long responseId) {
         FormResponseDTO dto = responseService.getResponseById(responseId);
         return ResponseEntity.ok(new ApiResponse(true, "Response fetched successfully", dto));
     }
-    @Operation(summary = "Get beneficiary IDs that have a COMPLETE form response for the given form type")
+    @Operation(summary = "Get beneficiary IDs that have a COMPLETE form response for the given form type, optionally filtered by village and/or provider service map")
     @RequestMapping(value = "/getCompletedBeneficiaries", method = RequestMethod.GET)
-    public ResponseEntity<ApiResponse> getCompletedBeneficiaries(@RequestParam FormType formType) {
-        List<Long> beneficiaryIds = responseService.getCompletedBeneficiaries(formType);
+    public ResponseEntity<ApiResponse> getCompletedBeneficiaries(
+            @RequestParam FormType formType,
+            @RequestParam(required = false) Integer villageId,
+            @RequestParam(required = false) Integer providerServiceMapId) {
+        List<Long> beneficiaryIds = responseService.getCompletedBeneficiaries(formType, villageId, providerServiceMapId);
         return ResponseEntity.ok(new ApiResponse(true, "Completed beneficiaries fetched successfully", beneficiaryIds));
     }
 }

src/main/java/com/iemr/flw/domain/identity/RMNCHBeneficiaryDetailsRmnch.java

@@ -120,6 +120,10 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Column(name = "isGpsUnavailable", nullable = false, columnDefinition = "TINYINT(1) DEFAULT 0")
 	private Boolean isGpsUnavailable = false;
 
+	@Expose
+	@Column(name = "gpsUnavailableReason")
+	private String gpsUnavailableReason;
+
 	@Expose
 	@Column(name = "menstrualBFDId")
 	private Integer menstrualBFDId;

src/main/java/com/iemr/flw/domain/identity/RMNCHMBeneficiaryaddress.java

@@ -262,4 +262,7 @@ public class RMNCHMBeneficiaryaddress implements Serializable {
 
 	@Column(name = "isGpsUnavailable", nullable = false, columnDefinition = "TINYINT(1) DEFAULT 0")
 	private Boolean isGpsUnavailable = false;
+
+	@Column(name = "gpsUnavailableReason")
+	private String gpsUnavailableReason;
 }

src/main/java/com/iemr/flw/repo/iemr/FormResponseRepo.java

@@ -43,6 +43,15 @@ public interface FormResponseRepo extends JpaRepository<FormResponse, Long> {
    @Query("SELECT r.beneficiaryId FROM FormResponse r WHERE r.formId = :formId AND r.status = :status")
     List<Long> findBeneficiaryIdsByFormIdAndStatus(@Param("formId") Long formId, @Param("status") String status);
 
+    @Query("SELECT r.beneficiaryId FROM FormResponse r WHERE r.formId = :formId AND r.status = :status " +
+           "AND r.beneficiaryId IN (SELECT b.beneficiaryID FROM BenFlowStatus b WHERE b.deleted = false " +
+           "AND (:villageId IS NULL OR b.villageID = :villageId) " +
+           "AND (:providerServiceMapId IS NULL OR b.providerServiceMapId = :providerServiceMapId))")
+    List<Long> findBeneficiaryIdsByFormIdAndStatusFiltered(@Param("formId") Long formId,
+                                                            @Param("status") String status,
+                                                            @Param("villageId") Integer villageId,
+                                                            @Param("providerServiceMapId") Integer providerServiceMapId);
+
     @Query("SELECT r.beneficiaryId FROM FormResponse r " +
            "WHERE r.beneficiaryId IN :benIds " +
            "AND r.formId = :formId " +

src/main/java/com/iemr/flw/seeder/TbCounsellingFormSeeder.java

@@ -85,7 +85,7 @@ private DynamicFormDTO buildFormDto() {
         sections.add(buildSectionC());
         sections.add(buildSectionD());
         sections.add(buildSectionE());
-        sections.add(buildSectionF());
+//        sections.add(buildSectionF());
         dto.setSections(sections);
         return dto;
     }
@@ -125,8 +125,8 @@ private FormSectionDTO buildSectionB() {
     private FormSectionDTO buildSectionC() {
         FormSectionDTO s = section("TB_SEC_C", "Government Schemes", "सरकारी योजनाएं", "PRE_SUBMIT", 3, false, false);
         List<SectionQuestionDTO> qs = new ArrayList<>();
-        qs.add(yesNoRadio("TB_C_Q1", "Nikshay Poshan Yojana (NPY) eligibility explained", "निक्षय पोषण योजना (एनपीवाई) पात्रता के बारे में बताया गया", 1, false));
-        qs.add(yesNoRadio("TB_C_Q2", "DOTS free treatment explained", "DOTS मुफ़्त इलाज के बारे में जानकारी", 2, false));
+        qs.add(yesNoRadio("TB_C_Q1", "Nikshay Poshan Yojana (NPY) eligibility explained", "निक्षय पोषण योजना (एनपीवाई) पात्रता के बारे में बताया गया", 1, true));
+        qs.add(yesNoRadio("TB_C_Q2", "DOTS free treatment explained", "DOTS मुफ़्त इलाज के बारे में जानकारी", 2, true));
         qs.add(textQuestion("TB_C_REMARKS", "Schemes notes", "योजनाओं के नोट्स", 3, false, 300, true));
         s.setQuestions(qs);
         return s;

src/main/java/com/iemr/flw/service/DynamicFormResponseService.java

@@ -61,6 +61,6 @@ public interface DynamicFormResponseService {
      */
     List<FormResponseDTO> findPendingFollowUps(List<Long> formIds, int delayDays);
 
-    /** Returns beneficiary IDs with COMPLETE status for the given form type. */
-    List<Long> getCompletedBeneficiaries(FormType formType);
+    /** Returns beneficiary IDs with COMPLETE status for the given form type, optionally filtered by village and/or provider service map. */
+    List<Long> getCompletedBeneficiaries(FormType formType, Integer villageId, Integer providerServiceMapId);
 }

src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java

@@ -337,6 +337,8 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                             benDetailsRMNCH_OBJ.setGpsTimestamp(benAddressOBJ.getGpsTimestamp());
                         if (benDetailsRMNCH_OBJ.getIsGpsUnavailable() == null && benAddressOBJ.getIsGpsUnavailable() != null)
                             benDetailsRMNCH_OBJ.setIsGpsUnavailable(benAddressOBJ.getIsGpsUnavailable());
+                        if (benDetailsRMNCH_OBJ.getGpsUnavailableReason() == null && benAddressOBJ.getGpsUnavailableReason() != null)
+                            benDetailsRMNCH_OBJ.setGpsUnavailableReason(benAddressOBJ.getGpsUnavailableReason());
 
                         // Map GPS double fields to the exposed latitude/longitude BigDecimal fields for response
                         if (benDetailsRMNCH_OBJ.getGpsLatitude() != null)

src/main/java/com/iemr/flw/service/impl/DynamicFormResponseServiceImpl.java

@@ -124,19 +124,17 @@ public FormResponseDTO completeForm(FormResponseRequest request, String jwtToken
 
         FormVersion version = resolveLatestVersion(request.getFormUuid());
         Long formId = version.getDynamicForm().getFormId();
+        Timestamp now = new Timestamp(System.currentTimeMillis());
 
         List<FormResponse> existing =
                 formResponseRepo.findByBeneficiaryIdAndFormId(request.getBeneficiaryId(), formId);
-        if (existing.isEmpty()) {
-            throw new NoSuchElementException(
-                    "FormResponse not found for beneficiaryId=" + request.getBeneficiaryId()
-                    + " formUuid=" + request.getFormUuid());
-        }
-        FormResponse formResponse = existing.get(0);
+        FormResponse formResponse = existing.isEmpty()
+                ? createFormResponse(request, version, STATUS_SUBMITTED, now)
+                : existing.get(0);
 
         formResponse.setUpdatedBy(actor);
         formResponse.setStatus(STATUS_COMPLETE);
-        formResponse.setCompletedAt(new Timestamp(System.currentTimeMillis()));
+        formResponse.setCompletedAt(now);
         formResponse = formResponseRepo.save(formResponse);
         return processSections(formResponse, request, version, actor);
     }
@@ -469,10 +467,12 @@ public List<FormResponseDTO> findPendingFollowUps(List<Long> formIds, int delayD
 
     @Override
     @Transactional(readOnly = true)
-    public List<Long> getCompletedBeneficiaries(FormType formType) {
+    public List<Long> getCompletedBeneficiaries(FormType formType, Integer villageId, Integer providerServiceMapId) {
         DynamicForm form = dynamicFormRepo.findByFormTypeAndIsActive(formType, true)
                 .orElseThrow(() -> new NoSuchElementException(
                         "No active form found for type: " + formType));
-        return formResponseRepo.findBeneficiaryIdsByFormIdAndStatus(form.getFormId(), STATUS_COMPLETE);
+        return (villageId != null || providerServiceMapId != null)
+                ? formResponseRepo.findBeneficiaryIdsByFormIdAndStatusFiltered(form.getFormId(), STATUS_COMPLETE, villageId, providerServiceMapId)
+                : formResponseRepo.findBeneficiaryIdsByFormIdAndStatus(form.getFormId(), STATUS_COMPLETE);
     }
 }