prescription related condition changes

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182295 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/sfa/ejb/PlanVsActual.java

@@ -905,7 +905,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 					"STRG_MEET SM  ON SM.STRG_CODE=SPC.SC_CODE " +
 					"AND SM.EVENT_DATE=SPH.PLAN_DATE   " +
 					"WHERE PLAN_DATE='"+currentDate+"' AND " +
-					"SPH.SPRS_CODE__PLAN="+salePersons+"  AND SPH.CONFIRM='Y'";
+					"SPH.SPRS_CODE__PLAN="+salePersons+"  AND SPH.CONFIRM='Y' "+
+					"AND SM.EVENT_TYPE NOT IN (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR')";
 
 						
 			pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
@@ -990,7 +991,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 					"SPH.PLAN_DATE=SM.EVENT_DATE WHERE SM.EVENT_DATE='"+currentDate+"' " +
 					"AND SM.SALES_PERS="+salePersons+" AND NOT EXISTS (SELECT SPC.SC_CODE " +
 					"FROM SPRS_PLAN_CUST SPC WHERE SPC.SC_CODE=SM.STRG_CODE AND " +
-					"SPC.PLAN_ID = SPH.PLAN_ID)";
+					"SPC.PLAN_ID = SPH.PLAN_ID) "+
+					"AND SM.EVENT_TYPE NOT IN (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR')";
 				  		
 			
 			pstmt     = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
@@ -1051,7 +1053,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 					"AND SM.SALES_PERS=SS.SALES_PERS INNER JOIN SALES_PERS SP ON " +
 					"SP.SALES_PERS=SS.SALES_PERS INNER JOIN STRG_CUSTOMER SC " +
 					"ON SC.SC_CODE=SM.STRG_CODE  WHERE SM.SALES_PERS = "+salePersons+" " +
-					"AND SM.EVENT_DATE = '"+currentDate+"' AND SS.STATUS='Y'";	
+					"AND SM.EVENT_DATE = '"+currentDate+"' AND SS.STATUS='Y' "+
+					"AND SM.EVENT_TYPE NOT IN (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR')";	
 				
 			pstmt    = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
             rs       = pstmt.executeQuery();
@@ -1110,7 +1113,8 @@ public class PlanVsActual extends ValidatorEJB implements PlanVsActualLocal,Plan
 					"ON SC.SC_CODE = SM.STRG_CODE INNER JOIN SALES_PERS SP ON " +
 					"SP.SALES_PERS=SM.SALES_PERS WHERE SM.SALES_PERS="+salePersons+" " +
 					"AND SM.EVENT_DATE='"+currentDate+"' AND NOT EXISTS " +
-					"(SELECT STRG_CODE FROM STRG_MEET SM WHERE SC.SC_CODE = SM.STRG_CODE)";	
+					"(SELECT STRG_CODE FROM STRG_MEET SM WHERE SC.SC_CODE = SM.STRG_CODE) "+
+					"AND SM.EVENT_TYPE NOT IN (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR')";	
 						
 			pstmt    = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
             rs       = pstmt.executeQuery();
@@ -1302,7 +1306,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 				"STRG_MEET SM  ON SM.STRG_CODE=SPC.SC_CODE " +
 				"AND SM.EVENT_DATE=SPH.PLAN_DATE   " +
 				"WHERE PLAN_DATE='"+currentDate+"' AND " +
-				"SPH.SPRS_CODE__PLAN="+salePersons+"  AND SPH.CONFIRM='Y'";
+				"SPH.SPRS_CODE__PLAN="+salePersons+"  AND SPH.CONFIRM='Y' "+
+				"AND SM.EVENT_TYPE NOT IN (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR')";
 
 					
 		pstmt = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);
@@ -1327,7 +1332,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 				"SPH.PLAN_DATE=SM.EVENT_DATE WHERE SM.EVENT_DATE='"+currentDate+"' " +
 				"AND SM.SALES_PERS="+salePersons+" AND NOT EXISTS (SELECT SPC.SC_CODE " +
 				"FROM SPRS_PLAN_CUST SPC WHERE SPC.SC_CODE=SM.STRG_CODE AND " +
-				"SPC.PLAN_ID = SPH.PLAN_ID)";
+				"SPC.PLAN_ID = SPH.PLAN_ID) "+
+				"AND SM.EVENT_TYPE NOT IN (SELECT ACTIVITY_CODE FROM FIELDACTIVITY WHERE ACTIVITY_TYPE = 'PR')";
 			  		
 		
 		pstmt     = conn.prepareStatement(sql,ResultSet.TYPE_SCROLL_SENSITIVE,ResultSet.CONCUR_READ_ONLY);