Skip to content

drop column #378

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 6 commits into from
Oct 14, 2026
Merged

drop column #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca58b5b
drop column
SauravBizbRolly Oct 14, 2026
b57fe04
drop column
SauravBizbRolly Oct 14, 2026
b43996d
Merge branch 'release-3.11.0' into fix/drop_column_gps_latitude
SauravBizbRolly Oct 14, 2026
a405caa
drop column
SauravBizbRolly Oct 14, 2026
70c9143
Merge remote-tracking branch 'upstream/fix/drop_column_gps_latitude' …
SauravBizbRolly Oct 14, 2026
0d8f317
drop column
SauravBizbRolly Oct 14, 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
4 changes: 1 addition & 3 deletions src/main/java/com/iemr/flw/domain/identity/RMNCHBeneficiaryDetailsRmnch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,11 @@ public class RMNCHBeneficiaryDetailsRmnch {
@Column(name = "longitude")
private BigDecimal longitude;


@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")
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/com/iemr/flw/domain/identity/RMNCHHouseHoldDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
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 @@ -54,7 +54,7 @@ public class DiagnosticOrder {
private String errorMessage;

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

@Column(name = "push_response_json", columnDefinition = "LONGTEXT")
private String pushResponseJson;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/iemr/flw/service/impl/BeneficiaryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
if (benAddressOBJ.getPermPinCode() != null)
benDetailsRMNCH_OBJ.setPinCode(benAddressOBJ.getPermPinCode());


// -----------------------------------------------------------------------------

// related benids
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/iemr/flw/service/impl/DiagnosticOrderServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private DiagnosticOrder saveRefusedOrder(Long beneficiaryId, Long visitCode, Dia
order.setPatientSex(patientSex);
}
order.setStatus(DiagnosticOrderStatus.REFUSED.name());
order.setReasonForRefusal(reasonForRefusal);
order.setReasonToClose(reasonForRefusal);
order.setErrorMessage(null);

try {
Expand Down Expand Up @@ -273,7 +273,7 @@ public DiagnosticOrderResultDto processResult(DiagnosticOrder order, DiagnosticP
dto.setOrderType(order.getOrderType());
dto.setStatus(order.getStatus());
dto.setErrorMessage(order.getErrorMessage());
dto.setReasonForRefusal(order.getReasonForRefusal());
dto.setReasonForRefusal(order.getReasonToClose());
dto.setProviderStatus(result.getProviderStatus());
dto.setResultSummary(result.getResultSummary());
dto.setTbPresence(result.getTbPresence());
Expand Down Expand Up @@ -434,7 +434,7 @@ public DiagnosticOrderResultDto getOrderResult(Long beneficiaryId, String orderT
dto.setExternalOrderId(order.getExternalOrderId());
dto.setStatus(order.getStatus());
dto.setErrorMessage(order.getErrorMessage());
dto.setReasonForRefusal(order.getReasonForRefusal());
dto.setReasonForRefusal(order.getReasonToClose());

diagnosticResultRepo.findByExternalOrderIdAndDeletedFalse(order.getExternalOrderId()).ifPresent(result -> {
dto.setProviderStatus(result.getProviderStatus());
Expand Down
Loading