AMM-1733 High risk pregnency field added in nurse worklist

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

@@ -25,6 +25,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.gson.annotations.Expose;
+import com.iemr.hwc.annotation.sqlInjectionSafe.SQLInjectionSafe;
+import com.iemr.hwc.data.login.MasterVan;
+import com.iemr.hwc.data.masterdata.registrar.GenderMaster;
+
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -36,11 +41,6 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 
-import com.google.gson.annotations.Expose;
-import com.iemr.hwc.annotation.sqlInjectionSafe.SQLInjectionSafe;
-import com.iemr.hwc.data.login.MasterVan;
-import com.iemr.hwc.data.masterdata.registrar.GenderMaster;
-
 /***
  * 
  * @author NE298657
@@ -296,11 +296,19 @@ public class BeneficiaryFlowStatus {
 	@Column(name = "referred_visit_id")
 	private Long referred_visit_id;
 
-	@Expose
-	@Column(name = "is_high_risk", insertable = false, updatable = false)
-	private Boolean is_high_risk;
-
 
+	@Transient
+	Boolean is_high_risk;
+
+
+	public Boolean isIs_high_risk() {
+		return is_high_risk;
+	}
+
+	public void setIs_high_risk(boolean is_high_risk) {
+		this.is_high_risk = is_high_risk;
+	}
+
 	@Transient
 	private I_bendemographics i_bendemographics;
 	@Transient

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

@@ -51,15 +51,12 @@ public interface BeneficiaryFlowStatusRepo extends CrudRepository<BeneficiaryFlo
 //	public ArrayList<BeneficiaryFlowStatus> getNurseWorklistNew(
 //			@Param("providerServiceMapId") Integer providerServiceMapId, @Param("vanID") Integer vanID);
 
-	@Query(value = "SELECT t.*, anc.is_high_risk as is_high_risk FROM i_ben_flow_outreach t "
-			+ "INNER JOIN t_anc_visit anc ON t.beneficiary_id = anc.ben_id "
-			+ "WHERE (t.nurse_flag = 1 OR t.nurse_flag = 100) "
-			+ "AND (t.specialist_flag <> 100 OR t.specialist_flag IS NULL) " + "AND t.deleted = false "
-			+ "AND DATE(t.created_date) >= DATE(:fromDate) " + "AND t.providerServiceMapId = :providerServiceMapId "
-			+ "AND t.vanID = :vanID " + "ORDER BY t.created_date DESC", nativeQuery = true)
-	public ArrayList<BeneficiaryFlowStatus> getNurseWorklistNew(@Param("providerServiceMapId") Integer providerServiceMapId,
-			@Param("vanID") Integer vanID, @Param("fromDate") Timestamp fromDate);
-
+	@Query("SELECT  t from BeneficiaryFlowStatus t WHERE (t.nurseFlag = 1 OR t.nurseFlag = 100) AND (t.specialist_flag <> 100 OR t.specialist_flag is null) AND t.deleted = false "
+			+ " AND Date(t.visitDate)  >= Date(:fromDate) AND t.providerServiceMapId = :providerServiceMapId "
+			+ " AND t.vanID = :vanID  ORDER BY t.visitDate DESC ")
+	public ArrayList<BeneficiaryFlowStatus> getNurseWorklistNew(
+			@Param("providerServiceMapId") Integer providerServiceMapId, @Param("vanID") Integer vanID,
+			@Param("fromDate") Timestamp fromDate);
 	// nurse worklist TC current date
 	@Query("SELECT  t from BeneficiaryFlowStatus t WHERE (t.specialist_flag != 0 AND t.specialist_flag != 100 AND t.specialist_flag is not null)"
 			+ " AND t.deleted = false AND DATE(t.benVisitDate) >= DATE(:fromDate) "
@@ -460,5 +457,8 @@ public int updateLabTechnicianFlag(@Param("lab_technician_flag") Short lab_techn
 
 	@Query("SELECT COUNT(t) from BeneficiaryFlowStatus t WHERE t.villageID IN :villageIDs AND t.modified_date > :lastModDate ")
 	Long getFlowRecordsCount(@Param("villageIDs") List<Integer> villageID, @Param("lastModDate") Timestamp lastModDate);
+
+	@Query(value = "SELECT is_high_risk from t_anc_visit t WHERE t.ben_id = :ben_id order by 1 desc limit 1",nativeQuery = true)
+	public Boolean getIsHighrisk(@Param("ben_id") Long ben_id);
 
 }

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

@@ -3545,7 +3545,11 @@ 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)
+				beneficiaryFlowStatus.setIs_high_risk(isHighrisk);
+		}
 		return new Gson().toJson(obj);
 	}