feat(AMM-2342): StopTB General OPD prescription and camp-store dispensing on AMRIT standard tables

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

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.iemr.flw.service.StopTBPrescriptionService;
 import com.iemr.flw.service.StopTBService;
 import com.iemr.flw.utils.response.OutputResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -101,6 +102,10 @@ public String saveGeneralOpd(@RequestBody List<Map<String, Object>> dataList) {
         try {
             List<Map<String, Object>> result = stopTBService.saveGeneralOpd(dataList);
             response.setResponse(gson.toJson(result));
+        } catch (StopTBPrescriptionService.InsufficientStockException e) {
+            // Nothing was saved; the app shows this and lets the nurse lower the quantity.
+            logger.warn("saveGeneralOpd rejected: " + e.getMessage());
+            response.setError(5000, e.getMessage());
         } catch (Exception e) {
             logger.error("Error in saveGeneralOpd: " + e);
             response.setError(5000, "Error saving general OPD: " + e.getMessage());

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

@@ -84,6 +84,6 @@ public class DiagnosticDocument {
     @Column(name = "parkingPlaceID")
     private Integer parkingPlaceID;
 
-    @Column(name = "vanSerialNo")
+    @Column(name = "vanSerialNo", updatable = false)
     private Long vanSerialNo;
 }

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

@@ -106,6 +106,6 @@ public class DiagnosticOrder {
     @Column(name = "processed")
     private String processed = "N";
 
-    @Column(name = "vanSerialNo")
+    @Column(name = "vanSerialNo", updatable = false)
     private Long vanSerialNo;
 }

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

@@ -46,6 +46,6 @@ public class DiagnosticProviderToken {
     @Column(name = "parkingPlaceID")
     private Integer parkingPlaceID;
 
-    @Column(name = "vanSerialNo")
+    @Column(name = "vanSerialNo", updatable = false)
     private Long vanSerialNo;
 }

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

@@ -70,6 +70,6 @@ public class DiagnosticResult {
     @Column(name = "parkingPlaceID")
     private Integer parkingPlaceID;
 
-    @Column(name = "vanSerialNo")
+    @Column(name = "vanSerialNo", updatable = false)
     private Long vanSerialNo;
 }

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

@@ -135,6 +135,6 @@ public class StopTBDiagnostics {
     @Column(name = "processed")
     private String processed = "N";
 
-    @Column(name = "vanSerialNo")
+    @Column(name = "vanSerialNo", updatable = false)
     private Long vanSerialNo;
 }

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

@@ -1,8 +1,14 @@
 package com.iemr.flw.service;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Camp/van identity for this deployment.
  *
@@ -17,12 +23,14 @@
  * No inline default — every properties file must set stoptb.van.id explicitly, so a forgotten
  * config fails loudly at startup instead of silently running unconfigured.
  *
- * Scope: vanID (and the VanSerialNo stamping that depends on it) only. parkingPlaceID is out of
- * scope for this change.
+ * The van's parking place and store (facility) come from m_van, the same source MMU uses
+ * (MasterVanRepo.getFacilityID), and are read once and cached since the van never changes.
  */
 @Service
 public class CampConfigService {
 
+    private final Logger logger = LoggerFactory.getLogger(CampConfigService.class);
+
     @Value("${stoptb.van.id}")
     private int vanID;
 
@@ -31,6 +39,12 @@ public class CampConfigService {
     @Value("${stoptb.enforce.vanid}")
     private boolean enforceVanID;
 
+    @PersistenceContext(unitName = "db_iemr")
+    private EntityManager entityManager;
+
+    private volatile Integer parkingPlaceID;
+    private volatile Integer facilityID;
+
     public Integer getVanID() {
         if (vanID <= 0) {
             if (enforceVanID) {
@@ -42,13 +56,51 @@ public Integer getVanID() {
         return vanID;
     }
 
+    /**
+     * The configured van (stoptb.van.id) is always used. A vanID sent by the app is ignored, so data and
+     * stock never land on another camp's van/store; a different value is only logged.
+     */
+    public Integer resolveVanID(Integer requestedVanID) {
+        Integer configured = getVanID();
+        if (requestedVanID != null && requestedVanID > 0 && !requestedVanID.equals(configured)) {
+            logger.warn("Ignoring vanID " + requestedVanID + " from request; using stoptb.van.id " + configured);
+        }
+        return configured;
+    }
+
     public boolean isCampConfigured() {
         return vanID > 0;
     }
 
-    // Not sourced from Redis anymore (out of scope for this change) — kept only because
-    // callers across StopTBServiceImpl/DiagnosticOrderServiceImpl/etc. still call it.
+    // Parking place of the configured van (m_van.ParkingPlaceID); 0 when the camp is not configured
+    // or the van is not found, which is what callers received before this lookup existed.
     public Integer getParkingPlaceID() {
-        return 0;
+        if (parkingPlaceID == null) loadVanDetails();
+        return parkingPlaceID != null ? parkingPlaceID : 0;
+    }
+
+    // Store mapped to the configured van (m_van.FacilityID); null when no store is mapped.
+    public Integer getFacilityID() {
+        if (facilityID == null) loadVanDetails();
+        return facilityID;
+    }
+
+    private synchronized void loadVanDetails() {
+        if (!isCampConfigured() || (parkingPlaceID != null && facilityID != null)) return;
+        try {
+            List<?> rows = entityManager.createNativeQuery(
+                    "SELECT ParkingPlaceID, FacilityID FROM db_iemr.m_van WHERE VanID = :vanID AND Deleted = false")
+                    .setParameter("vanID", vanID)
+                    .getResultList();
+            if (rows.isEmpty()) {
+                logger.warn("stoptb.van.id " + vanID + " not found in m_van");
+                return;
+            }
+            Object[] row = (Object[]) rows.get(0);
+            parkingPlaceID = row[0] != null ? ((Number) row[0]).intValue() : null;
+            facilityID = row[1] != null ? ((Number) row[1]).intValue() : null;
+        } catch (Exception e) {
+            logger.error("Cannot read m_van details for vanID " + vanID, e);
+        }
     }
 }