Vb/counselling

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

@@ -21,6 +21,7 @@
  */
 package com.iemr.flw.controller;
 
+import com.iemr.flw.dto.iemr.CompletedBeneficiariesDTO;
 import com.iemr.flw.dto.iemr.FormResponseDTO;
 import com.iemr.flw.dto.iemr.FormResponseRequest;
 import com.iemr.flw.masterEnum.FormType;
@@ -53,7 +54,7 @@ public class DynamicFormResponseController {
 
     private final DynamicFormResponseService responseService;
 
-    @Operation(summary = "Submit PRE_SUBMIT section answers, status → SUBMITTED. " +
+    @Operation(summary = "Submit GENERAL_INFO and PRE_SUBMIT section answers, status → SUBMITTED. " +
             "Pass responseId in body to re-submit an existing SUBMITTED response.")
     @RequestMapping(value = "/submit", method = RequestMethod.POST)
     public ResponseEntity<ApiResponse> submitForm(
@@ -98,13 +99,14 @@ 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, optionally filtered by village and/or provider service map")
+    @Operation(summary = "Get beneficiary IDs that have a COMPLETE or REFUSED 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,
             @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));
+        CompletedBeneficiariesDTO result =
+                responseService.getCompletedBeneficiaries(formType, villageId, providerServiceMapId);
+        return ResponseEntity.ok(new ApiResponse(true, "Completed beneficiaries fetched successfully", result));
     }
 }

src/main/java/com/iemr/flw/domain/iemr/FormSection.java

@@ -21,9 +21,12 @@
  */
 package com.iemr.flw.domain.iemr;
 
