Skip to content

Commit 1659cc6

Browse files
authored
Merge pull request openimis#134 from openimis/feature/otc-492
OTC-492: Fixed claim overview procedure on a regional level.
2 parents f7c2171 + 7681789 commit 1659cc6

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

sql/stored_procedures/uspSSRSGetClaimOverview.sql

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
USE [IMIS]
2+
GO
3+
/****** Object: StoredProcedure [dbo].[uspSSRSGetClaimOverview] Script Date: 30.05.2022 12:44:26 ******/
4+
SET ANSI_NULLS ON
5+
GO
6+
SET QUOTED_IDENTIFIER ON
7+
GO
18

29
IF OBJECT_ID('uspSSRSGetClaimOverview', 'P') IS NOT NULL
310
DROP PROCEDURE uspSSRSGetClaimOverview
@@ -41,6 +48,8 @@ CREATE PROCEDURE [dbo].[uspSSRSGetClaimOverview]
4148
WHERE C.ValidityTo IS NULL
4249
AND CS.ValidityTo IS NULL
4350
GROUP BY C.ClaimID
51+
), ClaimLocationChildren AS(
52+
select LocationId from tblLocations L where L.ParentLocationId = @LocationId AND ValidityTo is null
4453
)
4554

4655
SELECT C.DateClaimed, C.ClaimID, I.ItemId, S.ServiceID, HF.HFCode, HF.HFName, C.ClaimCode, C.DateClaimed, CA.LastName + ' ' + CA.OtherNames ClaimAdminName,
@@ -100,7 +109,7 @@ CREATE PROCEDURE [dbo].[uspSSRSGetClaimOverview]
100109
AND CA.ValidityTo IS NULL
101110
AND ISNULL(C.DateTo,C.DateFrom) BETWEEN @StartDate AND @EndDate
102111
AND (C.ClaimStatus = @ClaimStatus OR @ClaimStatus IS NULL)
103-
AND (L.LocationId = @LocationId OR L.ParentLocationId = @LocationId OR @LocationId = 0)
112+
AND (L.LocationId = @LocationId OR L.ParentLocationId = @LocationId OR @LocationId = 0 OR L.ParentLocationId in (SELECT LocationId from ClaimLocationChildren))
104113
AND (HF.HFID = @HFID OR @HFID = 0)
105114
AND (CI.ProdID = @ProdId OR CS.ProdID = @ProdId
106115
OR COALESCE(CS.ProdID, CI.ProdId) IS NULL OR @ProdId = 0)

0 commit comments

Comments
 (0)