Merge pull request #156 from openimis/release/22.10

Release/22.10
openimis · Nov 10, 2022 · b34fd20 · b34fd20
2 parents bcedcb1 + ff684aa
commit b34fd20
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 33 deletions.
diff --git a/sql/base/1_schema_tables.sql b/sql/base/1_schema_tables.sql
@@ -756,7 +756,7 @@ CREATE TABLE [dbo].[tblClaim](
 	[Reinsured] [decimal](18, 2) NULL,
 	[Valuated] [decimal](18, 2) NULL,
 	[DateClaimed] [date] NOT NULL,
-	[DateProcessed] [smalldatetime] NULL,
+	[DateProcessed] [date] NULL,
 	[Feedback] [bit] NOT NULL,
 	[FeedbackID] [int] NULL,
 	[Explanation] [ntext] NULL,

diff --git a/sql/migrations/1_migration_latest.sql b/sql/migrations/1_migration_latest.sql
@@ -3520,3 +3520,103 @@ GO
 IF EXISTS(SELECT 1 FROM sys.indexes WHERE Name = N'missing_index_384' AND object_id = OBJECT_ID('tblClaimServices'))
 ALTER INDEX  [missing_index_384] ON [dbo].[tblClaimServices] DISABLE
 GO
+
+--OTC 697
+DROP INDEX [missing_index_215] ON [dbo].[tblClaim]
+GO
+
+DROP INDEX [missing_index_218] ON [dbo].[tblClaim]
+GO
+
+DROP INDEX [missing_index_242] ON [dbo].[tblClaim]
+GO
+
+DROP INDEX [missing_index_245] ON [dbo].[tblClaim]
+GO
+
+DROP INDEX [missing_index_306] ON [dbo].[tblClaim]
+GO
+
+DROP INDEX [missing_index_4896] ON [dbo].[tblClaim]
+GO
+
+DROP INDEX [missing_index_50] ON [dbo].[tblClaim]
+GO
+
+DROP INDEX [NCI_tblClaim_DateProcessed] ON [dbo].[tblClaim]
+GO
+
+IF COL_LENGTH(N'tblClaim', N'DateProcessed') IS NOT NULL
+ALTER TABLE tbLClaim
+ALTER COLUMN DateProcessed DATE NULL
+GO
+
+CREATE NONCLUSTERED INDEX [missing_index_215] ON [dbo].[tblClaim]
+(
+	[ClaimStatus] ASC,
+	[ValidityTo] ASC,
+	[DateProcessed] ASC
+)
+INCLUDE([ClaimCode]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
+
+CREATE NONCLUSTERED INDEX [missing_index_218] ON [dbo].[tblClaim]
+(
+	[ClaimStatus] ASC,
+	[ReviewStatus] ASC,
+	[ValidityTo] ASC,
+	[DateProcessed] ASC
+)
+INCLUDE([ClaimCode]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
+
+CREATE NONCLUSTERED INDEX [missing_index_242] ON [dbo].[tblClaim]
+(
+	[ClaimStatus] ASC,
+	[ValidityTo] ASC,
+	[HFID] ASC,
+	[DateProcessed] ASC
+)
+INCLUDE([ClaimCode]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
+
+CREATE NONCLUSTERED INDEX [missing_index_245] ON [dbo].[tblClaim]
+(
+	[ClaimStatus] ASC,
+	[ValidityTo] ASC,
+	[HFID] ASC,
+	[DateProcessed] ASC
+)
+INCLUDE([ClaimCode],[Claimed]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
+
+/****** Object:  Index [missing_index_306]    Script Date: 16/09/2022 12:37:04 ******/
+CREATE NONCLUSTERED INDEX [missing_index_306] ON [dbo].[tblClaim]
+(
+	[ClaimStatus] ASC,
+	[ValidityTo] ASC,
+	[DateProcessed] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
+
+CREATE NONCLUSTERED INDEX [missing_index_4896] ON [dbo].[tblClaim]
+(
+	[ClaimStatus] ASC,
+	[DateProcessed] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
+
+CREATE NONCLUSTERED INDEX [missing_index_50] ON [dbo].[tblClaim]
+(
+	[ClaimStatus] ASC,
+	[ValidityTo] ASC,
+	[DateProcessed] ASC
+)
+INCLUDE([ICDID]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
+
+CREATE NONCLUSTERED INDEX [NCI_tblClaim_DateProcessed] ON [dbo].[tblClaim]
+(
+	[DateProcessed] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 80, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [IndexesFG]
+GO
diff --git a/sql/stored_procedures/uspConsumeEnrollments.sql b/sql/stored_procedures/uspConsumeEnrollments.sql
@@ -584,6 +584,33 @@ CREATE PROCEDURE [dbo].[uspConsumeEnrollments](
 					WHERE I.ValidityTo IS NULL AND I.IsHead = 1 AND I.CHFID IS NULL)
 					RAISERROR(N'-1',16,1)
 
+                    IF EXISTS(SELECT COUNT(1) 
+                        FROM @tblInsuree TI
+                        LEFT OUTER JOIN tblInsuree I ON TI.CHFID = I.CHFID
+                        WHERE I.ValidityTo IS NULL
+                        AND I.IsHead = 1
+                        GROUP BY TI.FamilyID
+                        HAVING COUNT(1) > 1)
+
+                        --Added by Amani
+                        BEGIN
+                                DELETE FROM @tblResult;
+                                SET @FamilyImported = 0;
+                                SET @FamilyRejected =0;
+                                SET @FamiliesUpd =0;
+                                SET @InsureeImported  = 0;
+                                SET @InsureeUpd =0;
+                                SET @PolicyImported  = 0;
+                                SET @PolicyImported  = 0;
+                                SET @PolicyRejected  = 0;
+                                SET @PremiumImported  = 0 
+                                INSERT INTO @tblResult VALUES
+                                    (N'<h3 style="color:red;">Double HOF Found. <br />Please contact your IT manager for further assistant.</h3>')
+                                    --GOTO EndOfTheProcess;
+
+                                    RAISERROR(N'-5',16,1)
+                                END
+
 					--Duplicate Receipt
 					IF EXISTS(SELECT 1 FROM @tblPremium TPR
 					INNER JOIN tblPremium PR ON PR.PolicyID = TPR.PolicyID AND TPR.Amount = PR.Amount AND TPR.Receipt = PR.Receipt
@@ -980,38 +1007,6 @@ CREATE PROCEDURE [dbo].[uspConsumeEnrollments](
 		END
 
 		SELECT @PolicyImported = ISNULL(COUNT(1),0) FROM @tblPolicy WHERE isOffline = 1
-
-
-
-
-
-
-	IF EXISTS(SELECT COUNT(1) 
-			FROM tblInsuree 
-			WHERE ValidityTo IS NULL
-			AND IsHead = 1
-			GROUP BY FamilyID
-			HAVING COUNT(1) > 1)
-
-			--Added by Amani
-			BEGIN
-					DELETE FROM @tblResult;
-					SET @FamilyImported = 0;
-					SET @FamilyRejected =0;
-					SET @FamiliesUpd =0;
-					SET @InsureeImported  = 0;
-					SET @InsureeUpd =0;
-					SET @PolicyImported  = 0;
-					SET @PolicyImported  = 0;
-					SET @PolicyRejected  = 0;
-					SET @PremiumImported  = 0 
-					INSERT INTO @tblResult VALUES
-						(N'<h3 style="color:red;">Double HOF Found. <br />Please contact your IT manager for further assistant.</h3>')
-						--GOTO EndOfTheProcess;
-
-						RAISERROR(N'-5',16,1)
-					END
-
 
 		COMMIT TRAN ENROLL;
 

diff --git a/sql/stored_procedures/uspSSRSOverviewOfCommissions.sql b/sql/stored_procedures/uspSSRSOverviewOfCommissions.sql