diff --git a/src/main/java/com/iemr/hwc/data/benFlowStatus/BeneficiaryFlowStatus.java b/src/main/java/com/iemr/hwc/data/benFlowStatus/BeneficiaryFlowStatus.java index 581c8bd9..c99aeab0 100644 --- a/src/main/java/com/iemr/hwc/data/benFlowStatus/BeneficiaryFlowStatus.java +++ b/src/main/java/com/iemr/hwc/data/benFlowStatus/BeneficiaryFlowStatus.java @@ -296,6 +296,11 @@ 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 private I_bendemographics i_bendemographics; @Transient diff --git a/src/main/java/com/iemr/hwc/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java b/src/main/java/com/iemr/hwc/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java index 99717e9a..761db390 100644 --- a/src/main/java/com/iemr/hwc/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java +++ b/src/main/java/com/iemr/hwc/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java @@ -51,12 +51,14 @@ public interface BeneficiaryFlowStatusRepo extends CrudRepository getNurseWorklistNew( // @Param("providerServiceMapId") Integer providerServiceMapId, @Param("vanID") Integer vanID); - @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 getNurseWorklistNew( - @Param("providerServiceMapId") Integer providerServiceMapId, @Param("vanID") Integer vanID, - @Param("fromDate") Timestamp fromDate); + @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 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)" diff --git a/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java b/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java index 6224205b..cfb7e9b5 100644 --- a/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java @@ -3541,9 +3541,10 @@ public String getNurseWorkListNew(Integer providerServiceMapId, Integer vanID) { else cal.add(Calendar.DAY_OF_YEAR, -7); long sevenDaysAgo = cal.getTimeInMillis(); + Timestamp fromDate = new Timestamp(sevenDaysAgo); ArrayList obj = beneficiaryFlowStatusRepo.getNurseWorklistNew(providerServiceMapId, - vanID, new Timestamp(sevenDaysAgo)); + vanID, fromDate); return new Gson().toJson(obj); }