Changes for VisitSummary

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

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

@@ -2048,6 +2048,8 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
             rs       = pstmt.executeQuery();
            
             int listedCount=0;
+
+            HashMap<String, String> visitSummaryMap = new HashMap<String, String>();
 			while(rs.next())
 			{
 				JSONObject visitSummerObj=new JSONObject();
@@ -2056,21 +2058,44 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
 				
 				int count1=Integer.parseInt(rs.getString("COUNT"));
 				System.out.println("count in countOfListedUnlisted 1 "+count1);
-				if(shDescr.equalsIgnoreCase("DOCTOR")) {
-					visitSummerObj.put("OPTION_NAME", "Doctor");
-					visitSummerObj.put("OPTION_VALUE", count1);
-				}
-				if(shDescr.equalsIgnoreCase("CHEMIST")) {
-					visitSummerObj.put("OPTION_NAME", "Retailer");
-					visitSummerObj.put("OPTION_VALUE", count1);
-				}
-				if(shDescr.equalsIgnoreCase("STOCKIST")) {
-					visitSummerObj.put("OPTION_NAME", "Distributer");
-					visitSummerObj.put("OPTION_VALUE", count1);
-				}
+//				if(shDescr.equalsIgnoreCase("DOCTOR")) {
+//					visitSummerObj.put("OPTION_NAME", "Doctor");
+//					visitSummerObj.put("OPTION_VALUE", count1);
+//				}
+//				if(shDescr.equalsIgnoreCase("CHEMIST")) {
+//					visitSummerObj.put("OPTION_NAME", "Retailer");
+//					visitSummerObj.put("OPTION_VALUE", count1);
+//				}
+//				if(shDescr.equalsIgnoreCase("STOCKIST")) {
+//					visitSummerObj.put("OPTION_NAME", "Distributer");
+//					visitSummerObj.put("OPTION_VALUE", count1);
+//				}
+				visitSummaryMap.put(shDescr, ""+count1);
 				listedCount=listedCount+count1;
-				visitSummeryArray.add(visitSummerObj);
+//				visitSummeryArray.add(visitSummerObj);
 			}
+			
+			String drCount = visitSummaryMap.get("DOCTOR");
+			drCount = drCount != null ? drCount : "0";
+			JSONObject visitSummerObj=new JSONObject();
+            visitSummerObj.put("OPTION_NAME", "Doctor");
+			visitSummerObj.put("OPTION_VALUE", drCount);
+			visitSummeryArray.add(visitSummerObj);
+			
+			String stkCount = visitSummaryMap.get("STOCKIST");
+			stkCount = stkCount != null ? stkCount : "0";
+			visitSummerObj=new JSONObject();
+            visitSummerObj.put("OPTION_NAME", "Distributer");
+			visitSummerObj.put("OPTION_VALUE", stkCount);
+			visitSummeryArray.add(visitSummerObj);
+			
+			String chmCount = visitSummaryMap.get("CHEMIST");
+			chmCount = chmCount != null ? chmCount : "0";
+			visitSummerObj=new JSONObject();
+            visitSummerObj.put("OPTION_NAME", "Retailer");
+			visitSummerObj.put("OPTION_VALUE", chmCount);
+			visitSummeryArray.add(visitSummerObj);
+			
 			System.out.println("visitSummeryArray in countOfListedUnlisted 1 "+visitSummeryArray);
 			System.out.println("listed in countOfListedUnlisted "+listedCount);
 			JSONObject todaysSummyObjList=new JSONObject();
@@ -2108,7 +2133,7 @@ public JSONObject getTodaysCallsSummary(String dataSourceName,String loginCode,S
             
 			while(rs.next())
 			{
-				JSONObject visitSummerObj=new JSONObject();
+				visitSummerObj=new JSONObject();
 				unlisted=Integer.parseInt(rs.getString("COUNT"));
                 visitSummerObj.put("OPTION_NAME", "Unlisted");
 				visitSummerObj.put("OPTION_VALUE", unlisted);