AMM-1733 - Display HRP-marked Beneficiaries in Violet for Easy Identification (#153)

* Constans and null check added (#134)

* Update application.properties

* Swagger changes

* AMM-1456 : Skiped jwtToken validation if not present in Cookie or header
from mobile request.

* Jwtten and user-agent validation

* null check

* Constants added and null check

* Empty check added

* Optimized code

* removed commented code

* Prescription Template API not working (#139)

* Update application.properties

* Swagger changes

* AMM-1456 : Skiped jwtToken validation if not present in Cookie or header
from mobile request.

* Jwtten and user-agent validation

* null check

* Constants added and null check

* Empty check added

* Optimized code

* removed commented code

* Exception Handled and Null conditions added

* Coderabbit comments addressed

* AMM-1473 NCDScreening confirmed API change (#144)

* Update application.properties

* Swagger changes

* AMM-1456 : Skiped jwtToken validation if not present in Cookie or header
from mobile request.

* Jwtten and user-agent validation

* null check

* Constants added and null check

* Empty check added

* Optimized code

* removed commented code

* Exception Handled and Null conditions added

* Coderabbit comments addressed

* AMM-1473

* fix(bug): added high_risk to worklist to show flw highrisk patients

* fix(bug): added high_risk to worklist to show flw highrisk patients (#145)

Co-authored-by: KA40094929 <KA40094929@APL-5CD1394ZJT>

* AMM-1733 High risk pregnency field  added in nurse worklist (#146)

* Update application.properties

* Swagger changes

* AMM-1456 : Skiped jwtToken validation if not present in Cookie or header
from mobile request.

* Jwtten and user-agent validation

* null check

* Constants added and null check

* Empty check added

* Optimized code

* removed commented code

* Exception Handled and Null conditions added

* Coderabbit comments addressed

* AMM-1473

* AMM-1733

* fix(bug): added isHrp to worklist and followUp ANC for FLW with
benVisitId

* fix: coderabbitai suggestions

---------

Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Co-authored-by: KA40094929 <KA40094929@APL-5CD1394ZJT>

Author: 3 people

src/main/java/com/iemr/hwc/data/benFlowStatus/BeneficiaryFlowStatus.java

@@ -308,6 +308,7 @@ public Boolean isIs_high_risk() {
 	public void setIs_high_risk(boolean is_high_risk) {
 		this.is_high_risk = is_high_risk;
 	}
+	 
 
 	@Transient
 	private I_bendemographics i_bendemographics;

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

@@ -446,6 +446,10 @@ public int updateLabTechnicianFlag(@Param("lab_technician_flag") Short lab_techn
 	@Query(value = " SELECT beneficiary_visit_code FROM db_iemr.i_ben_flow_outreach WHERE beneficiary_reg_id =:benRegId AND "
 			+ " visit_category =:vc AND beneficiary_visit_code is not null  ORDER BY ben_flow_id DESC LIMIT 1 ", nativeQuery = true)
 	public Long getLatestVisitCode(@Param("benRegId") Long benRegId, @Param("vc") String vc);
+	
+	@Query(value = " SELECT BenVisitID FROM db_iemr.t_benvisitdetail WHERE BeneficiaryRegID =:benRegId AND "
+			+ " VisitCategory =:vc AND BenVisitID is not null  ORDER BY BenVisitID  DESC LIMIT 1 ", nativeQuery = true)
+	public Long getLatestBenVisitId(@Param("benRegId") Long benRegId, @Param("vc") String vc);
 
 	// get visit by location and modify_date
 	@Query("SELECT  t from BeneficiaryFlowStatus t WHERE t.villageID = :villageID AND t.modified_date > :lastModDate ORDER BY t.visitDate DESC ")

src/main/java/com/iemr/hwc/repo/nurse/anc/ANCCareRepo.java

@@ -58,6 +58,12 @@ public interface ANCCareRepo extends CrudRepository<ANCCareDetails, Long> {
 			+ "primiGravida, gravida_G, termDeliveries_T, pretermDeliveries_P, abortions_A, livebirths_L, bloodGroup, stillBirth,para  "
 			+ "from ANCCareDetails ba WHERE ba.beneficiaryRegID = :benRegID AND visitCode = :visitCode")
 	public ArrayList<Object[]> getANCCareDetails(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);
+	
+	@Query(" SELECT ID, beneficiaryRegID, benVisitID, providerServiceMapID, visitCode, visitNo, comolaintType, duration, description, "
+			+ " lastMenstrualPeriod_LMP, gestationalAgeOrPeriodofAmenorrhea_POA, trimesterNumber, expectedDateofDelivery, "
+			+ "primiGravida, gravida_G, termDeliveries_T, pretermDeliveries_P, abortions_A, livebirths_L, bloodGroup, stillBirth,para  "
+			+ "from ANCCareDetails ba WHERE ba.beneficiaryRegID = :benRegID AND benVisitID = :benVisitId")
+	public ArrayList<Object[]> getANCCareDetailsWithBenVisitId(@Param("benRegID") Long benRegID, @Param("benVisitId") Long benVisitId); 
 
 	@Query(" SELECT processed from ANCCareDetails where beneficiaryRegID=:benRegID AND visitCode = :visitCode")
 	public String getBenANCCareDetailsStatus(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);

src/main/java/com/iemr/hwc/repo/nurse/anc/ANCWomenVaccineRepo.java

@@ -44,6 +44,11 @@ public interface ANCWomenVaccineRepo extends CrudRepository<ANCWomenVaccineDetai
 	public ArrayList<Object[]> getANCWomenVaccineDetails(@Param("benRegID") Long benRegID,
 			 @Param("visitCode") Long visitCode);
 
+	@Query(" SELECT ID, beneficiaryRegID, benVisitID, providerServiceMapID, vaccineName, status, receivedDate, receivedFacilityName, visitCode "
+			+ "from ANCWomenVaccineDetail ba WHERE ba.beneficiaryRegID = :benRegID AND ba.benVisitID = :benVisitId")
+	public ArrayList<Object[]> getANCWomenVaccineDetailsWithBenVisitId(@Param("benRegID") Long benRegID,
+			 @Param("benVisitId") Long benVisitId);
+	
 	@Query(" SELECT vaccineName, processed from ANCWomenVaccineDetail where beneficiaryRegID=:benRegID AND visitCode = :visitCode AND deleted = false")
 	public ArrayList<Object[]> getBenANCWomenVaccineStatus(@Param("benRegID") Long benRegID,
 			@Param("visitCode") Long visitCode);

src/main/java/com/iemr/hwc/service/anc/ANCNurseService.java

@@ -214,6 +214,10 @@ public interface ANCNurseService {
 
 	String getANCWomenVaccineDetails(Long beneficiaryRegID, Long visitCode);
 
+	String getANCWomenVaccineDetailsWithBenVisitId(Long beneficiaryRegID, Long visitCode);
+
+	String getANCCareDetailsWithBenVisitId(Long beneficiaryRegID, Long visitCode);
+
 	// public int updatePhyHeadToToeExamination(PhyHeadToToeExamination
 	// headToToeExamination);
 

src/main/java/com/iemr/hwc/service/anc/ANCNurseServiceImpl.java

@@ -279,6 +279,20 @@ public String getANCWomenVaccineDetails(Long beneficiaryRegID, Long visitCode) {
 		WrapperAncImmunization ancWomenVaccineDetails = ANCWomenVaccineDetail.getANCWomenVaccineDetails(resList);
 		return new Gson().toJson(ancWomenVaccineDetails);
 	}
+	
+	@Override
+	public String getANCCareDetailsWithBenVisitId(Long beneficiaryRegID, Long benVisitId) {
+		ArrayList<Object[]> resList = ancCareRepo.getANCCareDetailsWithBenVisitId(beneficiaryRegID, benVisitId);
+		ANCCareDetails ancCareDetails = ANCCareDetails.getANCCareDetails(resList, 0);
+		return new Gson().toJson(ancCareDetails);
+	}
+
+	@Override
+	public String getANCWomenVaccineDetailsWithBenVisitId(Long beneficiaryRegID, Long benVisitId) {
+		ArrayList<Object[]> resList = ancWomenVaccineRepo.getANCWomenVaccineDetailsWithBenVisitId(beneficiaryRegID, benVisitId);
+		WrapperAncImmunization ancWomenVaccineDetails = ANCWomenVaccineDetail.getANCWomenVaccineDetails(resList);
+		return new Gson().toJson(ancWomenVaccineDetails);
+	}
 
 	@Override
 	public int updateBenAdherenceDetails(BenAdherence benAdherence) {

src/main/java/com/iemr/hwc/service/anc/ANCServiceImpl.java

@@ -1166,18 +1166,29 @@ public String getBenVisitDetailsFrmNurseANC(Long benRegID, Long visitCode) {
 	@Override
 	public String getBenANCDetailsFrmNurseANC(Long benRegID, Long visitCode) throws IEMRException {
 		Map<String, Object> resMap = new HashMap<>();
+		Long benVisitId = null;
 
 		// check the latest visit code for ANC visit, if any
 		if (visitCode == null && benRegID != null) {
 			visitCode = beneficiaryFlowStatusRepo.getLatestVisitCode(benRegID, "ANC");
-			if (visitCode == null)
-				return resMap.toString();
-
+			if (visitCode == null) {
+				benVisitId = beneficiaryFlowStatusRepo.getLatestBenVisitId(benRegID, "ANC");
+			}
+		}
+		if (visitCode == null && benVisitId == null) {
+			return new Gson().toJson(resMap);
+			}
+		if(benVisitId != null) {
+			resMap.put("ANCCareDetail", ancNurseServiceImpl.getANCCareDetailsWithBenVisitId(benRegID, benVisitId));
+		} else {
+			resMap.put("ANCCareDetail", ancNurseServiceImpl.getANCCareDetails(benRegID, visitCode));
+		}
+		
+		if(benVisitId != null) {
+			resMap.put("ANCWomenVaccineDetails", ancNurseServiceImpl.getANCWomenVaccineDetailsWithBenVisitId(benRegID, benVisitId));
+		} else {
+			resMap.put("ANCWomenVaccineDetails", ancNurseServiceImpl.getANCWomenVaccineDetails(benRegID, visitCode));
 		}
-
-		resMap.put("ANCCareDetail", ancNurseServiceImpl.getANCCareDetails(benRegID, visitCode));
-
-		resMap.put("ANCWomenVaccineDetails", ancNurseServiceImpl.getANCWomenVaccineDetails(benRegID, visitCode));
 
 		return resMap.toString();
 	}

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

@@ -405,6 +405,11 @@ public String getDocWorkListNew(Integer providerServiceMapId, Integer serviceID,
 		else if (serviceID != null && serviceID == 9) {
 			docWorkList = beneficiaryFlowStatusRepo.getDocWorkListNewTC(providerServiceMapId,
 					new Timestamp(sevenDaysAgo), vanID);
+			for (BeneficiaryFlowStatus beneficiaryFlowStatus : docWorkList) {
+				Boolean isHighrisk = beneficiaryFlowStatusRepo.getIsHighrisk(beneficiaryFlowStatus.getBeneficiaryID());
+				if(null != isHighrisk)
+					beneficiaryFlowStatus.setIs_high_risk(isHighrisk);
+			}
 		}
 
 		return new Gson().toJson(docWorkList);

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

@@ -3545,6 +3545,7 @@ public String getNurseWorkListNew(Integer providerServiceMapId, Integer vanID) {
 
 		ArrayList<BeneficiaryFlowStatus> obj = beneficiaryFlowStatusRepo.getNurseWorklistNew(providerServiceMapId,
 				vanID, fromDate);
+
 		for (BeneficiaryFlowStatus beneficiaryFlowStatus : obj) {
 			Boolean isHighrisk = beneficiaryFlowStatusRepo.getIsHighrisk(beneficiaryFlowStatus.getBeneficiaryID());
 			if(null != isHighrisk)