Bug/fix sync and incentive issues

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

@@ -98,16 +98,19 @@ public String getPregnantWomanList(@RequestBody GetBenRequestHandler requestDTO,
     @Operation(summary = "save anc visit details")
     @RequestMapping(value = { "/ancVisit/saveAll" }, method = { RequestMethod.POST })
     public String saveANCVisit(@RequestBody List<ANCVisitDTO> ancVisitDTOs,
-            @RequestHeader(value = "Authorization") String Authorization) {
+            @RequestHeader(value = "jwtToken") String token) {
         OutputResponse response = new OutputResponse();
         try {
             if (ancVisitDTOs.size() != 0) {
                 logger.info("Saving ANC visits with timestamp : " + new Timestamp(System.currentTimeMillis()));
-                String s = maternalHealthService.saveANCVisit(ancVisitDTOs);
-                if (s != null)
-                    response.setResponse(s);
-                else
-                    response.setError(5000, "Saving anc data to db failed");
+                if(token!=null){
+                    String s = maternalHealthService.saveANCVisit(ancVisitDTOs,jwtUtil.extractUserId(token));
+                    if (s != null)
+                        response.setResponse(s);
+                    else
+                        response.setError(5000, "Saving anc data to db failed");
+                }
+
             } else
                 response.setError(5000, "Invalid/NULL request obj");
         } catch (Exception e) {

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

@@ -28,4 +28,10 @@ public class IRSRound {
     @Column(name = "householdId")
     private Long householdId;
 
+    @Column(name = "created_by")
+    private String createdBy;
+
+    @Column(name = "user_id")
+    private Integer userId;
+
 }

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

@@ -83,19 +83,19 @@ public class ScreeningLeprosy {
     @Column(name = "beneficiary_statusId")
     private Integer beneficiaryStatusId;
 
-    @Column(name = "beneficiary_status", length = 50)
+    @Column(name = "beneficiary_status", length = 255)
     private String beneficiaryStatus;
 
     @Column(name = "date_of_death")
     private Date dateOfDeath;
 
-    @Column(name = "place_of_death", length = 50)
+    @Column(name = "place_of_death", length = 255)
     private String placeOfDeath;
 
     @Column(name = "other_place_of_death", columnDefinition = "TEXT")
     private String otherPlaceOfDeath;
 
-    @Column(name = "reason_for_death", length = 50)
+    @Column(name = "reason_for_death", length = 255)
     private String reasonForDeath;
 
     @Column(name = "other_reason_for_death", columnDefinition = "TEXT")
@@ -113,7 +113,7 @@ public class ScreeningLeprosy {
     @Column(name = "current_visit_number")
     private Integer currentVisitNumber;
 
-    @Column(name = "visit_label", length = 50)
+    @Column(name = "visit_label", length = 255)
     private String visitLabel;
 
     @Column(name = "visit_number")
@@ -122,7 +122,7 @@ public class ScreeningLeprosy {
     @Column(name = "is_confirmed")
     private Boolean isConfirmed;
 
-    @Column(name = "leprosy_state", length = 50)
+    @Column(name = "leprosy_state", length = 255)
     private String leprosyState;
 
     @Temporal(TemporalType.DATE)
@@ -178,40 +178,40 @@ public class ScreeningLeprosy {
     @Column(name = "weakness_feet_id")
     private Integer weaknessFeetId;
 
-    @Column(name = "recurrent_ulceration", length = 10)
+    @Column(name = "recurrent_ulceration", length = 255)
     private String recurrentUlceration;
 
-    @Column(name = "recurrent_tingling", length = 10)
+    @Column(name = "recurrent_tingling", length = 255)
     private String recurrentTingling;
 
-    @Column(name = "hypopigmented_patch", length = 50)
+    @Column(name = "hypopigmented_patch", length = 255)
     private String hypopigmentedPatch;
 
-    @Column(name = "thickened_skin", length = 10)
+    @Column(name = "thickened_skin", length = 255)
     private String thickenedSkin;
 
-    @Column(name = "skin_nodules", length = 10)
+    @Column(name = "skin_nodules", length = 255)
     private String skinNodules;
 
-    @Column(name = "skin_patch_discoloration", length = 50)
+    @Column(name = "skin_patch_discoloration", length = 255)
     private String skinPatchDiscoloration;
 
-    @Column(name = "recurrent_numbness", length = 10)
+    @Column(name = "recurrent_numbness", length = 255)
     private String recurrentNumbness;
 
-    @Column(name = "clawing_fingers", length = 10)
+    @Column(name = "clawing_fingers", length = 255)
     private String clawingFingers;
 
-    @Column(name = "tingling_numbness_extremities", length = 50)
+    @Column(name = "tingling_numbness_extremities", length = 255)
     private String tinglingNumbnessExtremities;
 
-    @Column(name = "inability_close_eyelid", length = 10)
+    @Column(name = "inability_close_eyelid", length = 255)
     private String inabilityCloseEyelid;
 
-    @Column(name = "difficulty_holding_objects", length = 50)
+    @Column(name = "difficulty_holding_objects", length = 255)
     private String difficultyHoldingObjects;
 
-    @Column(name = "weakness_feet", length = 10)
+    @Column(name = "weakness_feet", length = 255)
     private String weaknessFeet;
 
     @Column(name = "CreatedBy", length = 100)

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

@@ -16,7 +16,7 @@ public interface MaternalHealthService {
 
     List<ANCVisitDTO> getANCVisits(GetBenRequestHandler dto);
 
-    String saveANCVisit(List<ANCVisitDTO> ancVisitDTOs);
+    String saveANCVisit(List<ANCVisitDTO> ancVisitDTOs,Integer userId);
 
     List<PmsmaDTO> getPmsmaRecords(GetBenRequestHandler dto);