Incentive changes 3.8.0

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.iemr.common.flw</groupId>
     <artifactId>flw-api</artifactId>
-    <version>3.7.0</version>
+    <version>3.8.0</version>
     <packaging>war</packaging>
 
     <name>FLW-API</name>

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

@@ -1,35 +1,21 @@
 package com.iemr.flw.controller;
 
 import com.iemr.flw.domain.iemr.AshaWorker;
-import com.iemr.flw.domain.iemr.M_User;
-import com.iemr.flw.dto.iemr.UserServiceRoleDTO;
-import com.iemr.flw.repo.iemr.UserServiceRoleRepo;
 import com.iemr.flw.service.AshaProfileService;
 import com.iemr.flw.service.EmployeeMasterInter;
-import com.iemr.flw.service.UserService;
 import io.lettuce.core.dynamic.annotation.Param;
 import com.iemr.flw.utils.JwtUtil;
-import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 
-import com.iemr.flw.utils.JwtAuthenticationUtil;
-import com.iemr.flw.utils.JwtUtil;
-import com.iemr.flw.utils.exception.IEMRException;
-import io.jsonwebtoken.Claims;
-import io.swagger.v3.oas.annotations.Operation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 @RestController
 @RequestMapping(value = "/asha", produces = "application/json")

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

