Skip to content

fix: amm-1963 frequncy is not calculating for single dose frequency #111

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
snehar-nd merged 4 commits into from
Dec 5, 2025
Merged

fix: amm-1963 frequncy is not calculating for single dose frequency #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
340c831
fix: amm-1963 frequncy is not calculating for single dose frequency
snehar-nd Dec 3, 2025
7994ac8
fix: amm-1963 remoed the comments
snehar-nd Dec 4, 2025
fb27280
fix: sonarqubecloud fixs
snehar-nd Dec 4, 2025
114cee6
fix: added const variable to doctorsignature object to remove duplicate
snehar-nd Dec 4, 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
6 changes: 3 additions & 3 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 @@ -348,11 +348,11 @@
Long diagnosisSuccessFlag = null;
Integer prescriptionSuccessFlag = null;
Long referSaveSuccessFlag = null;
Integer tcRequestStatusFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");

Check failure on line 351 in src/main/java/com/iemr/tm/service/anc/ANCServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "doctorSignatureFlag" 4 times. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZroI0IVDnQ4yCTH-UDR&open=AZroI0IVDnQ4yCTH-UDR&pullRequest=101

Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}

if (requestOBJ != null) {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.Calendar;

import org.checkerframework.checker.units.qual.s;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -280,7 +279,7 @@

public int updateBenFlowAfterDocDataUpdate(Long benFlowID, Long benRegID, Long benID, Long benVisitID,
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag, int tcUserID,
Timestamp tcDate,short labTechnicianFlag, Boolean signatureFlag) throws Exception {

Check warning on line 282 in src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace generic exceptions with specific library exceptions or a custom exception. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZpNrVCiNzm4HmOsrrHj&open=AZpNrVCiNzm4HmOsrrHj&pullRequest=101
int i = 0;
try {
Short pharmaF = beneficiaryFlowStatusRepo.getPharmaFlag(benFlowID);
Expand All @@ -302,7 +301,7 @@

public int updateBenFlowAfterDocDataUpdateTCSpecialist(Long benFlowID, Long benRegID, Long benID, Long benVisitID,
short docFlag, short pharmaFlag, short oncologistFlag, short tcSpecialistFlag, int tcUserID,
Timestamp tcDate, short labTechnicianFlag, Boolean signatureFlag) throws Exception {

Check warning on line 304 in src/main/java/com/iemr/tm/service/benFlowStatus/CommonBenStatusFlowServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace generic exceptions with specific library exceptions or a custom exception. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZpNrVCiNzm4HmOsrrHk&open=AZpNrVCiNzm4HmOsrrHk&pullRequest=101
int i = 0;
try {
Short pharmaF = beneficiaryFlowStatusRepo.getPharmaFlag(benFlowID);
Expand Down
6 changes: 4 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 @@ -810,10 +810,12 @@ public String getBenDataFrmNurseToDocExaminationScreen(Long benRegID, Long visit
public Long saveCancerScreeningDoctorData(JsonObject requestOBJ, String Authorization) throws Exception {
Long docDataSuccessFlag = null;
Long tcRequestStatusFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");


Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}


Expand Down
18 changes: 7 additions & 11 deletions src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2887,17 +2887,13 @@ private int calculateQtyPrescribed(String form, String dose, String frequency, S
if (form != null && dose != null && frequency != null && duration != null && durationUnit != null) {
double qtyInOneDay = getQtyForOneDay(form, dose, frequency);

if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")||
frequency.equalsIgnoreCase("Single Dose Before Food") || frequency.equalsIgnoreCase("Single Dose After Food")) {
qtyPrescribed = (int) Math.ceil(qtyInOneDay);
} else {
if (durationUnit.equalsIgnoreCase("Day(s)"))
qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * qtyInOneDay);
else if (durationUnit.equalsIgnoreCase("Week(s)"))
qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 7 * qtyInOneDay);
else if (durationUnit.equalsIgnoreCase("Month(s)"))
qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 30 * qtyInOneDay);
}
if (durationUnit.equalsIgnoreCase("Day(s)"))
qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * qtyInOneDay);
else if (durationUnit.equalsIgnoreCase("Week(s)"))
qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 7 * qtyInOneDay);
else if (durationUnit.equalsIgnoreCase("Month(s)"))
qtyPrescribed = (int) Math.ceil(Integer.parseInt(duration) * 30 * qtyInOneDay);

}

return qtyPrescribed;
Expand Down
8 changes: 5 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 @@ -967,7 +967,9 @@
Integer prescriptionSuccessFlag = null;
// Long diagnosisSuccessFlag = null;
Long referSaveSuccessFlag = null;
Integer tcRequestStatusFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");

Check failure on line 970 in src/main/java/com/iemr/tm/service/covid19/Covid19ServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "doctorSignatureFlag" 4 times. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZroI0FTDnQ4yCTH-UDP&open=AZroI0FTDnQ4yCTH-UDP&pullRequest=101



if (requestOBJ != null) {
TeleconsultationRequestOBJ tcRequestOBJ = null;
Expand All @@ -982,8 +984,8 @@
Boolean isMedicinePrescribed = false;

Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}

// checking if test is prescribed
Expand Down
6 changes: 4 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 @@ -738,6 +738,8 @@
Integer findingSuccessFlag = null;
Integer prescriptionSuccessFlag = null;
Long referSaveSuccessFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");

Check failure on line 741 in src/main/java/com/iemr/tm/service/generalOPD/GeneralOPDServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "doctorSignatureFlag" 4 times. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZroI0BvDnQ4yCTH-UDN&open=AZroI0BvDnQ4yCTH-UDN&pullRequest=101


//Integer tcRequestStatusFlag = null;

Expand All @@ -755,8 +757,8 @@
Boolean isMedicinePrescribed = false;

Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}

