Skip to content

Fix/image issue village level #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishwab1 merged 2 commits into from
Oct 27, 2026
Merged

Fix/image issue village level #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2c8705
fix image store issue in village level froms
SauravBizbRolly Oct 27, 2026
0f66c1a
fix image store issue in village level froms
SauravBizbRolly Oct 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/iemr/flw/domain/iemr/AHDForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ public class AHDForm {
@Column(name = "ahd_date")
private String ahdDate;

@Lob
@Column(name = "image1")
private String image1;
private byte[] image1;

@Lob
@Column(name = "image2")
private String image2;
private byte[] image2;

@Column(name = "user_id")
private Long userId;
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/iemr/flw/domain/iemr/DewormingForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ public class DewormingForm {
@Column(name = "age_group")
private Integer ageGroup;

@Lob
@Column(name = "image1")
private String image1;
private byte[] image1;

@Lob
@Column(name = "image2")
private String image2;
private byte[] image2;

@Column(name = "user_id")
private Long userId;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/iemr/flw/domain/iemr/DiagnosticOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class DiagnosticOrder {
@Column(name = "error_message", columnDefinition = "TEXT")
private String errorMessage;

@Column(name = "reason_for_refusal", columnDefinition = "TEXT")
@Column(name = "reason_to_close", columnDefinition = "TEXT")
private String reasonToClose;

@Column(name = "push_response_json", columnDefinition = "LONGTEXT")
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/iemr/flw/domain/iemr/PHCReviewForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ public class PHCReviewForm {
@Column(name = "no_of_beneficiaries_attended")
private Integer noOfBeneficiariesAttended;

@Lob
@Column(name = "image1")
private String image1;
private byte[] image1;

@Lob
@Column(name = "image2")
private String image2;
private byte[] image2;

@Column(name = "user_id")
private Long userId;
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/iemr/flw/domain/iemr/VHNDForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ public class VHNDForm {
@Column(name = "no_of_beneficiaries_attended")
private Integer noOfBeneficiariesAttended;

@Lob
@Column(name = "image1")
private String image1;
private byte[] image1;

@Lob
@Column(name = "image2")
private String image2;
private byte[] image2;

@Column(name = "form_type")
private String formType;
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/com/iemr/flw/domain/iemr/VhncForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ public class VhncForm {

@Column(name = "no_of_beneficiaries_attended")
private Integer noOfBeneficiariesAttended;


@Lob
@Column(name = "image1")
private String image1;

private byte[] image1;

@Lob
@Column(name = "image2")
private String image2;
private byte[] image2;

@Column(name = "user_id")
private Long userId;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/flw/dto/iemr/AhDMeetingFormDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public class AhDMeetingFormDTO {
private String mobilizedForAHD;
private String ahdPlace;
private String ahdDate;
private String image1;
private String image2;
private byte[] image1;
private byte[] image2;
}
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/flw/dto/iemr/DewormingFormDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public class DewormingFormDTO {
private String dewormingDate;
private String dewormingLocation;
private Integer ageGroup;
private String image1;
private String image2;
private byte[] image1;
private byte[] image2;
}
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/flw/dto/iemr/PhcReviewMeetingFormDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class PhcReviewMeetingFormDTO {
private String mitaninHistory;
private String mitaninActivityCheckList;
private Integer placeId;
private String image1;
private String image2;
private byte[] image1;
private byte[] image2;



Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/flw/dto/iemr/VHNDFormDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public class VHNDFormDTO {
private String vhndDate;
private String place;
private Integer noOfBeneficiariesAttended;
private String image1;
private String image2;
private byte[] image1;
private byte[] image2;
private Integer vhndPlaceId;
private String pregnantWomenAnc;
private String lactatingMothersPnc;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/flw/dto/iemr/VhncFormDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public class VhncFormDTO {
private String vhncDate;
private String place;
private Integer noOfBeneficiariesAttended;
private String image1;
private String image2;
private byte[] image1;
private byte[] image2;
private String villageName;
private Integer anm;
private Integer aww;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/iemr/flw/service/impl/VillageLevelFormServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ private Boolean saveVhndFormData(VHNDFormDTO vhndFormDTO, Integer userID) {
VHNDForm vhndForm = new VHNDForm();
vhndForm.setUserId(userID);
vhndForm.setVhndDate(vhndFormDTO.getVhndDate());
vhndForm.setImage2(vhndFormDTO.getImage2() != null ? vhndFormDTO.getImage2() : "");
vhndForm.setImage1(vhndFormDTO.getImage1() != null ? vhndFormDTO.getImage1() : "");
vhndForm.setImage2(vhndFormDTO.getImage2() != null ? vhndFormDTO.getImage2() : null);
vhndForm.setImage1(vhndFormDTO.getImage1() != null ? vhndFormDTO.getImage1() : null);
vhndForm.setPlace(vhndFormDTO.getPlace() != null ? vhndFormDTO.getPlace() : "");

vhndForm.setNoOfBeneficiariesAttended(
Expand Down
Loading