Skip to content

AMM-813 | Digwal_TM mutiple visit in db for single beneficiary #66

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

Open
srishtigrp78 wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

AMM-813 | Digwal_TM mutiple visit in db for single beneficiary #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ba83945
Merge pull request #1 from PSMRI/develop
srishtigrp78 Nov 26, 2024
d8542c2
Merge pull request #2 from PSMRI/develop
srishtigrp78 Feb 21, 2025
a7a6e4c
Merge pull request #3 from PSMRI/develop
srishtigrp78 Mar 27, 2025
fe0ba2d
adding loggers to check missing details saving
Apr 3, 2025
c4387f3
error messages correction
Apr 3, 2025
b881acb
improving log statements
Apr 3, 2025
d1ca734
adding logger changes
Apr 3, 2025
5f4c042
adding logger for other visit catgories
Apr 3, 2025
172aef2
removing duplicates
Apr 3, 2025
a335523
creating constant for duplicates
Apr 3, 2025
6925add
adding duplicates for constant vars
Apr 3, 2025
f01c2c9
adding constant for duplicates
Apr 3, 2025
830f3f3
removing spaces
Apr 3, 2025
894af98
Merge pull request #4 from PSMRI/develop
srishtigrp78 May 21, 2025
e3eb3a3
fix: ensure jwt is not in deny list before further authentication
drtechie May 30, 2025
f332c50
fix: remove deprecated methods, add null check for jti
drtechie May 30, 2025
1e13763
Merge pull request #5 from PSMRI/logout-check
srishtigrp78 Jun 2, 2025
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
32 changes: 32 additions & 0 deletions src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -100,6 +102,9 @@
@Service
public class ANCServiceImpl implements ANCService {

private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());


