Vb/counselling

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

@@ -33,6 +33,7 @@
  * A single question's answer within a section answer request.
  * Exactly one of optionValue, optionValues, answerText, or answerDate should be set per question type:
  * RADIO      → optionValue (single string)
+ * CHECKBOX   → optionValue (single string, e.g. "CHECKED")
  * MCQ        → optionValues (list of strings, one row saved per element)
  * TEXT/AUTO_FILL → answerText
  * DATE       → answerDate (ISO date string) or answerText

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

@@ -40,7 +40,7 @@ public class QuestionResponseDTO {
 
     private Long questionResponseId;
     private Long questionId;
-    /** Populated for RADIO and MCQ answers. */
+    /** Populated for RADIO, MCQ, and CHECKBOX answers. */
     private Long optionId;
     /** Populated for TEXT, DATE, AUTO_FILL answers. */
     private String answerText;

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

@@ -32,8 +32,8 @@ 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. */
+    /** Single boolean checkbox — checked or unchecked. Resolved like RADIO: submit
+     *  optionValue to select it, omit to leave unanswered. */
     CHECKBOX,
     /** Free-text input. */
     TEXT,

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

@@ -358,6 +358,25 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
                         if (benDetailsRMNCH_OBJ.getGpsLongitude() != null)
                             benDetailsRMNCH_OBJ.setLongitude(BigDecimal.valueOf(benDetailsRMNCH_OBJ.getGpsLongitude()));
 
+                        // GPS fallback: if not in RMNCH details (syncdatatoamrti not yet called),
+                        // pull from i_beneficiaryaddress (saved during TM-API registration)
+                        if (benDetailsRMNCH_OBJ.getGpsLatitude() == null && benAddressOBJ.getGpsLatitude() != null)
+                            benDetailsRMNCH_OBJ.setGpsLatitude(benAddressOBJ.getGpsLatitude());
+                        if (benDetailsRMNCH_OBJ.getGpsLongitude() == null && benAddressOBJ.getGpsLongitude() != null)
+                            benDetailsRMNCH_OBJ.setGpsLongitude(benAddressOBJ.getGpsLongitude());
+                        if (benDetailsRMNCH_OBJ.getDigipin() == null && benAddressOBJ.getDigipin() != null)
+                            benDetailsRMNCH_OBJ.setDigipin(benAddressOBJ.getDigipin());
+                        if (benDetailsRMNCH_OBJ.getGpsTimestamp() == null && benAddressOBJ.getGpsTimestamp() != null)
+                            benDetailsRMNCH_OBJ.setGpsTimestamp(benAddressOBJ.getGpsTimestamp());
+                        if (benDetailsRMNCH_OBJ.getIsGpsUnavailable() == null && benAddressOBJ.getIsGpsUnavailable() != null)
+                            benDetailsRMNCH_OBJ.setIsGpsUnavailable(benAddressOBJ.getIsGpsUnavailable());
+
+                        // Map GPS double fields to the exposed latitude/longitude BigDecimal fields for response
+                        if (benDetailsRMNCH_OBJ.getGpsLatitude() != null)
+                            benDetailsRMNCH_OBJ.setLatitude(BigDecimal.valueOf(benDetailsRMNCH_OBJ.getGpsLatitude()));
+                        if (benDetailsRMNCH_OBJ.getGpsLongitude() != null)
+                            benDetailsRMNCH_OBJ.setLongitude(BigDecimal.valueOf(benDetailsRMNCH_OBJ.getGpsLongitude()));
+
                         // -----------------------------------------------------------------------------
 
                         // related benids

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

@@ -37,6 +37,7 @@
 import com.iemr.flw.dto.iemr.SectionResponseDTO;
 import com.iemr.flw.domain.iemr.DynamicForm;
 import com.iemr.flw.masterEnum.FormResponseStatus;
+import com.iemr.flw.masterEnum.FormResponseStatus;
 import com.iemr.flw.masterEnum.FormType;
 import com.iemr.flw.repo.iemr.DynamicFormRepo;
 import com.iemr.flw.repo.iemr.FormResponseRepo;
@@ -388,7 +389,7 @@ private List<QuestionResponse> processAnswers(
             // Delete any existing answers for this question in this section (handles re-saves)
             questionResponseRepo.deleteByQuestionIdAndSectionResponseId(questionId, sectionResponseId);
 
-            if (type == QuestionType.RADIO) {
+            if (type == QuestionType.RADIO || type == QuestionType.CHECKBOX) {
                 if (answer.getOptionValue() != null) {
                     QuestionOption opt = resolveOption(
                             optionsByQuestion, questionId, answer.getOptionValue(), answer.getQuestionUuid());

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

@@ -328,7 +328,7 @@ private List<QuestionResponse> processAnswers(
 
             questionResponseRepo.deleteByQuestionIdAndSectionResponseId(questionId, sectionResponseId);
 
-            if (type == QuestionType.RADIO) {
+            if (type == QuestionType.RADIO || type == QuestionType.CHECKBOX) {
                 if (answer.getOptionValue() != null) {
                     QuestionOption opt = resolveOption(optionsByQuestion, questionId,
                             answer.getOptionValue(), answer.getQuestionUuid());