Finish feature/OTC-10

OTC-10: Procedures used for batch reports don't include claims with RunID != null

Author: dragos-dobre

Empty databases/openIMIS_ONLINE.sql

@@ -20435,7 +20435,7 @@ CREATE PROCEDURE [dbo].[uspSSRSProcessBatch]
 		WHERE C.ValidityTo IS NULL
 		AND (Prod.LocationId = @LocationId OR @LocationId = 0 OR Prod.LocationId IS NULL)
 		AND(Prod.ProdId = @ProdId OR @ProdId = 0)
-		AND (C.RunId = @RunId OR @RunId = 0)
+		AND (C.RunId IS NULL)
 		AND (HF.HFId = @HFID OR @HFId = 0)
 		AND (HF.HFLevel = @HFLevel OR @HFLevel = N'')
 		AND (C.DateTo BETWEEN @DateFrom AND @DateTo)
@@ -20489,9 +20489,19 @@ CREATE PROCEDURE [dbo].[uspSSRSProcessBatchWithClaim]
 		    GROUP BY CS.CLaimId, CS.ProdId
 	    )
 	    SELECT C.ClaimCode, C.DateClaimed, CA.OtherNames OtherNamesAdmin, CA.LastName LastNameAdmin, C.DateFrom, C.DateTo, I.CHFID, I.OtherNames,
+	I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
 	    I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
-	    C.Claimed PriceAsked, SUM(CDetails.PriceApproved)PriceApproved, SUM(CDetails.PriceAdjusted)PriceAdjusted, SUM(CDetails.RemuneratedAmount)RemuneratedAmount,
-	    D.DistrictID, D.DistrictName, R.RegionId, R.RegionName
+	I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	    I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	    I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	    I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	    I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	I.LastName, C.HFID, HF.HFCode, HF.HFName, HF.AccCode, Prod.ProdID, Prod.ProductCode, Prod.ProductName, 
+	C.Claimed PriceAsked, SUM(CDetails.PriceApproved)PriceApproved, SUM(CDetails.PriceAdjusted)PriceAdjusted, SUM(CDetails.RemuneratedAmount)RemuneratedAmount,
+	D.DistrictID, D.DistrictName, R.RegionId, R.RegionName
 
 	    FROM tblClaim C
 	    LEFT OUTER JOIN tblClaimAdmin CA ON CA.ClaimAdminId = C.ClaimAdminId
@@ -20508,7 +20518,7 @@ CREATE PROCEDURE [dbo].[uspSSRSProcessBatchWithClaim]
 	    WHERE C.ValidityTo IS NULL
 	    AND (Prod.LocationId = @LocationId OR @LocationId = 0 OR Prod.LocationId IS NULL)
 	    AND(Prod.ProdId = @ProdId OR @ProdId = 0)
-	    AND (C.RunId = @RunId OR @RunId = 0)
+	    AND (C.RunId IS NULL)
 	    AND (HF.HFId = @HFID OR @HFId = 0)
 	    AND (HF.HFLevel = @HFLevel OR @HFLevel = N'')
 	    AND (C.DateTo BETWEEN @DateFrom AND @DateTo)

Migration script/openIMIS migration latest.sql

@@ -2555,7 +2555,7 @@ CREATE PROCEDURE [dbo].[uspSSRSProcessBatch]
 	WHERE C.ValidityTo IS NULL
 	AND (Prod.LocationId = @LocationId OR @LocationId = 0 OR Prod.LocationId IS NULL)
 	AND(Prod.ProdId = @ProdId OR @ProdId = 0)
-	AND (C.RunId = @RunId OR @RunId = 0)
+	AND (C.RunId IS NULL)
 	AND (HF.HFId = @HFID OR @HFId = 0)
 	AND (HF.HFLevel = @HFLevel OR @HFLevel = N'')
 	AND (C.DateTo BETWEEN @DateFrom AND @DateTo)
@@ -4024,7 +4024,7 @@ CREATE PROCEDURE [dbo].[uspSSRSProcessBatchWithClaim]
 	WHERE C.ValidityTo IS NULL
 	AND (Prod.LocationId = @LocationId OR @LocationId = 0 OR Prod.LocationId IS NULL)
 	AND(Prod.ProdId = @ProdId OR @ProdId = 0)
-	AND (C.RunId = @RunId OR @RunId = 0)
+	AND (C.RunId IS NULL)
 	AND (HF.HFId = @HFID OR @HFId = 0)
 	AND (HF.HFLevel = @HFLevel OR @HFLevel = N'')
 	AND (C.DateTo BETWEEN @DateFrom AND @DateTo)