Skip to content

AMM-306,AMM-1081,AMM-1082,AMM-1083,AMM-1084 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devikasuresh20 merged 3 commits into from
Nov 29, 2024
Merged

AMM-306,AMM-1081,AMM-1082,AMM-1083,AMM-1084 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac01bfa
AMM-306,AMM-1081,AMM-1082,AMM-1083,AMM-1084
ravishanigarapu Nov 29, 2024
011c7ae
removed role as mandatory
ravishanigarapu Nov 29, 2024
cfd1d37
Constants modified
ravishanigarapu Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/main/java/com/iemr/ecd/repository/report/EcdReportRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ public List<Object[]> getDevelopmentalDelayReport(@Param("startDate") Timestamp
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId);

@Query(value="call db_reporting.Pr_ECDAbortionReport(:startDate,:endDate,:agentId,:psmId,:role)", nativeQuery=true)
public List<Object[]> getAbortionReportByRole(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId, @Param("role") String role);

@Query(value="call db_reporting.Pr_ECDAbortionReport(:startDate,:endDate,:agentId,:psmId)", nativeQuery=true)
public List<Object[]> getAbortionReport(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
Expand All @@ -119,11 +124,21 @@ public List<Object[]> getMaternalDeathReport(@Param("startDate") Timestamp start
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId);

@Query(value="call db_reporting.Pr_ECDStillBirthReport(:startDate,:endDate,:agentId,:psmId,:role)", nativeQuery=true)
public List<Object[]> getStillBirthReportByRole(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId, @Param("role") String role);

@Query(value="call db_reporting.Pr_ECDStillBirthReport(:startDate,:endDate,:agentId,:psmId)", nativeQuery=true)
public List<Object[]> getStillBirthReport(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId);

@Query(value="call db_reporting.Pr_ECDBabyDeathReport(:startDate,:endDate,:agentId,:psmId,:role)", nativeQuery=true)
public List<Object[]> getBabyDeathReportByRole(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId, @Param("role") String role);

@Query(value="call db_reporting.Pr_ECDBabyDeathReport(:startDate,:endDate,:agentId,:psmId)", nativeQuery=true)
public List<Object[]> getBabyDeathReport(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
Expand All @@ -139,6 +154,11 @@ public List<Object[]> getJSYRelatedComplaintsReport(@Param("startDate") Timestam
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId);

@Query(value="call db_reporting.Pr_ECDMiscarriageReportByRole(:startDate,:endDate,:agentId,:psmId,:role)", nativeQuery=true)
public List<Object[]> getMiscarriageReportByRole(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
@Param("psmId") Integer psmId, @Param("role") String role);

@Query(value="call db_reporting.Pr_ECDMiscarriageReport(:startDate,:endDate,:agentId,:psmId)", nativeQuery=true)
public List<Object[]> getMiscarriageReport(@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate, @Param("agentId") Integer agentId,
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/iemr/ecd/service/associate/CallClosureImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ public String closeCall(CallClosureDTO request) {

if (request.getIsHrp() != null) {
callObj.setIsHighRisk(request.getIsHrp());
if (null != obj.getReceivedRoleName() && (obj.getReceivedRoleName().equalsIgnoreCase(Constants.ANM)
|| obj.getReceivedRoleName().equalsIgnoreCase(Constants.ASSOCIATE))) {
callObj.setCallStatus(Constants.OPEN);
}
}

if (request.getIsHrni() != null) {
Expand All @@ -171,11 +175,11 @@ public String closeCall(CallClosureDTO request) {
if (request.getNextAttemptDate() != null) {
Timestamp nextCallDate = getTimestampFromString(request.getNextAttemptDate());
callObj.setNextCallDate(nextCallDate);
callObj.setCallStatus("Open");
callObj.setCallStatus(Constants.OPEN);

} else {
if ((callObj.getCallAttemptNo() + 1) >= callConfigurationDetail.getNoOfAttempts()) {
callObj.setCallStatus("Completed");
callObj.setCallStatus(Constants.COMPLETED);
}

}
Expand Down
79 changes: 50 additions & 29 deletions src/main/java/com/iemr/ecd/service/report/ReportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public ByteArrayInputStream getCallDetailsReport(String request, String filename
result = ecdReportRepo.getCallDetailsReport(startDate, endDate, callDetailReport.getAgentId(),
callDetailReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -132,7 +132,7 @@ public ByteArrayInputStream getCallSummaryReport(String request, String filename
result = ecdReportRepo.getCallSummaryReport(startDate, endDate, callSummaryReport.getAgentId(),
callSummaryReport.getPsmId(), callSummaryReport.getRole());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -175,7 +175,7 @@ public ByteArrayInputStream getCumulativeDistrictReport(String request, String f
cumulativeDistrictReport.getAgentId(), cumulativeDistrictReport.getPsmId(),
cumulativeDistrictReport.getRole());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -216,7 +216,7 @@ public ByteArrayInputStream getBeneficiarywisefollowupdetails(String request, St
result = ecdReportRepo.getBeneficiarywisefollowupdetails(startDate, endDate,
beneficiarywisefollowupdetails.getAgentId(), beneficiarywisefollowupdetails.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -259,7 +259,7 @@ public ByteArrayInputStream getCallDetailReportUnique(String request, String fil
result = ecdReportRepo.getCallDetailReportUnique(startDate, endDate, benCallDetail.getAgentId(),
benCallDetail.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -298,7 +298,7 @@ public ByteArrayInputStream getBirthDefectReport(String request, String filename
result = ecdReportRepo.getBirthDefectReport(startDate, endDate, birthDefectReport.getAgentId(),
birthDefectReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -337,7 +337,7 @@ public ByteArrayInputStream getAashaHomeVisitGapReport(String request, String fi
result = ecdReportRepo.getAashaHomeVisitGapReport(startDate, endDate, ashaHomeVisitGapReport.getAgentId(),
ashaHomeVisitGapReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -376,7 +376,7 @@ public ByteArrayInputStream getCalciumIFATabNonadherenceReport(String request, S
result = ecdReportRepo.getCalciumIFATabNonadherenceReport(startDate, endDate,
calciumIFATabNonadherenceReport.getAgentId(), calciumIFATabNonadherenceReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -415,7 +415,7 @@ public ByteArrayInputStream getAbsenceInVHSNDReport(String request, String filen
result = ecdReportRepo.getAbsenceInVHSNDReport(startDate, endDate, absenceInVHSNDReport.getAgentId(),
absenceInVHSNDReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -454,7 +454,7 @@ public ByteArrayInputStream getVaccineDropOutIdentifiedReport(String request, St
result = ecdReportRepo.getVaccineDropOutIdentifiedReport(startDate, endDate,
vaccineDropOutIdentifiedReport.getAgentId(), vaccineDropOutIdentifiedReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -493,7 +493,7 @@ public ByteArrayInputStream getVaccineLeftOutIdentifiedReport(String request, St
result = ecdReportRepo.getVaccineLeftOutIdentifiedReport(startDate, endDate,
vaccineLeftOutIdentifiedReport.getAgentId(), vaccineLeftOutIdentifiedReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -532,7 +532,7 @@ public ByteArrayInputStream getDevelopmentalDelayReport(String request, String f
result = ecdReportRepo.getDevelopmentalDelayReport(startDate, endDate,
developmentalDelayReport.getAgentId(), developmentalDelayReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand All @@ -556,6 +556,7 @@ public ByteArrayInputStream getAbortionReport(String request, String filename) t
Criteria c = new Criteria();
Timestamp startDate = null;
Timestamp endDate = null;

if (abortionReport.getStartDate() != null) {
startDate = getTimestampFromString(
abortionReport.getStartDate().split("T")[0].concat("T00:00:00+05:30"));
Expand All @@ -569,10 +570,15 @@ public ByteArrayInputStream getAbortionReport(String request, String filename) t
c.setAgent_Id(abortionReport.getAgentId().toString());
if (abortionReport.getRole() != null)
c.setRole(abortionReport.getRole());
result = ecdReportRepo.getAbortionReport(startDate, endDate, abortionReport.getAgentId(),
abortionReport.getPsmId());
if(null != abortionReport.getRole()) {
result = ecdReportRepo.getAbortionReportByRole(startDate, endDate, abortionReport.getAgentId(),
abortionReport.getPsmId(),abortionReport.getRole());
}else {
result = ecdReportRepo.getAbortionReport(startDate, endDate, abortionReport.getAgentId(),
abortionReport.getPsmId());
}

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -613,7 +619,7 @@ public ByteArrayInputStream getDeliveryStatusReport(String request, String filen
result = ecdReportRepo.getDeliveryStatusReport(startDate, endDate, deliveryStatusReport.getAgentId(),
deliveryStatusReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -652,7 +658,7 @@ public ByteArrayInputStream getHRPCasesIdentifiedReport(String request, String f
result = ecdReportRepo.getHRPWCasesIdentifiedReport(startDate, endDate,
hRPWCasesIdentifiedReport.getAgentId(), hRPWCasesIdentifiedReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -691,7 +697,7 @@ public ByteArrayInputStream getInfantsHighRiskReport(String request, String file
result = ecdReportRepo.getInfantsHighRiskReport(startDate, endDate, infantsHighRiskReport.getAgentId(),
infantsHighRiskReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -730,7 +736,7 @@ public ByteArrayInputStream getMaternalDeathReport(String request, String filena
result = ecdReportRepo.getMaternalDeathReport(startDate, endDate, maternalDeathReport.getAgentId(),
maternalDeathReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -767,10 +773,15 @@ public ByteArrayInputStream getStillBirthReport(String request, String filename)
c.setAgent_Id(stillBirthReport.getAgentId().toString());
if (stillBirthReport.getRole() != null)
c.setRole(stillBirthReport.getRole());
result = ecdReportRepo.getStillBirthReport(startDate, endDate, stillBirthReport.getAgentId(),
stillBirthReport.getPsmId());
if(null != stillBirthReport.getRole()) {
result = ecdReportRepo.getStillBirthReportByRole(startDate, endDate, stillBirthReport.getAgentId(),
stillBirthReport.getPsmId(),stillBirthReport.getRole());
}else {
result = ecdReportRepo.getStillBirthReport(startDate, endDate, stillBirthReport.getAgentId(),
stillBirthReport.getPsmId());
}

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -807,10 +818,15 @@ public ByteArrayInputStream getBabyDeathReport(String request, String filename)
c.setAgent_Id(babyDeathReport.getAgentId().toString());
if (babyDeathReport.getRole() != null)
c.setRole(babyDeathReport.getRole());
result = ecdReportRepo.getBabyDeathReport(startDate, endDate, babyDeathReport.getAgentId(),
babyDeathReport.getPsmId());
if(null != babyDeathReport.getRole()) {
result = ecdReportRepo.getBabyDeathReportByRole(startDate, endDate, babyDeathReport.getAgentId(),
babyDeathReport.getPsmId(), babyDeathReport.getRole());
}else {
result = ecdReportRepo.getBabyDeathReport(startDate, endDate, babyDeathReport.getAgentId(),
babyDeathReport.getPsmId());
}

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -852,7 +868,7 @@ public ByteArrayInputStream getNotConnectedPhonelistDiffformatReport(String requ
notConnectedPhonelistDiffformatReport.getAgentId(),
notConnectedPhonelistDiffformatReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -891,7 +907,7 @@ public ByteArrayInputStream getJSYRelatedComplaintsReport(String request, String
result = ecdReportRepo.getJSYRelatedComplaintsReport(startDate, endDate,
jSYRelatedComplaintsReport.getAgentId(), jSYRelatedComplaintsReport.getPsmId());

if (result != null && result.size() > 0)
if (result != null && !result.isEmpty())
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
else
return null;
Expand Down Expand Up @@ -929,8 +945,13 @@ public ByteArrayInputStream getMiscarriageReport(String request, String filename
c.setAgent_Id(miscarriageReport.getAgentId().toString());
if (miscarriageReport.getRole() != null)
c.setRole(miscarriageReport.getRole());
result = ecdReportRepo.getMiscarriageReport(startDate, endDate, miscarriageReport.getAgentId(),
miscarriageReport.getPsmId());
if (null != miscarriageReport.getRole()) {
result = ecdReportRepo.getMiscarriageReportByRole(startDate, endDate, miscarriageReport.getAgentId(),
miscarriageReport.getPsmId(), miscarriageReport.getRole());
} else {
result = ecdReportRepo.getMiscarriageReport(startDate, endDate, miscarriageReport.getAgentId(),
miscarriageReport.getPsmId());
}

if (result != null && result.size() > 0)
response = ExcelHelper.tutorialsToExcel(headers, result, c, criteriaColumns);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/iemr/ecd/utils/constants/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ public class Constants {
public static final String MOTHER = "Mother";
public static final String CHILD = "Child";
public static final String ANM = "ANM";
public static final String ASSOCIATE = "ASSOCIATE";
public static final String OPEN = "open";
public static final String COMPLETED = "Completed";
public static final String TIME_FORMAT_START_TIME = "T00:00:00+05:30";
public static final String TIME_FORMAT_END_TIME = "T23:59:59+05:30";
public static final String T = "T";
Expand Down