+import com.iemr.flw.masterEnum.SectionPhase;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -71,20 +74,22 @@ public class FormSection {
     @Column(name = "sectionName_hindi", length = 255)
     private String sectionNameHindi;
 
-    /** PRE_SUBMIT sections are shown before the form's main submit. POST_SUBMIT after. */
+    @Enumerated(EnumType.STRING)
     @Column(name = "sectionPhase", nullable = false, length = 20)
-    private String sectionPhase;
+    private SectionPhase sectionPhase;
 
     @Column(name = "isRequired", nullable = false)
     private Boolean isRequired = true;
 
     @Column(name = "displayOrder", nullable = false)
     private Integer displayOrder;
 
-    /** True only on the last PRE_SUBMIT section — renders the Submit button. */
     @Column(name = "hasSubmitButton", nullable = false)
     private Boolean hasSubmitButton = false;
 
+    @Column(name = "isEditable", nullable = false)
+    private Boolean isEditable = false;
+
     @Column(name = "created_by", length = 100)
     private String createdBy;
 

src/main/java/com/iemr/flw/domain/iemr/SectionQuestion.java

@@ -47,7 +47,7 @@
 
 /**
  * A question within a form section.
- * questionType: RADIO | MCQ | TEXT | DATE | DISPLAY | AUTO_FILL
+ * questionType: RADIO | MCQ | CHECKBOX | TEXT | DATE | DISPLAY | AUTO_FILL
  */
 @Entity
 @Table(name = "t_section_question", schema = "db_iemr")

src/main/java/com/iemr/flw/dto/iemr/CompletedBeneficiariesDTO.java

@@ -0,0 +1,44 @@
+/*
+ * AMRIT – Accessible Medical Records via Integrated Technology
+ * Integrated EHR (Electronic Health Records) Solution
+ *
+ * Copyright (C) "Piramal Swasthya Management and Research Institute"
+ *
+ * This file is part of AMRIT.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+package com.iemr.flw.dto.iemr;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * Beneficiary IDs for a form type, split by outcome: those who completed the form and those
+ * who refused (TB2_GI_Q1 = NO on the General Info consent question).
+ *
+ * @author Piramal Swasthya
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CompletedBeneficiariesDTO {
+    private List<Long> completed;
+    private List<Long> refused;
+}

src/main/java/com/iemr/flw/dto/iemr/FormSectionDTO.java

@@ -21,6 +21,7 @@
  */
 package com.iemr.flw.dto.iemr;
 
+import com.iemr.flw.masterEnum.SectionPhase;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -49,8 +50,8 @@ public class FormSectionDTO {
 
     private String sectionNameHindi;
 
-    @NotBlank(message = "sectionPhase is required (PRE_SUBMIT or POST_SUBMIT)")
-    private String sectionPhase;
+    @NotNull(message = "sectionPhase is required (GENERAL_INFO, PRE_SUBMIT, or POST_SUBMIT)")
+    private SectionPhase sectionPhase;
 
     private Boolean isRequired = true;
 
@@ -59,6 +60,8 @@ public class FormSectionDTO {
 
     private Boolean hasSubmitButton = false;
 
+    private Boolean isEditable = false;
+
     @Valid
     private List<SectionQuestionDTO> questions = new ArrayList<>();
 }

src/main/java/com/iemr/flw/dto/iemr/SectionResponseDTO.java

@@ -42,6 +42,8 @@ public class SectionResponseDTO {
 
     private Long sectionResponseId;
     private Long sectionId;
+    private String sectionUuid;
+    private Boolean isEditable;
     private String status;
     private Timestamp savedAt;
     private List<QuestionResponseDTO> answers;

src/main/java/com/iemr/flw/masterEnum/FormResponseStatus.java

@@ -0,0 +1,36 @@
+/*
+ * AMRIT – Accessible Medical Records via Integrated Technology
+ * Integrated EHR (Electronic Health Records) Solution
+ *
+ * Copyright (C) "Piramal Swasthya Management and Research Institute"
+ *
+ * This file is part of AMRIT.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+package com.iemr.flw.masterEnum;
+
+/**
+ * Lifecycle status stored in FormResponse.status.
+ *
+ * @author Piramal Swasthya
+ */
+public enum FormResponseStatus {
+    /** Saved via /submit. */
+    SUBMITTED,
+    /** Saved via /complete, consent question answered YES (or not applicable). */
+    COMPLETE,
+    /** Saved via /complete, consent question TB2_GI_Q1 answered NO. */
+    REFUSED
+}

src/main/java/com/iemr/flw/masterEnum/FormType.java

@@ -30,5 +30,6 @@ public enum FormType {
     COUNSELLING_MODULE,
     SCREENING,
     COUNSELLING,
-    TB_COUNSELLING
+    TB_COUNSELLING,
+    TB_COUNSELLING_V2
 }

src/main/java/com/iemr/flw/masterEnum/QuestionType.java

@@ -32,6 +32,9 @@ public enum QuestionType {
     RADIO,
     /** Multi-select from a predefined list of options. */
     MCQ,
+    /** Single boolean checkbox — checked or unchecked. May carry options for display
+     *  purposes; answers are still stored as free text. */
+    CHECKBOX,
     /** Free-text input. */
     TEXT,
     /** Date picker input. */

src/main/java/com/iemr/flw/masterEnum/SectionPhase.java

@@ -0,0 +1,37 @@
+/*
+ * AMRIT – Accessible Medical Records via Integrated Technology
+ * Integrated EHR (Electronic Health Records) Solution
+ *
+ * Copyright (C) "Piramal Swasthya Management and Research Institute"
+ *
+ * This file is part of AMRIT.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+package com.iemr.flw.masterEnum;
+
+/**
+ * Exhaustive set of phases a form section can belong to.
+ * No other values may be stored in t_form_section.sectionPhase.
+ *
+ * @author Piramal Swasthya
+ */
+public enum SectionPhase {
+    /** Shown first, before PRE_SUBMIT sections. */
+    GENERAL_INFO,
+    /** Shown before the form's main submit. Saved via /submit. */
+    PRE_SUBMIT,
+    /** Shown after the main submit. Saved via /complete. */
+    POST_SUBMIT
+}

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

@@ -60,6 +60,14 @@ List<Long> findCounselledBenIds(@Param("benIds") List<Long> benIds,
                                     @Param("formId") Long formId,
                                     @Param("status") String status);
 
+    @Query("SELECT r.beneficiaryId FROM FormResponse r " +
+           "WHERE r.beneficiaryId IN :benIds " +
+           "AND r.formId = :formId " +
+           "AND r.status = :status")
+    List<Long> findCounselledBenIds(@Param("benIds") List<Long> benIds,
+                                    @Param("formId") Long formId,
+                                    @Param("status") String status);
+
     @Query("SELECT r FROM FormResponse r "
          + "WHERE r.formId IN :formIds "
          + "AND r.status = 'SUBMITTED' "

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

@@ -29,6 +29,7 @@
 import com.iemr.flw.dto.iemr.SectionQuestionDTO;
 import com.iemr.flw.masterEnum.FormType;
 import com.iemr.flw.masterEnum.QuestionType;
+import com.iemr.flw.masterEnum.SectionPhase;
 import com.iemr.flw.masterEnum.ValidationType;
 import com.iemr.flw.repo.iemr.DynamicFormRepo;
 import com.iemr.flw.service.DynamicFormDefinitionService;
@@ -93,7 +94,7 @@ private DynamicFormDTO buildFormDto() {
     // ── Section A: Disease Awareness ─────────────────────────────────────────────
 
     private FormSectionDTO buildSectionA() {
-        FormSectionDTO s = section("TB_SEC_A", "Disease Awareness", "बीमारी के बारे में जागरूकता", "PRE_SUBMIT", 1, true, false);
+        FormSectionDTO s = section("TB_SEC_A", "Disease Awareness", "बीमारी के बारे में जागरूकता", SectionPhase.PRE_SUBMIT, 1, true, false);
         List<SectionQuestionDTO> qs = new ArrayList<>();
         qs.add(yesNoRadio("TB_A_Q1", "TB disease explained to patient", "मरीज़ को टीबी बीमारी के बारे में समझाया गया।", 1, true));
         qs.add(yesNoRadio("TB_A_Q2", "Transmission route explained", "ट्रांसमिशन के तरीके के बारे में जानकारी", 2, true));
@@ -107,7 +108,7 @@ private FormSectionDTO buildSectionA() {
     // ── Section B: Do's and Don'ts ───────────────────────────────────────────────
 
     private FormSectionDTO buildSectionB() {
-        FormSectionDTO s = section("TB_SEC_B", "Do's and Don'ts", "करो और ना करो", "PRE_SUBMIT", 2, true, false);
+        FormSectionDTO s = section("TB_SEC_B", "Do's and Don'ts", "करो और ना करो", SectionPhase.PRE_SUBMIT, 2, true, false);
         List<SectionQuestionDTO> qs = new ArrayList<>();
         qs.add(yesNoRadio("TB_B_Q1", "Cover mouth while coughing — advised", "खांसते समय मुंह ढकने की सलाह दी जाती है।", 1, true));
         qs.add(yesNoRadio("TB_B_Q2", "Complete full treatment course — advised", "इलाज का पूरा कोर्स पूरा करने की सलाह दी जाती है।", 2, true));
@@ -123,7 +124,7 @@ private FormSectionDTO buildSectionB() {
     // ── Section C: Government Schemes ────────────────────────────────────────────
 
     private FormSectionDTO buildSectionC() {
-        FormSectionDTO s = section("TB_SEC_C", "Government Schemes", "सरकारी योजनाएं", "PRE_SUBMIT", 3, false, false);
+        FormSectionDTO s = section("TB_SEC_C", "Government Schemes", "सरकारी योजनाएं", SectionPhase.PRE_SUBMIT, 3, false, false);
         List<SectionQuestionDTO> qs = new ArrayList<>();
         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));
@@ -135,7 +136,7 @@ private FormSectionDTO buildSectionC() {
     // ── Section D: Treatment Regimen ─────────────────────────────────────────────
 
     private FormSectionDTO buildSectionD() {
-        FormSectionDTO s = section("TB_SEC_D", "Treatment Regimen", "इलाज का तरीका", "PRE_SUBMIT", 4, true, false);
+        FormSectionDTO s = section("TB_SEC_D", "Treatment Regimen", "इलाज का तरीका", SectionPhase.PRE_SUBMIT, 4, true, false);
         List<SectionQuestionDTO> qs = new ArrayList<>();
         qs.add(yesNoRadio("TB_D_Q1", "Regimen explained to patient", "मरीज़ को इलाज का तरीका समझाया गया।", 1, true));
         qs.add(yesNoRadio("TB_D_Q2", "Medication names explained", "दवाओं के नामों की जानकारी", 2, true));
@@ -149,7 +150,7 @@ private FormSectionDTO buildSectionD() {
     // ── Section E: Counselling Completion ────────────────────────────────────────
 
     private FormSectionDTO buildSectionE() {
-        FormSectionDTO s = section("TB_SEC_E", "Counselling Completion", "काउंसलिंग पूरी होना", "PRE_SUBMIT", 5, true, true);
+        FormSectionDTO s = section("TB_SEC_E", "Counselling Completion", "काउंसलिंग पूरी होना", SectionPhase.PRE_SUBMIT, 5, true, true);
         List<SectionQuestionDTO> qs = new ArrayList<>();
 
         // Counselling completion status — RADIO: Complete | Refused
@@ -194,7 +195,7 @@ private FormSectionDTO buildSectionE() {
     // ── Section F: Follow Up to TU ───────────────────────────────────────────────
 
     private FormSectionDTO buildSectionF() {
-        FormSectionDTO s = section("TB_SEC_F", "Follow Up to TU", "TU के बाद की कार्रवाई", "POST_SUBMIT", 6, true, true);
+        FormSectionDTO s = section("TB_SEC_F", "Follow Up to TU", "TU के बाद की कार्रवाई", SectionPhase.POST_SUBMIT, 6, true, true);
         List<SectionQuestionDTO> qs = new ArrayList<>();
 
         // "Has the patient started TB treatment?" — RADIO: Yes | No
@@ -244,7 +245,7 @@ private FormSectionDTO buildSectionF() {
 
     // ── Builder Helpers ───────────────────────────────────────────────────────────
 
-    private FormSectionDTO section(String uuid, String name, String nameHindi, String phase,
+    private FormSectionDTO section(String uuid, String name, String nameHindi, SectionPhase phase,
                                    int order, boolean required, boolean hasSubmitButton) {
         FormSectionDTO s = new FormSectionDTO();
         s.setSectionUuid(uuid);