Release 3.11.0

src/main/environment/common_ci.properties

@@ -79,4 +79,14 @@ diagnostic.emrlite.truenat.password=@env.DIAGNOSTIC_EMRLITE_TRUENAT_PASSWORD@
 
 diagnostic.emrlite.token-ttl-seconds=@env.DIAGNOSTIC_EMRLITE_TOKEN_TTL_SECONDS@
 diagnostic.emrlite.refresh-ttl-seconds=@env.DIAGNOSTIC_EMRLITE_REFRESH_TTL_SECONDS@
+diagnostic.documents.storage-root=@env.DIAGNOSTIC_DOCUMENTS_STORAGE_ROOT@
+diagnostic.poll.xray.tick-ms=@env.DIAGNOSTIC_POLL_XRAY_TICK_MS@
+diagnostic.poll.truenat.tick-ms=@env.DIAGNOSTIC_POLL_TRUENAT_TICK_MS@
+# Daily cutoff (cron expression) after which all outstanding PENDING/IN_PROGRESS orders are marked EXPIRED
+diagnostic.poll.expiry-cron=@env.DIAGNOSTIC_POLL_EXPIRY_CRON@
+
+stoptb.enforce.vanid=@env.STOPTB_ENFORCE_VANID@
+# Stop TB: this deployment's van/camp ID, replacing the old Redis camp:vanID lookup
+stoptb.van.id=@env.STOPTB_VAN_ID@
+
 

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

@@ -1,5 +1,6 @@
 package com.iemr.flw.controller;
 
+import com.google.gson.Gson;
 import com.iemr.flw.dto.identity.GetBenRequestHandler;
 import com.iemr.flw.dto.iemr.*;
 import com.iemr.flw.service.IncentiveService;
