Skip to content
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

Multiple Beneficiary visit- all visit category-nurse save- Api modified #39

Merged
merged 1 commit into from
Apr 19, 2024
Merged

Multiple Beneficiary visit- all visit category-nurse save- Api modified #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/main/java/com/iemr/tm/repo/benFlowStatus/BeneficiaryFlowStatusRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,5 +440,8 @@ public ArrayList<BeneficiaryFlowStatus> getMmuNurseWorklistNew(
// */
// @Query("SELECT t.lab_technician_flag from BeneficiaryFlowStatus t WHERE t.benFlowID =:benFlowID ")
// public Short getLabTechnicianFlag(@Param("benFlowID") Long benFlowID);

@Query("SELECT t from BeneficiaryFlowStatus t where t.benFlowID = :benFlowID And t.nurseFlag = :nurseFlag")
BeneficiaryFlowStatus checkExistData(@Param("benFlowID") Long benFlowID, @Param("nurseFlag") Short nurseFlag);

}
10 changes: 8 additions & 2 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 @@ -66,6 +66,7 @@
import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
import com.iemr.tm.data.anc.WrapperImmunizationHistory;
import com.iemr.tm.data.anc.WrapperMedicationHistory;
import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
import com.iemr.tm.data.foetalmonitor.FoetalMonitor;
import com.iemr.tm.data.nurse.BenAnthropometryDetail;
import com.iemr.tm.data.nurse.BenPhysicalVitalDetail;
Expand Down Expand Up @@ -168,12 +169,17 @@ public String saveANCNurseData(JsonObject requestOBJ, String Authorization) thro
Long saveSuccessFlag = null;
TeleconsultationRequestOBJ tcRequestOBJ = null;
Long benVisitCode = null;
Map<String, Long> visitIdAndCodeMap = null;
// check if visit details data is not null
if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
// Call method to save visit details data
Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
Short nurseFlag = 9;
BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);

if(data == null) {
visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
nurseUtilityClass);
}

Long benVisitID = null;

Expand Down
9 changes: 7 additions & 2 deletions 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 @@ -162,15 +162,20 @@ public String saveCancerScreeningNurseData(JsonObject requestOBJ, String Authori
Long nurseDataSuccessFlag = null;
TeleconsultationRequestOBJ tcRequestOBJ = null;
Long benVisitCode = null;
Map<String, Long> visitIdAndCodeMap = null;
// check if visit details data is not null
if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
// Call method to save visit details data

CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
BeneficiaryVisitDetail benVisitDetailsOBJ = InputMapper.gson().fromJson(requestOBJ.get("visitDetails"),
BeneficiaryVisitDetail.class);

Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(benVisitDetailsOBJ, nurseUtilityClass);
Short nurseFlag = 9;
BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);

if(data == null) {
visitIdAndCodeMap = saveBenVisitDetails(benVisitDetailsOBJ, nurseUtilityClass);
}

Long benVisitID = null;

Expand Down
13 changes: 10 additions & 3 deletions 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 @@ -35,7 +35,6 @@
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;

import com.iemr.tm.data.anc.BenAllergyHistory;
import com.iemr.tm.data.anc.BenChildDevelopmentHistory;
import com.iemr.tm.data.anc.BenFamilyHistory;
Expand All @@ -51,6 +50,7 @@
import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
import com.iemr.tm.data.anc.WrapperImmunizationHistory;
import com.iemr.tm.data.anc.WrapperMedicationHistory;
import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
import com.iemr.tm.data.covid19.Covid19BenFeedback;
import com.iemr.tm.data.nurse.BenAnthropometryDetail;
import com.iemr.tm.data.nurse.BenPhysicalVitalDetail;
Expand All @@ -59,6 +59,7 @@
import com.iemr.tm.data.quickConsultation.PrescribedDrugDetail;
import com.iemr.tm.data.quickConsultation.PrescriptionDetail;
import com.iemr.tm.data.tele_consultation.TeleconsultationRequestOBJ;
import com.iemr.tm.repo.benFlowStatus.BeneficiaryFlowStatusRepo;
import com.iemr.tm.repo.nurse.BenVisitDetailRepo;
import com.iemr.tm.repo.nurse.covid19.Covid19BenFeedbackRepo;
import com.iemr.tm.repo.quickConsultation.PrescriptionDetailRepo;
Expand Down Expand Up @@ -94,6 +95,8 @@ public class Covid19ServiceImpl implements Covid19Service {
private PrescriptionDetailRepo prescriptionDetailRepo;
@Autowired
private BenVisitDetailRepo benVisitDetailRepo;
@Autowired
private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo;



Expand All @@ -104,11 +107,15 @@ public String saveCovid19NurseData(JsonObject requestOBJ, String Authorization)
TeleconsultationRequestOBJ tcRequestOBJ = null;
// check if visit details data is not null
Long benVisitCode = null;
Map<String, Long> visitIdAndCodeMap = null;
if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
// Call method to save visit details data
Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
Short nurseFlag = 9;
BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);
if(data == null) {
visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
nurseUtilityClass);
}

