Van Location Details changes (#91)

* Corrected patientFetosenseId variable name * Modified Van & Loc Details --------- Co-authored-by: Devika <[email protected]>
PSMRI · Mar 19, 2024 · 904a66d · 904a66d
1 parent 1410285
commit 904a66d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 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
@@ -43,4 +43,26 @@ public interface V_getVanLocDetailsRepo extends CrudRepository<V_getVanLocDetail
 			+ "t.blockid, t.blockname, t.villageId, t.villageName, t.govtLGDStateID,t.govtLGDDistrictID"
 			+ " FROM V_getVanLocDetails t WHERE t.vanID = :vanID")
 	ArrayList<Object[]> 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<Object[]> 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<Object[]> 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
@@ -328,9 +328,9 @@ public String getLocDetailsNew(Integer vanID, Integer spPSMID,JSONObject obj) {
 		// other location details, changed for TM
 		ArrayList<Object[]> 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);
 		}