Release 3.12.1

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

@@ -49,6 +49,9 @@
     @Autowired
     private DiseaseControlService diseaseControlService;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
 
     @RequestMapping(value = "malaria/saveAll", method = RequestMethod.POST, consumes = "application/json", produces = "application/json",headers = "Authorization")
     public ResponseEntity<Map<String, Object>> saveMalaria(@RequestBody MalariaDTO malariaDTO) {
@@ -283,7 +286,7 @@
                 return ResponseEntity.ok(response);
             } else {
                 response.put("statusCode", HttpStatus.NOT_FOUND.value());
                 response.put("message", "No records found");
                 return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
             }
 
@@ -375,4 +378,72 @@
     }
 
 
+    @RequestMapping(value = "generalCheckUp/getAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> getGeneralCheckUp(@RequestBody GetBenRequestHandler getBenRequestHandler,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+
+        try {
+            List<GeneralCheckUpDto> result =
+                    diseaseControlService.getGeneralCheckUp(token);
+
+            if (result != null && !result.isEmpty()) {
+                response.put("statusCode", HttpStatus.OK.value());
+                response.put("data", result);
+                return ResponseEntity.ok(response);
+            } else {
+                response.put("statusCode", HttpStatus.NOT_FOUND.value());
+                response.put("message", "No records found");
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
+            }
+
+        } catch (Exception e) {
+            logger.error("Error fetching Chronic Disease Visit :", e);
+            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("errorMessage", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+        }
+    }
+
+
+    @RequestMapping(value = "generalCheckUp/saveAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> savGeneralCheckUp(
+            @RequestBody List<GeneralCheckUpDto> requestList,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+        logger.info("####################################################");
+        try {
+            logger.info("General Checkup Save Request: {}",
+                    objectMapper.writerWithDefaultPrettyPrinter()
+                            .writeValueAsString(requestList));
+        } catch (Exception e) {
+            logger.error("Failed to convert request to JSON", e);
+        }
+        logger.info("####################################################");
+
+        try {
+            List<GeneralCheckUpDto> savedList =
+                    diseaseControlService.saveGeneralCheckUp(requestList,token);
+
+            if (savedList != null && !savedList.isEmpty()) {
+                response.put("statusCode", HttpStatus.OK.value());
+                response.put("message", "Data saved successfully");
+                response.put("data", savedList);
+                return ResponseEntity.ok(response);
+            } else {
+                response.put("statusCode", HttpStatus.BAD_REQUEST.value());
+                response.put("message", "No data saved");
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
+            }
+
+        } catch (Exception e) {
+            logger.error("Error saving Chronic Disease Visit :", e);
+            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("errorMessage", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+        }
+    }
+
+
+
 }

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

@@ -0,0 +1,121 @@
+/*
+* 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/.
+*
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+*/
+package com.iemr.flw.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iemr.flw.dto.identity.GetBenRequestHandler;
+import com.iemr.flw.dto.iemr.*;
+import com.iemr.flw.service.DiseaseControlService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/generalCheckUpFollowUp",headers = "Authorization")
+public class GeneralCheckUpFollowUpController {
+    private final Logger logger = LoggerFactory.getLogger(GeneralCheckUpFollowUpController.class);
+
+    @Autowired
+    private DiseaseControlService diseaseControlService;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+
+
+        @RequestMapping(value = "getAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> getGeneralCheckUpFollowUp(@RequestBody GetBenRequestHandler getBenRequestHandler,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+
+        try {
+            List<GeneralCheckUpFollowUpDto> result =
+                    diseaseControlService.getGeneralCheckUpFollowUp(token);
+
+            if (result != null && !result.isEmpty()) {
+                response.put("statusCode", HttpStatus.OK.value());
+                response.put("data", result);
+                return ResponseEntity.ok(response);
+            } else {
+                response.put("statusCode", HttpStatus.NOT_FOUND.value());
+                response.put("message", "No records found");
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
+            }
+
+        } catch (Exception e) {
+            logger.error("Error fetching Chronic Disease Visit :", e);
+            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("errorMessage", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+        }
+    }
+
+
+    @RequestMapping(value = "saveAll", method = RequestMethod.POST)
+    public ResponseEntity<Map<String, Object>> savGeneralCheckUpFollowUp(
+            @RequestBody List<GeneralCheckUpFollowUpDto> requestList,@RequestHeader(value = "JwtToken") String token) {
+
+        Map<String, Object> response = new LinkedHashMap<>();
+        logger.info("####################################################");
+        try {
+            logger.info("General Checkup Save Request: {}",
+                    objectMapper.writerWithDefaultPrettyPrinter()
+                            .writeValueAsString(requestList));
+        } catch (Exception e) {
+            logger.error("Failed to convert request to JSON", e);
+        }
+        logger.info("####################################################");
+
+        try {
+            List<GeneralCheckUpFollowUpDto> savedList =
+                    diseaseControlService.saveGeneralCheckUpFollowUp(requestList,token);
+
+            if (savedList != null && !savedList.isEmpty()) {
+                response.put("statusCode", HttpStatus.OK.value());
+                response.put("message", "Data saved successfully");
+                response.put("data", savedList);
+                return ResponseEntity.ok(response);
+            } else {
+                response.put("statusCode", HttpStatus.BAD_REQUEST.value());
+                response.put("message", "No data saved");
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
+            }
+
+        } catch (Exception e) {
+            logger.error("Error saving Chronic Disease Visit :", e);
+            response.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+            response.put("errorMessage", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+        }
+    }
+
+}

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

@@ -26,13 +26,11 @@ public class AHDForm {
     @Column(name = "ahd_date")
     private String ahdDate;
 
-    @Lob
     @Column(name = "image1")
-    private byte[] image1;
+    private String image1;
 
-    @Lob
     @Column(name = "image2")
-    private byte[] image2;
+    private String image2;
 
     @Column(name = "user_id")
     private Long userId;

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

@@ -29,13 +29,11 @@ public class DewormingForm {
     @Column(name = "age_group")
     private Integer ageGroup;
 
-    @Lob
     @Column(name = "image1")
-    private byte[] image1;
+    private String image1;
 
-    @Lob
     @Column(name = "image2")
-    private byte[] image2;
+    private String image2;
 
     @Column(name = "user_id")
     private Long userId;

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

@@ -0,0 +1,72 @@
+package com.iemr.flw.domain.iemr;
+
+import java.sql.Timestamp;
+import java.time.LocalDate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Entity
+@Table(name = "general_check_up", schema = "db_iemr")
+@Data
+public class GeneralCheckUp {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "ben_id")
+    private Long benId;
+
+    @Column(name = "household_id")
+    private Long householdId;
+
+    @Column(name = "asha_id", nullable = false)
+    private Integer ashaId;
+
+    @Column(name = "checkup_date", nullable = false)
+    private LocalDate checkupDate;
+
+    @Column(name = "problem_type", length = 200)
+    private String problemType;
+
+    @Column(name = "problems", columnDefinition = "json")
+    private String problems;
+
+    @Column(name = "checkup_id", length = 50, unique = true)
+    private String checkupId;
+
+    @Column(name = "problem_type_label", length = 200)
+    private String problemTypeLabel;
+
+    @Column(name = "other_text", length = 500)
+    private String otherText;
+
+    @Column(name = "priority", length = 20)
+    private String priority;
+
+
+    @Column(name = "referral_reason", length = 500)
+    private String referralReason;
+
+    @Column(name = "referral_date")
+    private LocalDate referralDate;
+
+    @Column(name = "created_by", length = 100)
+    private String createdBy;
+
+    @Column(name = "created_date", insertable = false, updatable = false)
+    private Timestamp createdDate;
+
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
+
+    @Column(name = "updated_date", insertable = false, updatable = false)
+    private Timestamp updatedDate;
+}

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

@@ -0,0 +1,57 @@
+package com.iemr.flw.domain.iemr;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.sql.Timestamp;
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "general_checkup_followup", schema = "db_iemr")
+@Data
+public class GeneralCheckUpFollowUp {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column(name = "ben_id")
+    private Long benId;
+
+    @Column(name = "household_id")
+    private Long householdId;
+
+    @Column(name = "asha_id", nullable = false)
+    private Integer ashaId;
+
+    @Column(name = "follow_up_date", nullable = false)
+    private LocalDate followUpDate;
+
+    @Column(name = "followup_status", length = 200)
+    private String followupStatus;
+
+    @Column(name = "referred_to", columnDefinition = "json")
+    private String referredTo;
+
+    @Column(name = "created_by", length = 100)
+    private String createdBy;
+
+    @Column(name = "created_date", insertable = false, updatable = false)
+    private Timestamp createdDate;
+
+    @Column(name = "synced_date")
+    private Timestamp syncedDate;
+
+    @Column(name = "updated_date", insertable = false, updatable = false)
+    private Timestamp updatedDate;
+
+    @Column(name = "referralReason")
+    private String referralReason;
+
+    @Column(name = "referredOnDate")
+    private LocalDate referredOnDate;
+
+    @Column(name = "other_follow_up")
+    private String otherFollowUp;
+}

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

@@ -26,13 +26,11 @@ public class PHCReviewForm {
     @Column(name = "no_of_beneficiaries_attended")
     private Integer noOfBeneficiariesAttended;
 
-    @Lob
     @Column(name = "image1")
-    private byte[] image1;
+    private String image1;
 
-    @Lob
     @Column(name = "image2")
-    private byte[] image2;
+    private String image2;
 
     @Column(name = "user_id")
     private Long userId;

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

@@ -82,6 +82,9 @@ public class TBSuspected {
     @Column(name = "is_tb_confirmed")
     private Boolean isTBConfirmed;
 
+    @Column(name = "is_recommended_for_tpt")
+    private Boolean isRecommendedForTpt;
+
     @Column(name = "is_drtb_confirmed")
     private Boolean isDRTBConfirmed;