From e31183a9aca8c56970ee40ffdb7784b200436fe2 Mon Sep 17 00:00:00 2001 From: Devika Date: Thu, 7 Mar 2024 16:39:20 +0530 Subject: [PATCH 1/2] Corrected patientFetosenseId variable name --- .../iemr/hwc/data/foetalmonitor/FoetalMonitorData.java | 10 +++++----- .../foetalmonitor/FoetalMonitorServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/iemr/hwc/data/foetalmonitor/FoetalMonitorData.java b/src/main/java/com/iemr/hwc/data/foetalmonitor/FoetalMonitorData.java index 08649077..ab84e906 100644 --- a/src/main/java/com/iemr/hwc/data/foetalmonitor/FoetalMonitorData.java +++ b/src/main/java/com/iemr/hwc/data/foetalmonitor/FoetalMonitorData.java @@ -25,19 +25,19 @@ public class FoetalMonitorData { - private Long partnerFoetalMonitorId; + private Long partnerFetosenseId; private Long beneficiaryRegID; private String motherLMPDate; private String motherName; private String testName; private String deviceId; - public Long getPartnerFoetalMonitorId() { - return partnerFoetalMonitorId; + public Long getPartnerFetosenseID() { + return partnerFetosenseId; } - public void setPartnerFoetalMonitorId(Long partnerFoetalMonitorId) { - this.partnerFoetalMonitorId = partnerFoetalMonitorId; + public void setPartnerFetosenseID(Long partnerFetosenseID) { + this.partnerFetosenseId = partnerFetosenseID; } public String getMotherLMPDate() { diff --git a/src/main/java/com/iemr/hwc/service/foetalmonitor/FoetalMonitorServiceImpl.java b/src/main/java/com/iemr/hwc/service/foetalmonitor/FoetalMonitorServiceImpl.java index 2b45af24..451ba459 100644 --- a/src/main/java/com/iemr/hwc/service/foetalmonitor/FoetalMonitorServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/foetalmonitor/FoetalMonitorServiceImpl.java @@ -221,7 +221,7 @@ public String sendFoetalMonitorTestDetails(FoetalMonitor request, String auth) t if (request != null && request.getFoetalMonitorID() > 0) { FoetalMonitorData foetalMonitorTestDetails = new FoetalMonitorData(); - foetalMonitorTestDetails.setPartnerFoetalMonitorId(request.getFoetalMonitorID()); + foetalMonitorTestDetails.setPartnerFetosenseID(request.getFoetalMonitorID()); // send benid in place of benregid to foetal monitor foetalMonitorTestDetails.setBeneficiaryRegID(benID); From be7e4fc6df73beaf43b10712ea2497c8fce47a81 Mon Sep 17 00:00:00 2001 From: Devika Date: Mon, 18 Mar 2024 12:00:16 +0530 Subject: [PATCH 2/2] Modified Van & Loc Details --- .../repo/location/V_getVanLocDetailsRepo.java | 22 +++++++++++++++++++ .../service/location/LocationServiceImpl.java | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/hwc/repo/location/V_getVanLocDetailsRepo.java b/src/main/java/com/iemr/hwc/repo/location/V_getVanLocDetailsRepo.java index 2b3a9359..111183f0 100644 --- a/src/main/java/com/iemr/hwc/repo/location/V_getVanLocDetailsRepo.java +++ b/src/main/java/com/iemr/hwc/repo/location/V_getVanLocDetailsRepo.java @@ -43,4 +43,26 @@ public interface V_getVanLocDetailsRepo extends CrudRepository getVanDetails(@Param("vanID") Integer vanID); + + + @Query(value="SELECT distinct dis.stateID, van.parkingPlaceID, dis.districtID, dis.districtName, db.BlockID, db.BlockName, usrm.Villageid, usrm.VillageName, dis.GovtStateID, dis.GovtDistrictID FROM db_iemr.m_van van " + + "left join db_iemr.m_parkingplacesubdistrictmap prkdis on van.ParkingPlaceID = prkdis.ParkingPlaceID " + + "left join db_iemr.m_district dis on prkdis.DistrictID = dis.DistrictID " + + "left join db_iemr.m_districtblock db on db.DistrictID = dis.DistrictID " + + "left join db_iemr.m_userservicerolemapping usrm on usrm.Blockid = db.BlockID " + + "where van.Deleted is false and db.Deleted is false " + + "and prkdis.Deleted is false and dis.Deleted is false " + + "and van.vanid = :vanID ",nativeQuery=true) + ArrayList getVanLocDetails(@Param("vanID") Integer vanID); + + @Query(value="SELECT distinct dis.stateID, van.parkingPlaceID, dis.districtID, dis.districtName, db.BlockID, db.BlockName, usrm.Villageid, usrm.VillageName, dis.GovtStateID, dis.GovtDistrictID FROM db_iemr.m_van van " + + "left join db_iemr.m_parkingplacesubdistrictmap prkdis on van.ParkingPlaceID = prkdis.ParkingPlaceID " + + "left join db_iemr.m_district dis on prkdis.DistrictID = dis.DistrictID " + + "left join db_iemr.m_districtblock db on db.DistrictID = dis.DistrictID " + + "left join db_iemr.m_userservicerolemapping usrm on usrm.Blockid = db.BlockID " + + "where van.Deleted is false and db.Deleted is false " + + "and prkdis.Deleted is false and dis.Deleted is false " + + "and van.vanid = :vanID and usrm.userID = :userID",nativeQuery=true) + ArrayList getVanLocDetailsWithUserID(@Param("vanID") Integer vanID,@Param("userID") Integer userID); + } diff --git a/src/main/java/com/iemr/hwc/service/location/LocationServiceImpl.java b/src/main/java/com/iemr/hwc/service/location/LocationServiceImpl.java index 27ac38cd..a0543fd0 100644 --- a/src/main/java/com/iemr/hwc/service/location/LocationServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/location/LocationServiceImpl.java @@ -328,9 +328,9 @@ public String getLocDetailsNew(Integer vanID, Integer spPSMID,JSONObject obj) { // other location details, changed for TM ArrayList resultSet = null; if(null != userID) { - resultSet = v_getVanLocDetailsRepo.getVanDetailsWithUserID(vanID,userID); + resultSet = v_getVanLocDetailsRepo.getVanLocDetailsWithUserID(vanID,userID); }else{ - resultSet = v_getVanLocDetailsRepo.getVanDetails(vanID); + resultSet = v_getVanLocDetailsRepo.getVanLocDetails(vanID); }