@@ -31,6 +32,9 @@ public class IncentiveController {
     @Autowired
     IncentiveService incentiveService;
 
+    private static final Gson gson = new Gson();
+
+
     @Autowired
     private JwtUtil jwtUtil;
 
@@ -91,8 +95,10 @@ public String getAllIncentivesByUserId(@RequestBody GetBenRequestHandler request
         try {
 
             if (requestDTO != null) {
-                logger.info("request object with timestamp : " + new Timestamp(System.currentTimeMillis()) + " "
-                        + requestDTO);
+
+                logger.info("Request object with timestamp: {} | Request JSON: {}",
+                        new Timestamp(System.currentTimeMillis()),
+                        gson.toJson(requestDTO));
                 String s = incentiveService.getAllIncentivesByUserId(requestDTO);
                 //logger.info("User Incentive:" + s);
                 if (s != null)

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

@@ -2,9 +2,7 @@
 
 import com.iemr.flw.domain.iemr.TBConfirmedCaseDTO;
 import com.iemr.flw.dto.identity.GetBenRequestHandler;
-import com.iemr.flw.dto.iemr.TBConfirmedRequestDTO;
-import com.iemr.flw.dto.iemr.TBScreeningRequestDTO;
-import com.iemr.flw.dto.iemr.TBSuspectedRequestDTO;
+import com.iemr.flw.dto.iemr.*;
 import com.iemr.flw.service.TBConfirmedCaseService;
 import com.iemr.flw.service.TBScreeningService;
 import com.iemr.flw.service.TBSuspectedService;
@@ -192,6 +190,140 @@ public String getConfirmedByBenId(
         return response.toString();
     }
 
+    @Operation(summary = "save tb referral follow up")
+    @RequestMapping(value = { "/referralFollowUp/save" }, method = { RequestMethod.POST })
+    public String saveReferralFollowUp(
+            @RequestBody TbReferralFollowUpDTO requestDTO,
+            @RequestHeader(value = "jwtToken") String token) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            if (requestDTO != null) {
+
+                logger.info("request object with timestamp : "
+                        + new Timestamp(System.currentTimeMillis()) + " "
+                        + requestDTO);
+
+                String result = tbConfirmedCaseService.saveReferralFollowUp(requestDTO, token);
+
+                if (result != null)
+                    response.setResponse(result);
+                else
+                    response.setError(500, "No record saved");
+
+            } else {
+                response.setError(500, "Invalid/NULL request obj");
+            }
+        } catch (Exception e) {
+            logger.error("Error in save tb referral follow up details : ", e);
+            response.setError(500, "Error in save referral follow up details : " + e.getMessage());
+        }
+
+        return response.toString();
+    }
+
+
+    @Operation(summary = "save tb referral follow up")
+    @RequestMapping(value = { "/referralFollowUp/getAll" }, method = { RequestMethod.POST })
+    public String getReferralFollowUp(
+            @RequestHeader(value = "jwtToken") String token) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            if (token != null) {
+
+                logger.info("request object with timestamp : "
+                        + new Timestamp(System.currentTimeMillis()) + " "
+                        + token);
+
+                String result = tbConfirmedCaseService.getReferralFollowUp(token);
+
+                if (result != null)
+                    response.setResponse(result);
+                else
+                    response.setError(500, "No record saved");
+
+            } else {
+                response.setError(500, "Invalid/NULL request obj");
+            }
+        } catch (Exception e) {
+            logger.error("Error in save tb referral follow up details : ", e);
+            response.setError(500, "Error in save referral follow up details : " + e.getMessage());
+        }
+
+        return response.toString();
+    }
+
+
+
+    @Operation(summary = "save tb tpt follow up")
+    @RequestMapping(value = { "/tptFollowUp/save" }, method = { RequestMethod.POST })
+    public String savTptFollowUp(
+            @RequestBody TbTptFollowUpDTO requestDTO,
+            @RequestHeader(value = "jwtToken") String token) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            if (requestDTO != null) {
+
+                logger.info("request object with timestamp : "
+                        + new Timestamp(System.currentTimeMillis()) + " "
+                        + requestDTO);
+
+                String result = tbConfirmedCaseService.saveTptFollowUp(requestDTO, token);
+
+                if (result != null)
+                    response.setResponse(result);
+                else
+                    response.setError(500, "No record saved");
+
+            } else {
+                response.setError(500, "Invalid/NULL request obj");
+            }
+        } catch (Exception e) {
+            logger.error("Error in save tb tpt follow up details : ", e);
+            response.setError(500, "Error in save tpt follow up details : " + e.getMessage());
+        }
+
+        return response.toString();
+    }
+
+
+    @Operation(summary = "save tb tpt follow up")
+    @RequestMapping(value = { "/tptFollowUp/getAll" }, method = { RequestMethod.POST })
+    public String getTptFollowUp(
+            @RequestHeader(value = "jwtToken") String token) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            if (token != null) {
+
+                logger.info("request object with timestamp : "
+                        + new Timestamp(System.currentTimeMillis()) + " "
+                        + token);
+
+                String result = tbConfirmedCaseService.getTptFollowUp(token);
+
+                if (result != null)
+                    response.setResponse(result);
+                else
+                    response.setError(500, "No record saved");
+
+            } else {
+                response.setError(500, "Invalid/NULL request obj");
+            }
+        } catch (Exception e) {
+            logger.error("Error in save tb tpt follow up details : ", e);
+            response.setError(500, "Error in save tpt follow up details : " + e.getMessage());
+        }
+
+        return response.toString();
+    }
+
 
 
 }

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

@@ -102,19 +102,11 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Column(name = "longitude")
 	private BigDecimal longitude;
 
-	@Column(name = "gpsLatitude")
-	private Double gpsLatitude;
-
-	@Column(name = "gpsLongitude")
-	private Double gpsLongitude;
 
 	@Expose
 	@Column(name = "digipin")
 	private String digipin;
 
-	@Expose
-	@Column(name = "gpsTimestamp")
-	private Timestamp gpsTimestamp;
 
 	@Expose
 	@Column(name = "isGpsUnavailable", nullable = false, columnDefinition = "TINYINT(1) DEFAULT 0")

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

