Skip to content

Commit 170aa0d

Browse files
dragos-dobredragos-dobre
authored
Finish release/1.7.1
Release 1.7.1
2 parents 4a6c399 + 810c103 commit 170aa0d

File tree

7 files changed

+145
-35
lines changed

7 files changed

+145
-35
lines changed

‎.github/workflows/openmis-module-test.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,18 @@ jobs:
3838
- name: install linux packages
3939
run: |
4040
mkdir ./oldMain
41-
wget https://raw.githubusercontent.com/openimis/database_ms_sqlserver/main/Empty%20databases/openIMIS_ONLINE.sql -O oldMain/openIMIS_ONLINE.sql
42-
wget https://raw.githubusercontent.com/openimis/database_ms_sqlserver/main/Demo%20database/openIMIS_demo_ONLINE.sql -O oldMain/openIMIS_demo_ONLINE.sql
41+
git clone --depth 1 --branch main https://github.com/openimis/database_ms_sqlserver ./oldMain
42+
cd oldMain
43+
bash concatenate_files.sh
44+
cd ..
4345
mkdir ./1.42
4446
wget https://raw.githubusercontent.com/openimis/database_ms_sqlserver/v1.4.2/Empty%20databases/openIMIS_ONLINE.sql -O 1.42/openIMIS_ONLINE.sql
4547
curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
4648
curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
4749
sudo apt-get update
4850
sudo ACCEPT_EULA=Y apt-get install -y mssql-tools build-essential dialog apt-utils unixodbc-dev jq -y
4951
python -m pip install --upgrade pip
50-
- name: DB migration 1.42
52+
- name: DB migration 1.4.2
5153
run: |
5254
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'DROP DATABASE IF EXISTS imis_1_4_2'
5355
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'CREATE DATABASE imis_1_4_2'
@@ -70,8 +72,7 @@ jobs:
7072
run: |
7173
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'DROP DATABASE IF EXISTS imis_main'
7274
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'CREATE DATABASE imis_main'
73-
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i oldMain/openIMIS_ONLINE.sql | grep . | uniq -c
74-
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i oldMain/openIMIS_demo_ONLINE.sql | grep . | uniq -c
75+
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i "oldMain/output/fullDemoDatabase.sql" | grep . | uniq -cc
7576
/opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis_main -i "new/output/fullMigrationScipt.sql" | grep . | uniq -c
7677
7778