@@ -84,8 +84,8 @@ public String getCdrRecords(@RequestBody GetBenRequestHandler requestDTO,
             logger.info("fetching All CDR Details for user: " + requestDTO.getAshaId());
             if (requestDTO != null) {
                 List<CdrDTO> result = deathReportsService.getCdrRecords(requestDTO);
-                Gson gson = new GsonBuilder()
-                        .setDateFormat("MMM dd, yyyy h:mm:ss a") // Set the desired date format
+                Gson gson = new GsonBuilder()// Set the desired date format
+                        .setDateFormat("MMM dd, yyyy h:mm:ss a")
                         .create();
                 String s = gson.toJson(result);
                 if (s != null)
@@ -111,8 +111,8 @@ public String getMdsrRecords(@RequestBody GetBenRequestHandler requestDTO,
             logger.info("fetching All MDSR Details for user: " + requestDTO.getAshaId());
             if (requestDTO != null) {
                 List<MdsrDTO> result = deathReportsService.getMdsrRecords(requestDTO);
-                Gson gson = new GsonBuilder()
-                        .setDateFormat("MMM dd, yyyy h:mm:ss a") // Set the desired date format
+                Gson gson = new GsonBuilder()// Set the desired date format
+                        .setDateFormat("MMM dd, yyyy h:mm:ss a")
                         .create();
                 String s = gson.toJson(result);
                 if (s != null)

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

@@ -103,8 +103,8 @@ public String getAllIncentivesByUserId(@RequestBody GetBenRequestHandler request
         return response.toString();
     }
 
-    @RequestMapping(value = {"/update"}, method = RequestMethod.POST)
-    public String updateIncentive(@RequestBody PendingActivityDTO requestDTO) {
+    @RequestMapping(value = {"/update"}, method = RequestMethod.POST, consumes = {"multipart/form-data"})
+    public String updateIncentive(@ModelAttribute  PendingActivityDTO requestDTO) {
         OutputResponse response = new OutputResponse();
         try {
 
@@ -116,12 +116,12 @@ public String updateIncentive(@RequestBody PendingActivityDTO requestDTO) {
                 if (s != null)
                     response.setResponse(s);
                 else
-                    response.setError(5000, "No record found");
+                    response.setError(500, "No record found");
             } else
-                response.setError(5000, "Invalid/NULL request obj");
+                response.setError(500, "Invalid/NULL request obj");
         } catch (Exception e) {
             logger.error("Error in high risk assessment data : " + e);
-            response.setError(5000, "Error in high risk assessment data : " + e);
+            response.setError(500, "Error in high risk assessment data : " + e);
         }
         return response.toString();
 

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

@@ -26,7 +26,7 @@
 import java.util.List;
 
 @RestController
-@RequestMapping(value = "/maternalCare", headers = "Authorization", consumes = "application/json", produces = "application/json")
+@RequestMapping(value = "/maternalCare", consumes = "application/json", produces = "application/json")
 public class MaternalHealthController {
 
     private final Logger logger = LoggerFactory.getLogger(CoupleController.class);
@@ -241,9 +241,9 @@ public String getDeliveryOutcome(@RequestBody GetBenRequestHandler requestDTO,
                 List<DeliveryOutcomeDTO> result = deliveryOutcomeService.getDeliveryOutcome(requestDTO);
                 Gson gson = new GsonBuilder().setDateFormat("MMM dd, yyyy h:mm:ss a").create();
                 String s = gson.toJson(result);
-                if (s != null)
-                    response.setResponse(s);
-                else
+                if (result != null && !result.isEmpty()) {
+                    response.setResponse(gson.toJson(result));
+                }else
                     response.setError(5000, "No record found");
             } else
                 response.setError(5000, "Invalid/NULL request obj");

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

@@ -17,7 +17,6 @@ public class DeliveryOutcome {
     @Column(name = "ben_id")
     private Long benId;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MMM dd, yyyy, h:mm:ss a")
     @Column(name = "delivery_date")
     private Timestamp dateOfDelivery;
 
@@ -54,7 +53,6 @@ public class DeliveryOutcome {
     @Column(name = "still_birth")
     private Integer stillBirth;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MMM dd, yyyy, h:mm:ss a")
     @Column(name = "discharge_date")
     private Timestamp dateOfDischarge;
 

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

@@ -24,10 +24,10 @@ public class IncentivePendingActivity {
 
     @Column(name = "record_id", nullable = false)
     private Long recordId;
-    
-    @Column(name = "module_name", nullable = false, length = 100)
-    private String moduleName;
-    
+
+    @Column(name = "m_incentive_id")
+    private Long mincentiveId;
+
     @Column(name = "user_id", nullable = false)
     private Integer userId;
 

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

@@ -45,7 +45,7 @@ public class ScreeningKalaAzar {
     @Column(name = "house_hold_details_Id",nullable = false)
     private Long houseHoldDetailsId;
 
-    @Column(name = "userID")
+    @Column(name = "user_id")
     private Integer userId;
 
     @Temporal(TemporalType.DATE)
@@ -97,7 +97,7 @@ public class ScreeningKalaAzar {
     @Column(name = "created_by")
     private String createdBy;
 
-    @Column(name = "diseaseTypeID")
+    @Column(name = "disease_type_id")
     private Integer diseaseTypeId;
 
     @Column(name = "refer_to_name")

src/main/java/com/iemr/flw/domain/iemr/M_User.java → src/main/java/com/iemr/flw/domain/iemr/User.java

@@ -1,7 +1,6 @@
 package com.iemr.flw.domain.iemr;
 
 import java.sql.Timestamp;
-import java.time.LocalDate;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.annotations.Expose;
@@ -14,18 +13,10 @@
 import jakarta.persistence.Table;
 import lombok.Data;
 
-import com.google.gson.annotations.Expose;
-import jakarta.persistence.*;
-import lombok.Data;
-import java.sql.Date;
-import java.sql.Timestamp;
-import java.time.LocalDate;
-
 @Entity
-@Table(name = "m_User", schema = "db_iemr")
+@Table(name = "m_user", schema = "db_iemr")
 @Data
-public class M_User {
-
+public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Expose
@@ -144,11 +135,11 @@ public class M_User {
     @Column(name = "failed_attempt", insertable = false)
     private Integer failedAttempt;
 
-    public M_User() {
+    public User() {
         // TODO Auto-generated constructor stub
     }
 
-    public M_User(Integer userID, String userName) {
+    public User(Integer userID, String userName) {
         // TODO Auto-generated constructor stub
         this.userID = userID;
         this.userName = userName;

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

@@ -54,6 +54,7 @@ public class CdrDTO {
     private String deathCertImage1;
 
     private String deathCertImage2;
+    private String cdrImage;
 
     private Timestamp updatedDate;
 

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

@@ -10,7 +10,6 @@ public class DeliveryOutcomeDTO {
     private Long id;
     private Long benId;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Timestamp dateOfDelivery;
     private String timeOfDelivery;
     private String placeOfDelivery;

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

@@ -35,4 +35,10 @@ public class MdsrDTO {
     private Timestamp updatedDate;
 
     private String updatedBy;
+
+    private String mdsr1File;
+
+    private String mdsr2File;
+
+    private String mdsrDeathCertFile;
 }

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

@@ -9,6 +9,7 @@
 public class PendingActivityDTO {
     private Long id;
     private Integer userId;
-    private List<MultipartFile> Images;
+    private List<MultipartFile> images;
     private String moduleName;
+    private String activityName;
 }

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

@@ -37,98 +37,7 @@ public class TBScreeningDTO {
     private Boolean bmi;
     private Boolean contactWithTBPatient;
     private Boolean historyOfTBInLastFiveYrs;
-    private  String sympotomatic;
+    private String sympotomatic;
     private String asymptomatic;
     private String recommandateTest;
-
-
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getBenId() {
-        return benId;
-    }
-
-    public void setBenId(Long benId) {
-        this.benId = benId;
-    }
-
-    public Timestamp getVisitDate() {
-        return visitDate;
-    }
-
-    public void setVisitDate(Timestamp visitDate) {
-        this.visitDate = visitDate;
-    }
-
-    public Boolean getCoughMoreThan2Weeks() {
-        return coughMoreThan2Weeks;
-    }
-
-    public void setCoughMoreThan2Weeks(Boolean coughMoreThan2Weeks) {
-        this.coughMoreThan2Weeks = coughMoreThan2Weeks;
-    }
-
-    public Boolean getBloodInSputum() {
-        return bloodInSputum;
-    }
-
-    public void setBloodInSputum(Boolean bloodInSputum) {
-        this.bloodInSputum = bloodInSputum;
-    }
-
-    public Boolean getFeverMoreThan2Weeks() {
-        return feverMoreThan2Weeks;
-    }
-
-    public void setFeverMoreThan2Weeks(Boolean feverMoreThan2Weeks) {
-        this.feverMoreThan2Weeks = feverMoreThan2Weeks;
-    }
-
-    public Boolean getLossOfWeight() {
-        return lossOfWeight;
-    }
-
-    public void setLossOfWeight(Boolean lossOfWeight) {
-        this.lossOfWeight = lossOfWeight;
-    }
-
-    public Boolean getNightSweats() {
-        return nightSweats;
-    }
-
-    public void setNightSweats(Boolean nightSweats) {
-        this.nightSweats = nightSweats;
-    }
-
-    public Boolean getHistoryOfTb() {
-        return historyOfTb;
-    }
-
-    public void setHistoryOfTb(Boolean historyOfTb) {
-        this.historyOfTb = historyOfTb;
-    }
-
-    public Boolean getTakingAntiTBDrugs() {
-        return takingAntiTBDrugs;
-    }
-
-    public void setTakingAntiTBDrugs(Boolean takingAntiTBDrugs) {
-        this.takingAntiTBDrugs = takingAntiTBDrugs;
-    }
-
-    public Boolean getFamilySufferingFromTB() {
-        return familySufferingFromTB;
-    }
-
-    public void setFamilySufferingFromTB(Boolean familySufferingFromTB) {
-        this.familySufferingFromTB = familySufferingFromTB;
-    }
 }

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

@@ -33,3 +33,6 @@ public String getDisplayName() {
 }
 
 
+
+
+