develop to master

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

@@ -23,18 +23,18 @@
 
 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() {
 		return motherLMPDate;

src/main/java/com/iemr/tm/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java

@@ -440,5 +440,8 @@ public ArrayList<BeneficiaryFlowStatus> getMmuNurseWorklistNew(
 //	 */
 //	@Query("SELECT  t.lab_technician_flag from BeneficiaryFlowStatus t WHERE t.benFlowID =:benFlowID ")
 //	public Short getLabTechnicianFlag(@Param("benFlowID") Long benFlowID);
+
+	@Query("SELECT t from BeneficiaryFlowStatus t where t.benFlowID = :benFlowID And t.nurseFlag = :nurseFlag")
+	BeneficiaryFlowStatus checkExistData(@Param("benFlowID") Long benFlowID, @Param("nurseFlag") Short nurseFlag);
 
 }

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/anc/ANCServiceImpl.java

@@ -66,6 +66,7 @@
 import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
 import com.iemr.tm.data.anc.WrapperImmunizationHistory;
 import com.iemr.tm.data.anc.WrapperMedicationHistory;
+import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
 import com.iemr.tm.data.foetalmonitor.FoetalMonitor;
 import com.iemr.tm.data.nurse.BenAnthropometryDetail;
 import com.iemr.tm.data.nurse.BenPhysicalVitalDetail;
@@ -168,12 +169,17 @@ public String saveANCNurseData(JsonObject requestOBJ, String Authorization) thro
 		Long saveSuccessFlag = null;
 		TeleconsultationRequestOBJ tcRequestOBJ = null;
 		Long benVisitCode = null;
+		Map<String, Long> visitIdAndCodeMap = null;
 		// check if visit details data is not null
 		if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
 			CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
-			// Call method to save visit details data
-			Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
+			Short nurseFlag = 9;
+			BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);
+
+			if(data == null) {
+			visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
 					nurseUtilityClass);
+			}
 
 			Long benVisitID = null;
 

src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java

@@ -162,15 +162,20 @@ public String saveCancerScreeningNurseData(JsonObject requestOBJ, String Authori
 		Long nurseDataSuccessFlag = null;
 		TeleconsultationRequestOBJ tcRequestOBJ = null;
 		Long benVisitCode = null;
+		Map<String, Long> visitIdAndCodeMap = null;
 		// check if visit details data is not null
 		if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
 			// Call method to save visit details data
 
 			CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
 			BeneficiaryVisitDetail benVisitDetailsOBJ = InputMapper.gson().fromJson(requestOBJ.get("visitDetails"),
 					BeneficiaryVisitDetail.class);
-
-			Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(benVisitDetailsOBJ, nurseUtilityClass);
+			Short nurseFlag = 9;
+			BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);
+
+			if(data == null) {
+			visitIdAndCodeMap = saveBenVisitDetails(benVisitDetailsOBJ, nurseUtilityClass);
+			}
 
 			Long benVisitID = null;
 

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