private ANCNurseServiceImpl ancNurseServiceImpl;
private ANCDoctorServiceImpl ancDoctorServiceImpl;
private CommonNurseServiceImpl commonNurseServiceImpl;
Expand Down Expand Up @@ -208,17 +213,44 @@ public String saveANCNurseData(JsonObject requestOBJ, String Authorization) thro
// create tc request
tcRequestOBJ = commonServiceImpl.createTcRequest(requestOBJ, nurseUtilityClass, Authorization);
// call method to save ANC data
logger.info("Start saving ANC details for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);

ancSaveSuccessFlag = saveBenANCDetails(requestOBJ.getAsJsonObject("ancDetails"), benVisitID,
benVisitCode);
if (ancSaveSuccessFlag == null || ancSaveSuccessFlag <= 0) {
logger.error("Error in saving BenANCDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenANCDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// call method to save History data
logger.info("Start saving BenANCHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
historySaveSuccessFlag = saveBenANCHistoryDetails(requestOBJ.getAsJsonObject("historyDetails"),
benVisitID, benVisitCode);
if (historySaveSuccessFlag == null || historySaveSuccessFlag <= 0) {
logger.error("Error in saving BenANCHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenANCHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// call method to save Vital data
logger.info("Start saving BenANCVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);

vitalSaveSuccessFlag = saveBenANCVitalDetails(requestOBJ.getAsJsonObject("vitalDetails"), benVisitID,
benVisitCode);
if (vitalSaveSuccessFlag == null || vitalSaveSuccessFlag <= 0) {
logger.error("Error in saving BenANCVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenANCVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}

// call method to save Examination data
logger.info("Start saving BenANCExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
examtnSaveSuccessFlag = saveBenANCExaminationDetails(requestOBJ.getAsJsonObject("examinationDetails"),
benVisitID, benVisitCode);
if (examtnSaveSuccessFlag == null || examtnSaveSuccessFlag <= 0) {
logger.error("Error in saving BenANCExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenANCExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
} else {
throw new RuntimeException("Error occurred while creating beneficiary visit");
}
Expand Down
21 changes: 20 additions & 1 deletion src/main/java/com/iemr/tm/service/cancerScreening/CSServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,32 @@ public String saveCancerScreeningNurseData(JsonObject requestOBJ, String Authori
tcRequestOBJ = commonServiceImpl.createTcRequest(requestOBJ, nurseUtilityClass, Authorization);

// call method to save history data
logger.info("Start saving BenHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
Long historySaveSuccessFlag = saveBenHistoryDetails(requestOBJ, benVisitID, benVisitCode);
if (historySaveSuccessFlag == null || historySaveSuccessFlag <= 0) {
logger.error("Error in saving BenHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}

// call method to save Examination data
logger.info("Start saving BenExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
Long examinationSuccessFlag = saveBenExaminationDetails(requestOBJ, benVisitID, Authorization,
benVisitCode, benFlowID);
if (examinationSuccessFlag == null || examinationSuccessFlag <= 0) {
logger.error("Error in saving BenExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// call method to save vitals data
logger.info("Start saving BenVitalsDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
Long vitalSaveSuccessFlag = saveBenVitalsDetails(requestOBJ, benVisitID, benVisitCode);

if (vitalSaveSuccessFlag == null || vitalSaveSuccessFlag <= 0) {
logger.error("Error in saving BenVitalsDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenVitalsDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}

if ((historySaveSuccessFlag != null && historySaveSuccessFlag > 0)
&& (examinationSuccessFlag != null && examinationSuccessFlag > 0)
&& (vitalSaveSuccessFlag != null && vitalSaveSuccessFlag > 0)) {
Expand Down
19 changes: 18 additions & 1 deletion src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -75,6 +77,9 @@

@Service
public class Covid19ServiceImpl implements Covid19Service {

private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

@Autowired
private CommonNurseServiceImpl commonNurseServiceImpl;
@Autowired
Expand Down Expand Up @@ -153,12 +158,24 @@ public String saveCovid19NurseData(JsonObject requestOBJ, String Authorization)

tcRequestOBJ = commonServiceImpl.createTcRequest(requestOBJ, nurseUtilityClass, Authorization);
// call method to save History data
logger.info("Start saving BenCovid19HistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
historySaveSuccessFlag = saveBenCovid19HistoryDetails(requestOBJ.getAsJsonObject("historyDetails"),
benVisitID, benVisitCode);
if (historySaveSuccessFlag == null || historySaveSuccessFlag <= 0) {
logger.error("Error in saving BenCovid19HistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenCovid19HistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// call method to save Vital data
logger.info("Start saving BenCovid19VitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
vitalSaveSuccessFlag = saveBenCovid19VitalDetails(requestOBJ.getAsJsonObject("vitalDetails"),
benVisitID, benVisitCode);

if (vitalSaveSuccessFlag == null || vitalSaveSuccessFlag <= 0) {
logger.error("Error in saving BenCovid19VitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenCovid19VitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}

} else {
throw new RuntimeException("Error occurred while creating beneficiary visit");
}
Expand Down
44 changes: 37 additions & 7 deletions src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -80,6 +82,13 @@

@Service
public class GeneralOPDServiceImpl implements GeneralOPDService {

private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

private static final String VITAL_DETAILS = "vitalDetails";
private static final String EXAMINATION_DETAILS = "examinationDetails";
private static final String HISTORY_DETAILS = "historyDetails";

@Autowired
private CommonNurseServiceImpl commonNurseServiceImpl;
@Autowired
Expand Down Expand Up @@ -144,19 +153,40 @@ public String saveNurseData(JsonObject requestOBJ, String Authorization) throws
// create tc request
tcRequestOBJ = commonServiceImpl.createTcRequest(requestOBJ, nurseUtilityClass, Authorization);
// call method to save History data
if (requestOBJ.has("historyDetails") && !requestOBJ.get("historyDetails").isJsonNull())
if (requestOBJ.has(HISTORY_DETAILS) && !requestOBJ.get(HISTORY_DETAILS).isJsonNull()) {
logger.info("Start saving BenGeneralOPDHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
historySaveSuccessFlag = saveBenGeneralOPDHistoryDetails(
requestOBJ.getAsJsonObject("historyDetails"), benVisitID, benVisitCode);
requestOBJ.getAsJsonObject(HISTORY_DETAILS), benVisitID, benVisitCode);
if (historySaveSuccessFlag == null || historySaveSuccessFlag <= 0) {
logger.error("Error in saving BenGeneralOPDHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenGeneralOPDHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
}

// call method to save vital data
if (requestOBJ.has("vitalDetails") && !requestOBJ.get("vitalDetails").isJsonNull())
vitalSaveSuccessFlag = saveBenVitalDetails(requestOBJ.getAsJsonObject("vitalDetails"), benVisitID,
if (requestOBJ.has(VITAL_DETAILS) && !requestOBJ.get(VITAL_DETAILS).isJsonNull()) {
logger.info("Start saving BenVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
vitalSaveSuccessFlag = saveBenVitalDetails(requestOBJ.getAsJsonObject(VITAL_DETAILS), benVisitID,
benVisitCode);

if (vitalSaveSuccessFlag == null || vitalSaveSuccessFlag <= 0) {
logger.error("Error in saving BenVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
}

// call method to save examination data
if (requestOBJ.has("examinationDetails") && !requestOBJ.get("examinationDetails").isJsonNull())
examtnSaveSuccessFlag = saveBenExaminationDetails(requestOBJ.getAsJsonObject("examinationDetails"),
if (requestOBJ.has(EXAMINATION_DETAILS) && !requestOBJ.get(EXAMINATION_DETAILS).isJsonNull()) {
logger.info("Start saving BenExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
examtnSaveSuccessFlag = saveBenExaminationDetails(requestOBJ.getAsJsonObject(EXAMINATION_DETAILS),
benVisitID, benVisitCode);
if (examtnSaveSuccessFlag == null || examtnSaveSuccessFlag <= 0) {
logger.error("Error in saving BenExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenExaminationDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
}
} else {
throw new RuntimeException("Error occurred while creating beneficiary visit");
}
Expand Down
19 changes: 18 additions & 1 deletion src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -77,6 +79,9 @@

@Service
public class NCDCareServiceImpl implements NCDCareService {

private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

private CommonNurseServiceImpl commonNurseServiceImpl;
private CommonDoctorServiceImpl commonDoctorServiceImpl;
private NCDCareDoctorServiceImpl ncdCareDoctorServiceImpl;
Expand Down Expand Up @@ -164,12 +169,24 @@ public String saveNCDCareNurseData(JsonObject requestOBJ, String Authorization)
if (benVisitID != null && benVisitID > 0) {
tcRequestOBJ = commonServiceImpl.createTcRequest(requestOBJ, nurseUtilityClass, Authorization);
// call method to save History data
logger.info("Start saving BenNCDCareHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
historySaveSuccessFlag = saveBenNCDCareHistoryDetails(requestOBJ.getAsJsonObject("historyDetails"),
benVisitID, benVisitCode);
if (historySaveSuccessFlag == null || historySaveSuccessFlag <= 0) {
logger.error("error in saving BenNCDCareHistoryDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
else {
logger.info("successfully saved BenNCDCareHistoryDetails BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// call method to save Vital data
logger.info("Start saving BenNCDCareVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
vitalSaveSuccessFlag = saveBenNCDCareVitalDetails(requestOBJ.getAsJsonObject("vitalDetails"),
benVisitID, benVisitCode);

if (vitalSaveSuccessFlag == null || vitalSaveSuccessFlag <= 0) {
logger.error("Error in saving BenNCDCareVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenNCDCareVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// i = commonNurseServiceImpl.updateBeneficiaryStatus('N',
// tmpOBJ.get("beneficiaryRegID").getAsLong());
} else {
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/com/iemr/tm/service/ncdscreening/NCDScreeningServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -81,6 +83,8 @@
@Service
public class NCDScreeningServiceImpl implements NCDScreeningService {

private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

private NCDScreeningNurseServiceImpl ncdScreeningNurseServiceImpl;
private CommonNurseServiceImpl commonNurseServiceImpl;
private CommonBenStatusFlowServiceImpl commonBenStatusFlowServiceImpl;
Expand Down Expand Up @@ -193,14 +197,32 @@ public String saveNCDScreeningNurseData(JsonObject requestOBJ, String Authorizat
historySaveSuccessFlag = saveBenNCDCareHistoryDetails(requestOBJ.getAsJsonObject("historyDetails"),
benVisitID, benVisitCode);
// call method to save Vital data
logger.info("Start saving BenNCDCareVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
vitalSaveSuccessFlag = saveBenNCDCareVitalDetails(requestOBJ.getAsJsonObject("vitalDetails"),
benVisitID, benVisitCode);
if (vitalSaveSuccessFlag == null || vitalSaveSuccessFlag <= 0) {
logger.error("Error in saving BenNCDCareVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved BenNCDCareVitalDetails for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// call method to save IDRS data
logger.info("Start saving IDRS details for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
idrsFlag = saveidrsDetails(requestOBJ.getAsJsonObject("idrsDetails"), benVisitID, benVisitCode);
if (idrsFlag == null || idrsFlag <= 0) {
logger.error("Error in saving IDRS details for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved IDRS details for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
// call method to save physical activity
logger.info("Start saving Physical Activity details for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
physicalActivityFlag = savePhysicalActivityDetails(
requestOBJ.getAsJsonObject("historyDetails").getAsJsonObject("physicalActivityHistory"),
benVisitID, benVisitCode);
if (physicalActivityFlag == null || physicalActivityFlag <= 0) {
logger.error("Error in saving Physical Activity details for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
} else {
logger.info("Successfully saved Physical Activity details for BenVisitID={} and BenVisitCode={}", benVisitID, benVisitCode);
}
} else {
throw new RuntimeException("Error occurred while creating beneficiary visit");
}
Expand Down
Loading
Loading