@@ -329,13 +329,6 @@ public class RMNCHHouseHoldDetails {
     @Column(name = "isDeactivate")
     private Boolean isDeactivate;
 
-	@Expose
-	@Column(name = "gpsLatitude")
-	private Double gpsLatitude;
-
-	@Expose
-	@Column(name = "gpsLongitude")
-	private Double gpsLongitude;
 
 	@Expose
 	@Column(name = "address")
@@ -353,4 +346,12 @@ public class RMNCHHouseHoldDetails {
 	@Column(name = "registeredAtCampSiteId")
 	private Integer registeredAtCampSiteId;
 
+    @Expose
+    @Column(name = "placeOfCurrentLiving")
+    private String placeOfCurrentLiving;
+
+    @Expose
+    @Column(name = "nameOfInstitution")
+    private String nameOfInstitution;
+
 }

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

@@ -44,4 +44,11 @@ public class AHDForm {
 
     @Column(name = "form_type")
     private String formType;
+
+    @Column(name = "synced_by")
+    private String syncedBy;
+
+    @org.hibernate.annotations.CreationTimestamp
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
 }

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

@@ -173,7 +173,12 @@ public class ANCVisit {
     @Column(name = "place_of_ancId")
     private Integer placeOfAncId;
 
+    @Column(name = "synced_by")
+    private String syncedBy;
 
+    @org.hibernate.annotations.CreationTimestamp
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
 
 
 

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

@@ -68,5 +68,12 @@ public class AdolescentHealth {
     @Column(name = "created_by")
     private String createdBy;
 
+    @Column(name = "synced_by")
+    private String syncedBy;
+
+    @org.hibernate.annotations.CreationTimestamp
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
+
 
 }

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

@@ -1,10 +1,13 @@
 package com.iemr.flw.domain.iemr;
 
 import jakarta.persistence.*;
+import lombok.Data;
+
 import java.sql.Timestamp;
 import java.util.Objects;
 
 @Entity
+@Data
 @Table(name = "t_anccare", schema = "db_iemr")
 public class AncCare {
     private long id;
@@ -41,6 +44,7 @@ public class AncCare {
     private Timestamp syncedDate;
     private String reservedForChange;
 
+
     @Id
     @Column(name = "ID")
     public long getId() {

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

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.Data;
 
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -112,6 +113,13 @@ public class AncCounsellingCare {
     @Column(name = "malpresentation")
     private Boolean malpresentation = false;
 
+    @Column(name = "synced_by")
+    private String syncedBy;
+
+    @org.hibernate.annotations.CreationTimestamp
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
+
     /* ---------- Lifecycle Hooks ---------- */
 
     @PrePersist

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

@@ -9,6 +9,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.sql.Timestamp;
+
 @Entity
 @Table(name = "asha_supervisor_mapping")
 @Data
@@ -31,4 +33,11 @@ public class AshaSupervisorMapping {
 
 	@Column(name = "deleted", insertable = false, updatable = true)
 	private Boolean deleted;
+
+	@Column(name = "synced_by")
+	private String syncedBy;
+
+	@org.hibernate.annotations.CreationTimestamp
+	@Column(name = "synced_date")
+	private Timestamp syncedDate;
 }

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

@@ -4,6 +4,7 @@
 import jakarta.validation.constraints.*;
 import lombok.*;
 
+import java.sql.Timestamp;
 import java.time.LocalDate;
 
 
@@ -109,4 +110,11 @@ public class AshaWorker {
     @Column(name = "supervisorMobile")
     private String supervisorMobile;
 
+    @Column(name = "synced_by")
+    private String syncedBy;
+
+    @org.hibernate.annotations.CreationTimestamp
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
+
 }

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

@@ -65,6 +65,8 @@ public class BenAnthropometryDetail {
     @Column(name = "SyncedBy")
     private String syncedBy;
 
+    @org.hibernate.annotations.CreationTimestamp
     @Column(name = "SyncedDate")
     private Timestamp syncedDate;
+
 }

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

@@ -68,6 +68,7 @@ public class BenChiefComplaint {
     @Column(name = "SyncedBy")
     private String syncedBy;
 
+    @org.hibernate.annotations.CreationTimestamp
     @Column(name = "SyncedDate")
     private Timestamp syncedDate;
 }

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

@@ -79,4 +79,11 @@ public class BenFlowStatus {
 
     @Column(name = "deleted", insertable = false)
     private Boolean deleted;
+
+    @Column(name = "synced_by")
+    private String syncedBy;
+
+    @org.hibernate.annotations.CreationTimestamp
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
 }