// 07-06-2018 visit code
Long benVisitID = null;
Expand Down
14 changes: 12 additions & 2 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 @@ -57,6 +57,7 @@
import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
import com.iemr.tm.data.anc.WrapperImmunizationHistory;
import com.iemr.tm.data.anc.WrapperMedicationHistory;
import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
import com.iemr.tm.data.nurse.BenAnthropometryDetail;
import com.iemr.tm.data.nurse.BenPhysicalVitalDetail;
import com.iemr.tm.data.nurse.BeneficiaryVisitDetail;
Expand All @@ -65,6 +66,7 @@
import com.iemr.tm.data.quickConsultation.PrescribedDrugDetail;
import com.iemr.tm.data.quickConsultation.PrescriptionDetail;
import com.iemr.tm.data.tele_consultation.TeleconsultationRequestOBJ;
import com.iemr.tm.repo.benFlowStatus.BeneficiaryFlowStatusRepo;
import com.iemr.tm.repo.nurse.BenVisitDetailRepo;
import com.iemr.tm.repo.nurse.anc.BenAdherenceRepo;
import com.iemr.tm.repo.quickConsultation.BenChiefComplaintRepo;
Expand Down Expand Up @@ -98,6 +100,8 @@ public class GeneralOPDServiceImpl implements GeneralOPDService {
private BenChiefComplaintRepo benChiefComplaintRepo;
@Autowired
private BenAdherenceRepo benAdherenceRepo;
@Autowired
private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo;



Expand All @@ -110,12 +114,18 @@ public String saveNurseData(JsonObject requestOBJ, String Authorization) throws
Long saveSuccessFlag = null;
Long benVisitCode = null;
TeleconsultationRequestOBJ tcRequestOBJ = null;
Map<String, Long> visitIdAndCodeMap = null;
if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {

CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
// Call method to save visit details data
Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),

Short nurseFlag = 9;
BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);

if(data == null) {
visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
nurseUtilityClass);
}

Long benVisitID = null;

Expand Down
13 changes: 11 additions & 2 deletions 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 @@ -52,6 +52,7 @@
import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
import com.iemr.tm.data.anc.WrapperImmunizationHistory;
import com.iemr.tm.data.anc.WrapperMedicationHistory;
import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
import com.iemr.tm.data.ncdcare.NCDCareDiagnosis;
import com.iemr.tm.data.nurse.BenAnthropometryDetail;
import com.iemr.tm.data.nurse.BenPhysicalVitalDetail;
Expand All @@ -61,6 +62,7 @@
import com.iemr.tm.data.quickConsultation.PrescriptionDetail;
import com.iemr.tm.data.snomedct.SCTDescription;
import com.iemr.tm.data.tele_consultation.TeleconsultationRequestOBJ;
import com.iemr.tm.repo.benFlowStatus.BeneficiaryFlowStatusRepo;
import com.iemr.tm.repo.nurse.BenVisitDetailRepo;
import com.iemr.tm.repo.nurse.anc.BenAdherenceRepo;
import com.iemr.tm.repo.quickConsultation.BenChiefComplaintRepo;
Expand Down Expand Up @@ -118,18 +120,25 @@ public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceI

@Autowired
private SMSGatewayServiceImpl sMSGatewayServiceImpl;
@Autowired
private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo;

@Override
public String saveNCDCareNurseData(JsonObject requestOBJ, String Authorization) throws Exception {
Long saveSuccessFlag = null;
TeleconsultationRequestOBJ tcRequestOBJ = null;
Long benVisitCode = null;
Map<String, Long> visitIdAndCodeMap = null;
// check if visit details data is not null
if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
// Call method to save visit details data
Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
Short nurseFlag = 9;
BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);

if(data == null) {
visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
nurseUtilityClass);
}

// 07-06-2018 visit code
Long benVisitID = null;
Expand Down
10 changes: 8 additions & 2 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 @@ -50,6 +50,7 @@
import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
import com.iemr.tm.data.anc.WrapperImmunizationHistory;
import com.iemr.tm.data.anc.WrapperMedicationHistory;
import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
import com.iemr.tm.data.ncdScreening.IDRSData;
import com.iemr.tm.data.ncdScreening.NCDScreening;
import com.iemr.tm.data.ncdScreening.PhysicalActivityType;
Expand Down Expand Up @@ -147,12 +148,17 @@ public String saveNCDScreeningNurseData(JsonObject requestOBJ, String Authorizat
Long saveSuccessFlag = null;
TeleconsultationRequestOBJ tcRequestOBJ = null;
Long benVisitCode = null;
Map<String, Long> visitIdAndCodeMap = null;
// check if visit details data is not null
if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);
// Call method to save visit details data
Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
Short nurseFlag = 9;
BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);

if(data == null) {
visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
nurseUtilityClass);
}

// 07-06-2018 visit code
Long benVisitID = null;
Expand Down
13 changes: 11 additions & 2 deletions src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import com.iemr.tm.data.anc.WrapperFemaleObstetricHistory;
import com.iemr.tm.data.anc.WrapperImmunizationHistory;
import com.iemr.tm.data.anc.WrapperMedicationHistory;
import com.iemr.tm.data.benFlowStatus.BeneficiaryFlowStatus;
import com.iemr.tm.data.nurse.BenAnthropometryDetail;
import com.iemr.tm.data.nurse.BenPhysicalVitalDetail;
import com.iemr.tm.data.nurse.BeneficiaryVisitDetail;
Expand All @@ -67,6 +68,7 @@
import com.iemr.tm.data.quickConsultation.PrescribedDrugDetail;
import com.iemr.tm.data.quickConsultation.PrescriptionDetail;
import com.iemr.tm.data.tele_consultation.TeleconsultationRequestOBJ;
import com.iemr.tm.repo.benFlowStatus.BeneficiaryFlowStatusRepo;
import com.iemr.tm.repo.nurse.BenVisitDetailRepo;
import com.iemr.tm.repo.nurse.anc.BenAdherenceRepo;
import com.iemr.tm.repo.quickConsultation.BenChiefComplaintRepo;
Expand Down Expand Up @@ -132,18 +134,25 @@ public void setPncNurseServiceImpl(PNCNurseServiceImpl pncNurseServiceImpl) {

@Autowired
private SMSGatewayServiceImpl sMSGatewayServiceImpl;
@Autowired
private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo;

@Override
public String savePNCNurseData(JsonObject requestOBJ, String Authorization) throws Exception {
Long saveSuccessFlag = null;
TeleconsultationRequestOBJ tcRequestOBJ = null;
Long benVisitCode = null;
Map<String, Long> visitIdAndCodeMap = null;
// check if visit details data is not null
if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) {
CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class);

Map<String, Long> visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
Short nurseFlag = 9;
BeneficiaryFlowStatus data = beneficiaryFlowStatusRepo.checkExistData(nurseUtilityClass.getBenFlowID(), nurseFlag);

if(data == null) {
visitIdAndCodeMap = saveBenVisitDetails(requestOBJ.getAsJsonObject("visitDetails"),
nurseUtilityClass);
}

Long benVisitID = null;

Expand Down
Loading
Loading