Van Location Details changes (#36)

* Corrected the properties variable name for ANC fetosense test

* Corrected partner fetosense Id variable name in FeotalMonitorData

* Corrected GeneratePDF from reportPath

* Added protocol check condition to identify invalid protocol

* Added condition to check filepath

* Added new URL inside condition check

* Added hostname comparison in foetalMonitor update

* fetosense update api - generate pdf changes

* Modified get Van & Loc Details

---------

Co-authored-by: Devika <[email protected]>

src/main/java/com/iemr/tm/repo/location/V_getVanLocDetailsRepo.java

@@ -37,5 +37,15 @@ public interface V_getVanLocDetailsRepo extends CrudRepository<V_getVanLocDetail
 	@Query(" SELECT distinct t.stateID, t.parkingPlaceID, t.districtID, t.districtName "
 			+ " 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 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);
 
 }

src/main/java/com/iemr/tm/service/location/LocationServiceImpl.java

@@ -230,7 +230,7 @@ public String getVillageMasterFromBlockID(Integer distBlockID) {
 	// new, 11-10-2018
 	public String getLocDetailsNew(Integer vanID, Integer spPSMID) {
 		Map<String, Object> resMap = new HashMap<String, Object>();
-		ArrayList<Object[]> resultSet = v_getVanLocDetailsRepo.getVanDetails(vanID);
+		ArrayList<Object[]> resultSet = v_getVanLocDetailsRepo.getVanLocDetails(vanID);
 
 		// state master
 		ArrayList<States> stateList = new ArrayList<>();