Merge pull request openimis#135 from openimis/feature/OTC-523

OTC-523: added item/service price valuated, fixed logic for displaying approved price/quantity

Author: delcroip

sql/stored_procedures/uspSSRSGetClaimOverview.sql

@@ -60,12 +60,14 @@ CREATE PROCEDURE [dbo].[uspSSRSGetClaimOverview]
 		CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved ,CS.QtyProvided)   THEN ISNULL(CS.QtyApproved,0) ELSE NULL END AdjQtyService,
 		C.Explanation,
 		-- ALL claims
-		 CASE WHEN @Scope = 2 THEN CS.QtyApproved ELSE NULL END ServiceQtyApproved, 
-		 CASE WHEN @Scope = 2 THEN CI.QtyApproved ELSE NULL END ItemQtyApproved,
+		 CASE WHEN @Scope = 2 THEN (CASE WHEN cs.RejectionReason = 0 THEN ISNULL(cs.QtyApproved, cs.QtyProvided) ELSE 0 END) ELSE 0 END ServiceQtyApproved, 
+		 CASE WHEN @Scope = 2 THEN (CASE WHEN cs.RejectionReason = 0 THEN ISNULL(ci.QtyApproved, ci.QtyProvided) ELSE 0 END) ELSE 0 END ItemQtyApproved,
 		 CASE WHEN @Scope = 2 THEN cs.PriceAsked ELSE NULL END ServicePrice, 
 		 CASE WHEN @Scope = 2 THEN CI.PriceAsked ELSE NULL END ItemPrice,
-		 CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceApproved,0) ELSE NULL END ServicePriceApproved,
-		 CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceApproved,0) ELSE NULL END ItemPriceApproved, 
+		 CASE WHEN @Scope = 2 THEN (CASE WHEN cs.RejectionReason = 0 THEN ISNULL(cs.PriceApproved, cs.PriceAsked) ELSE NULL END) ELSE NULL END ServicePriceApproved,
+		 CASE WHEN @Scope = 2 THEN (CASE WHEN ci.RejectionReason = 0 THEN ISNULL(ci.PriceApproved, ci.PriceAsked) ELSE NULL END) ELSE NULL END ItemPriceApproved,
+		 CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceValuated, cs.PriceAdjusted) ELSE NULL END ServicePriceValuated,
+		 CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceValuated, ci.PriceAdjusted) ELSE NULL END ItemPriceValuated, 
 		 CASE WHEN @Scope = 2 THEN ISNULL(cs.Justification,NULL) ELSE NULL END ServiceJustification,
 		 CASE WHEN @Scope = 2 THEN ISNULL(CI.Justification,NULL) ELSE NULL END ItemJustification,
 		 CASE WHEN @Scope = 2 THEN cs.ClaimServiceID ELSE NULL END ClaimServiceID,