Skip to content

Sn/3.6.0 #112

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 8, 2025
Merged

Sn/3.6.0 #112

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61f7738
fix: Added proper space in the string
snehar-nd Dec 5, 2025
cb2b837
fix: Added proper space in the string
snehar-nd Dec 5, 2025
872730c
fix: Added condition for the single dose after and before food
snehar-nd Dec 5, 2025
902b0a8
fix: reverting the code which I made for single dose after and before
snehar-nd Dec 5, 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
20 changes: 12 additions & 8 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 @@ -2883,17 +2883,21 @@
private int calculateQtyPrescribed(String form, String dose, String frequency, String duration,
String durationUnit) {
int qtyPrescribed = 0;

logger.info("Frequecy", frequency);

Check warning on line 2886 in src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

String contains no format specifiers. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-API&issues=AZr-KLVzXm1SJ0fKBx3l&open=AZr-KLVzXm1SJ0fKBx3l&pullRequest=112
if (form != null && dose != null && frequency != null && duration != null && durationUnit != null) {
double qtyInOneDay = getQtyForOneDay(form, dose, frequency);

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 (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")) {
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);
}

}

return qtyPrescribed;
Expand Down
Loading