@@ -385,6 +385,7 @@ public Integer updateBeneficiaryStatus(Character c, Long benRegID) {
 
 	/**
 	 * Save beneficiary visit details data and return beneficiary visit ID.
+	 * 
 	 * @param beneficiaryVisitDetail
 	 * @return
 	 */
@@ -423,28 +424,28 @@ public Long saveBeneficiaryVisitDetails(BeneficiaryVisitDetail beneficiaryVisitD
 
 	}
 
-	public int getMaxCurrentdate(Long beneficiaryRegID,String visitreason,String visitcategory) throws IEMRException{
-		String maxDate=benVisitDetailRepo.getMaxCreatedDate(beneficiaryRegID,visitreason,visitcategory);
-		
-	    int i=0;
-		if(maxDate!=null) {
-		try {
-			DateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			String maxdateTrim=maxDate.substring(0, maxDate.indexOf("."));
-			java.util.Date  d = timeFormat.parse(maxdateTrim);
-			Calendar cal = Calendar.getInstance();
-			Calendar cal1 = Calendar.getInstance();
-			cal.setTime(d);
-			cal.add(Calendar.MINUTE, 10);
-			 i= cal.compareTo(cal1);
-			 
-		} catch (ParseException e) {
-			throw new IEMRException("Error while parseing created date :" + e.getMessage());
-		}
+	public int getMaxCurrentdate(Long beneficiaryRegID, String visitreason, String visitcategory) throws IEMRException {
+		String maxDate = benVisitDetailRepo.getMaxCreatedDate(beneficiaryRegID, visitreason, visitcategory);
+
+		int i = 0;
+		if (maxDate != null) {
+			try {
+				DateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				String maxdateTrim = maxDate.substring(0, maxDate.indexOf("."));
+				java.util.Date d = timeFormat.parse(maxdateTrim);
+				Calendar cal = Calendar.getInstance();
+				Calendar cal1 = Calendar.getInstance();
+				cal.setTime(d);
+				cal.add(Calendar.MINUTE, 10);
+				i = cal.compareTo(cal1);
+
+			} catch (ParseException e) {
+				throw new IEMRException("Error while parseing created date :" + e.getMessage());
+			}
 		}
 		return i;
 	}
-	
+
 	public Long generateVisitCode(Long visitID, Integer vanID, Integer sessionID) {
 		String visitCode = "";
 
@@ -480,6 +481,7 @@ public int updateVisitCodeInVisitDetailsTable(Long visitCode, Long visitID) {
 
 	/**
 	 * created this for getting visit count of patient
+	 * 
 	 * @return
 	 */
 	public Short getBenVisitCount(Long benRegID) {
@@ -999,8 +1001,9 @@ public int updateANCPhysicalVitalDetails(BenPhysicalVitalDetail physicalVitalDet
 					physicalVitalDetail.getBloodGlucose_2hr_PP(), physicalVitalDetail.getBloodGlucose_NotSpecified(),
 					physicalVitalDetail.getDiabeticStatusID(), physicalVitalDetail.getDiabeticStatus(),
 					physicalVitalDetail.getCapillaryRefillTime(), physicalVitalDetail.getModifiedBy(), processed,
-					physicalVitalDetail.getRbsTestResult(),physicalVitalDetail.getRbsTestRemarks(),physicalVitalDetail.getsPO2(),
-					physicalVitalDetail.getBeneficiaryRegID(), physicalVitalDetail.getVisitCode());
+					physicalVitalDetail.getRbsTestResult(), physicalVitalDetail.getRbsTestRemarks(),
+					physicalVitalDetail.getsPO2(), physicalVitalDetail.getBeneficiaryRegID(),
+					physicalVitalDetail.getVisitCode());
 
 		}
 		return r;
@@ -1188,7 +1191,6 @@ public String fetchBenPersonalTobaccoHistory(Long beneficiaryRegID) {
 		column.put("keyName", "tobaccoUseStatus");
 		columns.add(column);
 
-
 		column = new HashMap<String, Object>();
 		column.put("columnName", "Tobacco Use Type");
 		column.put("keyName", "tobaccoUseType");
@@ -2694,7 +2696,7 @@ public Long savePrescriptionDetailsAndGetPrescriptionID(Long benRegID, Long benV
 		prescriptionDetail.setParkingPlaceID(parkingPlaceID);
 		if (instruction != null)
 			prescriptionDetail.setInstruction(instruction);
-		if(provisionalDiagnosisList != null)
+		if (provisionalDiagnosisList != null)
 			prescriptionDetail.setProvisionalDiagnosisList(provisionalDiagnosisList);
 
 		Long prescriptionID = saveBenPrescription(prescriptionDetail);
@@ -2741,24 +2743,26 @@ public Long saveBenPrescription(PrescriptionDetail prescription) {
 
 		if (prescription != null && prescription.getProvisionalDiagnosisList() != null
 				&& prescription.getProvisionalDiagnosisList().size() > 0) {
-			int pointer = 1;
 			for (SCTDescription obj : prescription.getProvisionalDiagnosisList()) {
 				if (obj.getTerm() != null) {
-					if (pointer == prescription.getProvisionalDiagnosisList().size()) {
+					if (pdTerm.toString().isEmpty()) {
 						pdTerm.append(obj.getTerm());
-						if (obj.getConceptID() != null)
+						if (null != obj.getConceptID()) {
 							pdConceptID.append(obj.getConceptID());
-						else
+						} else {
 							pdConceptID.append("N/A");
+						}
 					} else {
-						pdTerm.append(obj.getTerm()).append("  ||  ");
-						if (obj.getConceptID() != null)
-							pdConceptID.append(obj.getConceptID()).append("  ||  ");
-						else
-							pdConceptID.append("N/A").append("  ||  ");
+						if (obj.getTerm() != null) {
+							pdTerm.append("  ||  ").append(obj.getTerm());
+						}
+						if (obj.getConceptID() != null) {
+							pdConceptID.append("  ||  ").append(obj.getConceptID());
+						} else {
+							pdConceptID.append("  ||  ").append("N/A");
+						}
 					}
 				}
-				pointer++;
 			}
 			prescription.setDiagnosisProvided(pdTerm.toString());
 			prescription.setDiagnosisProvided_SCTCode(pdConceptID.toString());
@@ -3166,7 +3170,7 @@ public String getNurseWorkListNew(Integer providerServiceMapId, Integer vanID) {
 		long sevenDaysAgo = cal.getTimeInMillis();
 
 		ArrayList<BeneficiaryFlowStatus> obj = beneficiaryFlowStatusRepo.getNurseWorklistNew(providerServiceMapId,
-				vanID,new Timestamp(sevenDaysAgo));
+				vanID, new Timestamp(sevenDaysAgo));
 
 		return new Gson().toJson(obj);
 	}

src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java

@@ -35,7 +35,6 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-
 import com.iemr.tm.data.anc.BenAllergyHistory;
 import com.iemr.tm.data.anc.BenChildDevelopmentHistory;
 import com.iemr.tm.data.anc.BenFamilyHistory;
@@ -51,6 +50,7 @@
 import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
 import com.iemr.tm.data.anc.WrapperImmunizationHistory;
 import com.iemr.tm.data.anc.WrapperMedicationHistory;
+import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
 import com.iemr.tm.data.covid19.Covid19BenFeedback;
 import com.iemr.tm.data.nurse.BenAnthropometryDetail;
 import com.iemr.tm.data.nurse.BenPhysicalVitalDetail;
@@ -59,6 +59,7 @@
 import com.iemr.tm.data.quickConsultation.PrescribedDrugDetail;
 import com.iemr.tm.data.quickConsultation.PrescriptionDetail;
 import com.iemr.tm.data.tele_consultation.TeleconsultationRequestOBJ;
+import com.iemr.tm.repo.benFlowStatus.BeneficiaryFlowStatusRepo;
 import com.iemr.tm.repo.nurse.BenVisitDetailRepo;
 import com.iemr.tm.repo.nurse.covid19.Covid19BenFeedbackRepo;
 import com.iemr.tm.repo.quickConsultation.PrescriptionDetailRepo;
@@ -94,6 +95,8 @@ public class Covid19ServiceImpl implements Covid19Service {
 	private PrescriptionDetailRepo prescriptionDetailRepo;
 	@Autowired
 	private BenVisitDetailRepo benVisitDetailRepo;
+	@Autowired
+	private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo;
 
 
 
@@ -104,11 +107,15 @@ public String saveCovid19NurseData(JsonObject requestOBJ, String Authorization)
 		TeleconsultationRequestOBJ tcRequestOBJ = null;
 		// check if visit details data is not null
 		Long benVisitCode = null;
+		Map<String, Long> visitIdAndCodeMap = null;
 		if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
 			CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
-			// Call method to save visit details data
-			Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
+			Short nurseFlag = 9;
+			BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);
+			if(data == null) {
+			visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
 					nurseUtilityClass);
+			}
 
 			// 07-06-2018 visit code
 			Long benVisitID = null;

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

@@ -78,6 +78,7 @@ public class FoetalMonitorServiceImpl implements FoetalMonitorService {
 
 	private static HttpUtils httpUtils = new HttpUtils();
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
 
 	@Autowired
 	private FoetalMonitorRepo foetalMonitorRepo;
@@ -176,40 +177,68 @@ public int updateFoetalMonitorData(FoetalMonitor foetalMonitorDataOutside) throw
 	}
 
 	// generate report file in file storage
+
 	private String generatePDF(String filePath) throws IEMRException {
-
+		String filePathLocal = "";
+		Long timeStamp = System.currentTimeMillis();
 		try {
-			URI tempFilePath1 = URI.create(filePath).normalize();
-			String tempFilePath2 = tempFilePath1.toString();
-			String sanitizedPath = Paths.get(UriComponentsBuilder.fromPath(tempFilePath2).build().getPath()).toString();
-
-			URL url = new URL(sanitizedPath);
-			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+
+
+			URL url = new URL(filePath);	
+
+			con = (HttpURLConnection) url.openConnection();
 			con.setRequestMethod("GET");
-
-			// "Best Practice": Set headers as needed for the specific API
-			/*
-			 * con.addRequestProperty("User-Agent", "Your-User-Agent");
-			 * con.addRequestProperty("Authorization", "Bearer Your-AccessToken");
-			 * con.setDoInput(true);
-			 */
-
-			String fileName = System.currentTimeMillis() + ".pdf";
-			Path filePathLocal = Paths.get(foetalMonitorFilePath, fileName);
-			try (InputStream inputStream = con.getInputStream()) {
-				Files.copy(inputStream, filePathLocal, StandardCopyOption.REPLACE_EXISTING);
-			}
-			return filePathLocal.toString();
+			con.setDoInput(true);
+			filePathLocal = foetalMonitorFilePath + "/" + timeStamp.toString() + ".pdf";
+			Path path = Paths.get(filePathLocal);
+			Files.copy(con.getInputStream(), path, StandardCopyOption.REPLACE_EXISTING);
+
+
+
 
 		} catch (IOException e) {
 			throw new RuntimeException(e.getMessage());
 		} finally {
-			if (con != null) {
-				con.disconnect(); // Close the HTTP connection in the finally block
-			}
+			con.disconnect();
 		}
 
+		return filePathLocal;
 	}
+
+//	private String generatePDF(String filePath) throws IEMRException {
+//
+//		try {
+//			URI tempFilePath1 = URI.create(filePath).normalize();
+//			String tempFilePath2 = tempFilePath1.toString();
+//			String sanitizedPath = Paths.get(UriComponentsBuilder.fromPath(tempFilePath2).build().getPath()).toString();
+//
+//			URL url = new URL(sanitizedPath);
+//			HttpURLConnection con = (HttpURLConnection) url.openConnection();
+//			con.setRequestMethod("GET");
+//
+//			// "Best Practice": Set headers as needed for the specific API
+//			/*
+//			 * con.addRequestProperty("User-Agent", "Your-User-Agent");
+//			 * con.addRequestProperty("Authorization", "Bearer Your-AccessToken");
+//			 * con.setDoInput(true);
+//			 */
+//
+//			String fileName = System.currentTimeMillis() + ".pdf";
+//			Path filePathLocal = Paths.get(foetalMonitorFilePath, fileName);
+//			try (InputStream inputStream = con.getInputStream()) {
+//				Files.copy(inputStream, filePathLocal, StandardCopyOption.REPLACE_EXISTING);
+//			}
+//			return filePathLocal.toString();
+//
+//		} catch (IOException e) {
+//			throw new RuntimeException(e.getMessage());
+//		} finally {
+//			if (con != null) {
+//				con.disconnect(); // Close the HTTP connection in the finally block
+//			}
+//		}
+//
+//	}
 
 	// generate report file in file storage
 	@Override
@@ -245,7 +274,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 foetalMonitor
 				foetalMonitorTestDetails.setBeneficiaryRegID(benID);