// checking if test is prescribed
Expand Down
9 changes: 6 additions & 3 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 @@ -756,7 +756,7 @@
Integer prescriptionSuccessFlag = null;
Long diagnosisSuccessFlag = null;
Long referSaveSuccessFlag = null;
Integer tcRequestStatusFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");

Check failure on line 759 in src/main/java/com/iemr/tm/service/ncdCare/NCDCareServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "doctorSignatureFlag" 4 times. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZroI0HADnQ4yCTH-UDQ&open=AZroI0HADnQ4yCTH-UDQ&pullRequest=101

if (requestOBJ != null) {
TeleconsultationRequestOBJ tcRequestOBJ = null;
Expand All @@ -772,8 +772,11 @@
Boolean isMedicinePrescribed = false;

Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();



if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}

// checking if test is prescribed
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/iemr/tm/service/ncdscreening/NCDSCreeningDoctorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ public int updateDoctorData(JsonObject requestOBJ, String Authorization) throws
Integer findingSuccessFlag = null;
Integer prescriptionSuccessFlag = null;
Long referSaveSuccessFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");


if (requestOBJ != null) {
TeleconsultationRequestOBJ tcRequestOBJ = null;
Expand All @@ -95,8 +97,8 @@ public int updateDoctorData(JsonObject requestOBJ, String Authorization) throws
Boolean isMedicinePrescribed = false;

Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}

// checking if test is prescribed
Expand Down
7 changes: 4 additions & 3 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 @@ -1008,7 +1008,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E
Integer findingSuccessFlag = null;
Integer prescriptionSuccessFlag = null;
Long referSaveSuccessFlag = null;
Integer tcRequestStatusFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");


if (requestOBJ != null) {
TeleconsultationRequestOBJ tcRequestOBJ = null;
Expand All @@ -1024,8 +1025,8 @@ public Long saveDoctorData(JsonObject requestOBJ, String Authorization) throws E
Boolean isMedicinePrescribed = false;

Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}

// checking if test is prescribed
Expand Down
4 changes: 2 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 @@ -300,7 +300,7 @@
Long diagnosisSuccessFlag = null;
Integer prescriptionSuccessFlag = null;
Long referSaveSuccessFlag = null;
// Integer tcRequestStatusFlag = null;
boolean doctorSignature = requestOBJ.has("doctorSignatureFlag");

Check failure on line 303 in src/main/java/com/iemr/tm/service/pnc/PNCServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "doctorSignatureFlag" 5 times. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZroVVGM2d10ZlpuzDGE&open=AZroVVGM2d10ZlpuzDGE&pullRequest=101

if (requestOBJ != null) {
TeleconsultationRequestOBJ tcRequestOBJ = null;
Expand All @@ -316,7 +316,7 @@
Boolean isMedicinePrescribed = false;

Boolean doctorSignatureFlag = false;
if (requestOBJ.has("doctorSignatureFlag") && !requestOBJ.get("doctorSignatureFlag").isJsonNull()) {
if (doctorSignature) {
doctorSignatureFlag = requestOBJ.get("doctorSignatureFlag").getAsBoolean();
}

Expand Down
6 changes: 4 additions & 2 deletions src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@
Integer investigationSuccessFlag = null;
Integer vitalsRBSTestFlag=null;
Long referSaveSuccessFlag = null;
boolean doctorSignature = quickConsultDoctorOBJ.has("doctorSignatureFlag");

Check failure on line 319 in src/main/java/com/iemr/tm/service/quickConsultation/QuickConsultationServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "doctorSignatureFlag" 4 times. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZroIz-xDnQ4yCTH-UDM&open=AZroIz-xDnQ4yCTH-UDM&pullRequest=101


TeleconsultationRequestOBJ tcRequestOBJ = null;
CommonUtilityClass commonUtilityClass = InputMapper.gson().fromJson(quickConsultDoctorOBJ,
Expand All @@ -340,8 +342,8 @@
isMedicinePrescribed = true;

Boolean doctorSignatureFlag = false;
if (quickConsultDoctorOBJ.has("doctorSignatureFlag") && !quickConsultDoctorOBJ.get("doctorSignatureFlag").isJsonNull()) {
doctorSignatureFlag = quickConsultDoctorOBJ.get("doctorSignatureFlag").getAsBoolean();
if (doctorSignature) {
doctorSignatureFlag = doctorSignature;
}

// save prescribed medicine
Expand Down
Loading