diff --git a/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java b/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java
index 3d0248fc..8ebb3bb5 100644
--- a/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java
+++ b/src/main/java/com/iemr/tm/service/common/transaction/CommonNurseServiceImpl.java
@@ -2906,7 +2906,8 @@ else if (durationUnit.equalsIgnoreCase("Month(s)"))
 	private double getQtyForOneDay(String form, String dose, String frequency) {
 		double qtyInOneDay = 0;
 		if (form != null && dose != null && frequency != null) {
-			if (frequency.equalsIgnoreCase("Once Daily(OD)")) {
+			if (frequency.equalsIgnoreCase("Once Daily(OD)") || frequency.equalsIgnoreCase("Once Daily(OD) Before Food")||
+					frequency.equalsIgnoreCase("Once Daily(OD) After Food")|| frequency.equalsIgnoreCase("Once Daily(OD) At Bedtime")) {
 				if (form.equalsIgnoreCase("Tablet")) {
 					if (dose.equalsIgnoreCase("Half Tab")) {
 						qtyInOneDay = .5;
@@ -2930,7 +2931,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
 					}
 				}
 			} else {
-				if (frequency.equalsIgnoreCase("Twice Daily(BD)")) {
+				if (frequency.equalsIgnoreCase("Twice Daily(BD)") || frequency.equalsIgnoreCase("Twice Daily(BD) Before Food")||
+						frequency.equalsIgnoreCase("Twice Daily(BD) After Food")) {
 					if (form.equalsIgnoreCase("Tablet")) {
 						if (dose.equalsIgnoreCase("Half Tab")) {
 							qtyInOneDay = 1;
@@ -2954,7 +2956,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
 						}
 					}
 				} else {
-					if (frequency.equalsIgnoreCase("Thrice Daily (TID)")) {
+					if (frequency.equalsIgnoreCase("Thrice Daily (TID)") || frequency.equalsIgnoreCase("Thrice Daily (TID) After Food")||
+							frequency.equalsIgnoreCase("Thrice Daily (TID) Before Food")) {
 						if (form.equalsIgnoreCase("Tablet")) {
 							if (dose.equalsIgnoreCase("Half Tab")) {
 								qtyInOneDay = 1.5;
@@ -2978,7 +2981,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
 							}
 						}
 					} else {
-						if (frequency.equalsIgnoreCase("Four Times in a Day (QID)")) {
+						if (frequency.equalsIgnoreCase("Four Times in a Day (QID)") || frequency.equalsIgnoreCase("Four Times in a Day AF")||
+								frequency.equalsIgnoreCase("Four Times in a Day BF")) {
 							if (form.equalsIgnoreCase("Tablet")) {
 								if (dose.equalsIgnoreCase("Half Tab")) {
 									qtyInOneDay = 2;
@@ -3002,7 +3006,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
 								}
 							}
 						} else {
-							if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")) {
+							if (frequency.equalsIgnoreCase("Single Dose") || frequency.equalsIgnoreCase("Stat Dose")|| 
+									frequency.equalsIgnoreCase("Single Dose Before  Food") || frequency.equalsIgnoreCase("Single Dose After Food")) {
 								if (form.equalsIgnoreCase("Tablet")) {
 									if (dose.equalsIgnoreCase("Half Tab")) {
 										qtyInOneDay = .5;
@@ -3026,7 +3031,8 @@ private double getQtyForOneDay(String form, String dose, String frequency) {
 									}
 								}
 							} else {
-								if (frequency.equalsIgnoreCase("Once in a Week")) {
+								if (frequency.equalsIgnoreCase("Once in a Week") || frequency.equalsIgnoreCase("Once in a Week After Food")
+										|| frequency.equalsIgnoreCase("Once in a Week Before Food")) {
 									if (form.equalsIgnoreCase("Tablet")) {
 										if (dose.equalsIgnoreCase("Half Tab")) {
 											qtyInOneDay = .07142;