‎sql/base/3_functions.sql

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -316,47 +316,54 @@ CREATE FUNCTION [dbo].[udfGetSnapshotIndicators](
316316
SET @ACtive = (
317317
SELECT COUNT(DISTINCT P.FamilyID) ActivePolicies FROM tblPolicy P
318318
INNER JOIN @tblOfficerSub O ON P.OfficerID = O.NewOfficer
319-
WHERE P.ValidityTo IS NULL AND PolicyStatus = 2
319+
INNER JOIN tblFamilies F on F.FamilyID = P.FamilyID
320+
WHERE P.ValidityTo IS NULL AND PolicyStatus = 2
321+
AND F.ValidityTo IS NULL
320322
AND ExpiryDate >=@Date
321323
)
322324

323325
SET @Expired = (SELECT COUNT(1) ExpiredPolicies
324326
FROM tblPolicy PL
325-
LEFT OUTER JOIN (SELECT PL.PolicyID, F.FamilyID, PR.ProdID
326-
FROM tblPolicy PL
327-
INNER JOIN tblFamilies F ON F.FamilyId = PL.FamilyId
328-
INNER JOIN tblProduct PR ON PR.ProdID= PL.ProdID OR (PL.ProdID = PR.ConversionProdID)
329-
WHERE
330-
PL.ValidityTo IS NULL
331-
AND F.ValidityTo IS NULL
332-
AND PR.ValidityTo IS NULL
333-
AND PL.PolicyStage='R'
334-
AND PL.PolicyStatus = 2
335-
) R ON PL.ProdID=R.ProdID AND PL.FamilyID=R.FamilyID
336-
INNER JOIN @tblOfficerSub O ON PL.OfficerID = O.NewOfficer
327+
LEFT OUTER JOIN (
328+
SELECT PL.PolicyID, F.FamilyID, PR.ProdID
329+
FROM tblPolicy PL
330+
INNER JOIN tblFamilies F ON F.FamilyId = PL.FamilyId
331+
INNER JOIN tblProduct PR ON PR.ProdID= PL.ProdID OR (PL.ProdID = PR.ConversionProdID)
332+
WHERE
333+
PL.ValidityTo IS NULL
334+
AND F.ValidityTo IS NULL
335+
AND PR.ValidityTo IS NULL
336+
AND PL.PolicyStage='R'
337+
AND PL.PolicyStatus = 2
338+
) R ON PL.ProdID=R.ProdID AND PL.FamilyID=R.FamilyID
339+
INNER JOIN @tblOfficerSub O ON PL.OfficerID = O.NewOfficer
337340
WHERE
338-
PL.ValidityTo IS NULL
339-
AND PL.PolicyStatus = 8
340-
AND R.PolicyID IS NULL
341-
AND (PL.ExpiryDate =@Date)
341+
PL.ValidityTo IS NULL
342+
AND PL.PolicyStatus = 8
343+
AND R.PolicyID IS NULL
344+
AND (PL.ExpiryDate =@Date)
342345
)
343346
SET @Idle = (
344347
SELECT COUNT(DISTINCT PL.FamilyID) IddlePolicies FROM tblPolicy PL
345348
INNER JOIN @tblOfficerSub O ON PL.OfficerID = O.NewOfficer
346349
INNER JOIN tblProduct PR ON PR.ProdID = PL.ProdID
350+
INNER JOIN tblFamilies F ON PL.FamilyID = F.FamilyID
347351
LEFT OUTER JOIN (SELECT FamilyID, ProdID FROM tblPolicy WHERE ValidityTo IS NULL AND PolicyStatus =2 AND ExpiryDate >=@Date) ActivePolicies ON ActivePolicies.FamilyID = PL.FamilyID AND (ActivePolicies.ProdID = PL.ProdID OR ActivePolicies.ProdID = PR.ConversionProdID)
348352
WHERE PL.ValidityTo IS NULL AND PL.PolicyStatus = 1
349353
AND ExpiryDate >=@Date
350354
AND ActivePolicies.ProdID IS NULL
355+
AND F.ValidityTo IS NULL
351356
)
352357
SET @Suspended = (
353358
SELECT COUNT(DISTINCT PL.FamilyID) SuspendedPolicies FROM tblPolicy PL
354359
INNER JOIN @tblOfficerSub O ON PL.OfficerID = O.NewOfficer
355360
INNER JOIN tblProduct PR ON PR.ProdID = PL.ProdID
361+
INNER JOIN tblFamilies F ON PL.FamilyID = F.FamilyID
356362
LEFT OUTER JOIN (SELECT FamilyID, ProdID FROM tblPolicy WHERE ValidityTo IS NULL AND PolicyStatus =2 AND ExpiryDate >=@Date) ActivePolicies ON ActivePolicies.FamilyID = PL.FamilyID AND (ActivePolicies.ProdID = PL.ProdID OR ActivePolicies.ProdID = PR.ConversionProdID)
357363
WHERE PL.ValidityTo IS NULL AND PL.PolicyStatus = 4
358364
AND ExpiryDate >=@Date
359365
AND ActivePolicies.ProdID IS NULL
366+
AND F.ValidityTo IS NULL
360367
)
361368
INSERT INTO @tblSnapshotIndicators(ACtive, Expired, Idle, Suspended) VALUES (@ACtive, @Expired, @Idle, @Suspended)
362369
RETURN

‎sql/base/5_base_data.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ INSERT [dbo].[tblControls] ([FieldName], [Adjustibility], [Usage]) VALUES (N'Tot
6464
INSERT [dbo].[tblControls] ([FieldName], [Adjustibility], [Usage]) VALUES (N'TotalDelivieriesLeft', N'O', N'Search Insurance Number/Enquiry')
6565
INSERT [dbo].[tblControls] ([FieldName], [Adjustibility], [Usage]) VALUES (N'TotalSurgeriesLeft', N'O', N'Search Insurance Number/Enquiry')
6666
INSERT [dbo].[tblControls] ([FieldName], [Adjustibility], [Usage]) VALUES (N'TotalVisitsLeft', N'O', N'Search Insurance Number/Enquiry')
67+
INSERT [dbo].[tblControls] ([FieldName], [Adjustibility], [Usage]) VALUES (N'Vulnerability', N'O', N'Insuree, Family')
6768
INSERT [dbo].[tblEducations] ([EducationId], [Education], [SortOrder], [AltLanguage]) VALUES (1, N'Nursery', NULL, N'Garderie')
6869
INSERT [dbo].[tblEducations] ([EducationId], [Education], [SortOrder], [AltLanguage]) VALUES (2, N'Primary school', NULL, N'École primaire')
6970
INSERT [dbo].[tblEducations] ([EducationId], [Education], [SortOrder], [AltLanguage]) VALUES (3, N'Secondary school', NULL, N'École secondaire')

‎sql/demo/1_demo_online.sql

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,14 @@ VALUES (1, N'en', N'Admin', N'Admin', N'', N'Admin', 1023, 0, CURRENT_TIMESTAMP,
8787
CONVERT(varchar(max),HASHBYTES('SHA2_256',CONCAT(@AdminPassword,CONVERT(varchar(max),HASHBYTES('SHA2_256',@AdminPrivateKey),2))),2),
8888
NULL, NULL)
8989

90-
INSERT [tblUsers] ([UserID], [LanguageID], [LastName], [OtherNames], [Phone], [LoginName], [RoleID], [HFID], [ValidityFrom], [ValidityTo], [LegacyID], [AuditUserID], [password], [DummyPwd], [EmailId], [StoredPassword], [PrivateKey], [PasswordValidity], [IsAssociated], [UserUUID]) VALUES (9, N'fr', N'Admin_Fr', N'Admin_Fr', N'', N'Admin_Fr', 1023, 0, CAST(N'2019-03-07T06:31:28.027' AS DateTime), NULL, NULL, 1, NULL, NULL, N'[email protected]',
91-
-- [StoredPassword]
92-
CONVERT(varchar(max),HASHBYTES('SHA2_256',CONCAT(CAST(CONVERT(NVARCHAR(25), 'admin123_fr') COLLATE LATIN1_GENERAL_CS_AS AS VARCHAR(MAX)),CONVERT(varchar(max),HASHBYTES('SHA2_256',CAST(N'PrivateSecretKey' AS VARCHAR(MAX))),2))),2),
93-
-- PrivateKey
94-
CONVERT(varchar(max),HASHBYTES('SHA2_256',CAST(N'PrivateSecretKey' AS VARCHAR(MAX))),2)
95-
, NULL, NULL, NEWID())
96-
90+
INSERT [dbo].[tblUsers] ([UserID], [LanguageID], [LastName], [OtherNames], [Phone], [LoginName], [RoleID], [HFID], [ValidityFrom],
91+
[ValidityTo], [LegacyID], [AuditUserID], [PrivateKey], [StoredPassword], [PasswordValidity], [IsAssociated])
92+
VALUES (9, N'fr', N'Admin_Fr', N'Admin_Fr', N'', N'Admin_Fr', 1023, 0, CURRENT_TIMESTAMP, NULL, NULL, 1,
93+
-- PrivateKey
94+
CONVERT(varchar(max),HASHBYTES('SHA2_256', N'Admin_Fr'),2),
95+
-- [StoredPassword]
96+
CONVERT(varchar(max),HASHBYTES('SHA2_256',CONCAT(N'admin123_fr',CONVERT(varchar(max),HASHBYTES('SHA2_256', N'Admin_Fr'),2))),2),
97+
NULL, NULL)
9798

9899
INSERT [tblUsers] ([UserID], [LanguageID], [LastName], [OtherNames], [Phone], [LoginName], [RoleID], [HFID], [ValidityFrom], [ValidityTo], [LegacyID], [AuditUserID], [password], [DummyPwd], [EmailId], [StoredPassword], [PrivateKey], [PasswordValidity], [IsAssociated], [UserUUID]) VALUES (17, N'en', N'Johilk', N'Kuna', N'', N'JHOS0011', 256, 1, CAST(N'2019-08-16T07:34:38.880' AS DateTime), NULL, NULL, 1, NULL, NULL, N'',
99100
-- [StoredPassword]

‎sql/migrations/1_migration_latest.sql

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9414,3 +9414,92 @@ GO
94149414
IF COL_LENGTH(N'tblEmailSettings', N'SenderDisplayName') IS NULL
94159415
ALTER TABLE tblEmailSettings ADD SenderDisplayName NVARCHAR(255) NULL
94169416
GO
9417+
9418+
9419+
DROP FUNCTION IF EXISTS [dbo].[udfGetSnapshotIndicators];
9420+
GO
9421+
9422+
CREATE FUNCTION [dbo].[udfGetSnapshotIndicators](
9423+
@Date DATE,
9424+
@OfficerId INT
9425+
) RETURNS @tblSnapshotIndicators TABLE(ACtive INT,Expired INT,Idle INT,Suspended INT)
9426+
AS
9427+
BEGIN
9428+
DECLARE @ACtive INT=0
9429+
DECLARE @Expired INT=0
9430+
DECLARE @Idle INT=0
9431+
DECLARE @Suspended INT=0
9432+
DECLARE @LegacyOfficer INT
9433+
DECLARE @tblOfficerSub TABLE(OldOfficer INT, NewOfficer INT)
9434+
9435+
INSERT INTO @tblOfficerSub(OldOfficer, NewOfficer)
9436+
SELECT DISTINCT @OfficerID, @OfficerID
9437+
9438+
SET @LegacyOfficer = (SELECT OfficerID FROM tblOfficer WHERE ValidityTo IS NULL AND OfficerIDSubst = @OfficerID)
9439+
WHILE @LegacyOfficer IS NOT NULL
9440+
BEGIN
9441+
INSERT INTO @tblOfficerSub(OldOfficer, NewOfficer)
9442+
SELECT DISTINCT @OfficerID, @LegacyOfficer
9443+
IF EXISTS(SELECT 1 FROM @tblOfficerSub GROUP BY NewOfficer HAVING COUNT(1) > 1)
9444+
BREAK;
9445+
SET @LegacyOfficer = (SELECT OfficerID FROM tblOfficer WHERE ValidityTo IS NULL AND OfficerIDSubst = @LegacyOfficer)
9446+
END;
9447+
9448+
9449+
SET @ACtive = (
9450+
SELECT COUNT(DISTINCT P.FamilyID) ActivePolicies FROM tblPolicy P
9451+
INNER JOIN @tblOfficerSub O ON P.OfficerID = O.NewOfficer
9452+
INNER JOIN tblFamilies F on F.FamilyID = P.FamilyID
9453+
WHERE P.ValidityTo IS NULL AND PolicyStatus = 2
9454+
AND F.ValidityTo IS NULL
9455+
AND ExpiryDate >=@Date
9456+
)
9457+
9458+
SET @Expired = (SELECT COUNT(1) ExpiredPolicies
9459+
FROM tblPolicy PL
9460+
LEFT OUTER JOIN (
9461+
SELECT PL.PolicyID, F.FamilyID, PR.ProdID
9462+
FROM tblPolicy PL
9463+
INNER JOIN tblFamilies F ON F.FamilyId = PL.FamilyId
9464+
INNER JOIN tblProduct PR ON PR.ProdID= PL.ProdID OR (PL.ProdID = PR.ConversionProdID)
9465+
WHERE
9466+
PL.ValidityTo IS NULL
9467+
AND F.ValidityTo IS NULL
9468+
AND PR.ValidityTo IS NULL
9469+
AND PL.PolicyStage='R'
9470+
AND PL.PolicyStatus = 2
9471+
) R ON PL.ProdID=R.ProdID AND PL.FamilyID=R.FamilyID
9472+
INNER JOIN @tblOfficerSub O ON PL.OfficerID = O.NewOfficer
9473+
WHERE
9474+
PL.ValidityTo IS NULL
9475+
AND PL.PolicyStatus = 8
9476+
AND R.PolicyID IS NULL
9477+
AND (PL.ExpiryDate =@Date)
9478+
)
9479+
SET @Idle = (
9480+
SELECT COUNT(DISTINCT PL.FamilyID) IddlePolicies FROM tblPolicy PL
9481+
INNER JOIN @tblOfficerSub O ON PL.OfficerID = O.NewOfficer
9482+
INNER JOIN tblProduct PR ON PR.ProdID = PL.ProdID
9483+
INNER JOIN tblFamilies F ON PL.FamilyID = F.FamilyID
9484+
LEFT OUTER JOIN (SELECT FamilyID, ProdID FROM tblPolicy WHERE ValidityTo IS NULL AND PolicyStatus =2 AND ExpiryDate >=@Date) ActivePolicies ON ActivePolicies.FamilyID = PL.FamilyID AND (ActivePolicies.ProdID = PL.ProdID OR ActivePolicies.ProdID = PR.ConversionProdID)
9485+
WHERE PL.ValidityTo IS NULL AND PL.PolicyStatus = 1
9486+
AND ExpiryDate >=@Date
9487+
AND ActivePolicies.ProdID IS NULL
9488+
AND F.ValidityTo IS NULL
9489+
)
9490+
SET @Suspended = (
9491+
SELECT COUNT(DISTINCT PL.FamilyID) SuspendedPolicies FROM tblPolicy PL
9492+
INNER JOIN @tblOfficerSub O ON PL.OfficerID = O.NewOfficer
9493+
INNER JOIN tblProduct PR ON PR.ProdID = PL.ProdID
9494+
INNER JOIN tblFamilies F ON PL.FamilyID = F.FamilyID
9495+
LEFT OUTER JOIN (SELECT FamilyID, ProdID FROM tblPolicy WHERE ValidityTo IS NULL AND PolicyStatus =2 AND ExpiryDate >=@Date) ActivePolicies ON ActivePolicies.FamilyID = PL.FamilyID AND (ActivePolicies.ProdID = PL.ProdID OR ActivePolicies.ProdID = PR.ConversionProdID)
9496+
WHERE PL.ValidityTo IS NULL AND PL.PolicyStatus = 4
9497+
AND ExpiryDate >=@Date
9498+
AND ActivePolicies.ProdID IS NULL
9499+
AND F.ValidityTo IS NULL
9500+
)
9501+
INSERT INTO @tblSnapshotIndicators(ACtive, Expired, Idle, Suspended) VALUES (@ACtive, @Expired, @Idle, @Suspended)
9502+
RETURN
9503+
END
9504+
9505+
GO

‎sql/stored_procedures/uspCreateCapitationPaymentReportData.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ BEGIN
7575

7676

7777
set @LastDay = EOMONTH(@startDateMonth, 0)
78-
SELECT @FirstDay = CASE @RP WHEN 'M' THEN @FirstDay
78+
SELECT @FirstDay = CASE @RP WHEN 'M' THEN @startDateMonth
7979
WHEN 'Q' THEN @startDateQuarter
8080
WHEN 'Y' THEN @startDateYear END
8181

‎sql/stored_procedures/uspSSRSGetClaimOverview.sql

Lines changed: 16 additions & 5 deletions
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,
@@ -60,12 +69,14 @@ CREATE PROCEDURE [dbo].[uspSSRSGetClaimOverview]
6069
CASE WHEN @Scope =2 OR CS.QtyProvided <> COALESCE(CS.QtyApproved ,CS.QtyProvided) THEN ISNULL(CS.QtyApproved,0) ELSE NULL END AdjQtyService,
6170
C.Explanation,
6271
-- ALL claims
63-
CASE WHEN @Scope = 2 THEN CS.QtyApproved ELSE NULL END ServiceQtyApproved,
64-
CASE WHEN @Scope = 2 THEN CI.QtyApproved ELSE NULL END ItemQtyApproved,
72+
CASE WHEN @Scope = 2 THEN (CASE WHEN cs.RejectionReason = 0 THEN ISNULL(cs.QtyApproved, cs.QtyProvided) ELSE 0 END) ELSE 0 END ServiceQtyApproved,
73+
CASE WHEN @Scope = 2 THEN (CASE WHEN cs.RejectionReason = 0 THEN ISNULL(ci.QtyApproved, ci.QtyProvided) ELSE 0 END) ELSE 0 END ItemQtyApproved,
6574
CASE WHEN @Scope = 2 THEN cs.PriceAsked ELSE NULL END ServicePrice,
6675
CASE WHEN @Scope = 2 THEN CI.PriceAsked ELSE NULL END ItemPrice,
67-
CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceApproved,0) ELSE NULL END ServicePriceApproved,
68-
CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceApproved,0) ELSE NULL END ItemPriceApproved,
76+
CASE WHEN @Scope = 2 THEN (CASE WHEN cs.RejectionReason = 0 THEN ISNULL(cs.PriceApproved, cs.PriceAsked) ELSE NULL END) ELSE NULL END ServicePriceApproved,
77+
CASE WHEN @Scope = 2 THEN (CASE WHEN ci.RejectionReason = 0 THEN ISNULL(ci.PriceApproved, ci.PriceAsked) ELSE NULL END) ELSE NULL END ItemPriceApproved,
78+
CASE WHEN @Scope = 2 THEN ISNULL(cs.PriceValuated, cs.PriceAdjusted) ELSE NULL END ServicePriceValuated,
79+
CASE WHEN @Scope = 2 THEN ISNULL(ci.PriceValuated, ci.PriceAdjusted) ELSE NULL END ItemPriceValuated,
6980
CASE WHEN @Scope = 2 THEN ISNULL(cs.Justification,NULL) ELSE NULL END ServiceJustification,
7081
CASE WHEN @Scope = 2 THEN ISNULL(CI.Justification,NULL) ELSE NULL END ItemJustification,
7182
CASE WHEN @Scope = 2 THEN cs.ClaimServiceID ELSE NULL END ClaimServiceID,
@@ -98,7 +109,7 @@ CREATE PROCEDURE [dbo].[uspSSRSGetClaimOverview]
98109
AND CA.ValidityTo IS NULL
99110
AND ISNULL(C.DateTo,C.DateFrom) BETWEEN @StartDate AND @EndDate
100111
AND (C.ClaimStatus = @ClaimStatus OR @ClaimStatus IS NULL)
101-
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))
102113
AND (HF.HFID = @HFID OR @HFID = 0)
103114
AND (CI.ProdID = @ProdId OR CS.ProdID = @ProdId
104115
OR COALESCE(CS.ProdID, CI.ProdId) IS NULL OR @ProdId = 0)

0 commit comments

Comments
 (0)