Merge branch 'develop' into develop

src/main/java/com/iemr/hwc/data/foetalmonitor/FoetalMonitorData.java

@@ -23,19 +23,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() {

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

@@ -63,4 +63,5 @@ public interface V_getVanLocDetailsRepo extends CrudRepository<V_getVanLocDetail
 			+ "and prkdis.Deleted = false and dis.Deleted = false "
 			+ "and van.vanid = :vanID and usrm.userID = :userID",nativeQuery=true)
 	ArrayList<Object[]> getVanLocDetailsWithUserID(@Param("vanID") Integer vanID,@Param("userID") Integer userID);
+
 }

src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java

@@ -3123,7 +3123,6 @@ public Long saveBenPrescription(PrescriptionDetail prescription) {
 						}else{
 							pdConceptID.append("  ||  ").append("N/A");
 						}
-
 					}
 				}
 			}

src/main/java/com/iemr/hwc/service/foetalmonitor/FoetalMonitorServiceImpl.java

@@ -217,7 +217,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);