-
Notifications
You must be signed in to change notification settings - Fork 179
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add more study tags for DICOM update (#3250)
* Add more studyTag to update * Update documentation
- Loading branch information
Showing
15 changed files
with
6,628 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
172 changes: 172 additions & 0 deletions
172
src/Microsoft.Health.Dicom.SqlServer/Features/Schema/Migrations/52.diff.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| SET XACT_ABORT ON | ||
|
|
||
| BEGIN TRANSACTION | ||
| GO | ||
|
|
||
| /************************************************************* | ||
| Stored procedures for updating an instance status. | ||
| **************************************************************/ | ||
| -- | ||
| -- STORED PROCEDURE | ||
| -- EndUpdateInstanceV52 | ||
| -- | ||
| -- DESCRIPTION | ||
| -- Bulk update all instances in a study, creates new entry in changefeed and fileProperty for each new file added. | ||
| -- | ||
| -- PARAMETERS | ||
| -- @partitionKey | ||
| -- * The partition key. | ||
| -- @studyInstanceUid | ||
| -- * The study instance UID. | ||
| -- @patientId | ||
| -- * The Id of the patient. | ||
| -- @patientName | ||
| -- * The name of the patient. | ||
| -- @patientBirthDate | ||
| -- * The patient's birth date. | ||
| -- @insertFileProperties | ||
| -- * A table type containing the file properties to insert. | ||
| -- | ||
| -- RETURN VALUE | ||
| -- None | ||
| -- | ||
| CREATE OR ALTER PROCEDURE dbo.EndUpdateInstanceV52 | ||
| @partitionKey INT, | ||
| @studyInstanceUid VARCHAR(64), | ||
| @patientId NVARCHAR(64) = NULL, | ||
| @patientName NVARCHAR(325) = NULL, | ||
| @patientBirthDate DATE = NULL, | ||
| @referringPhysicianName NVARCHAR(325) = NULL, | ||
| @studyDescription NVARCHAR(64) = NULL, | ||
| @accessionNumber NVARCHAR(64) = NULL, | ||
| @insertFileProperties dbo.FilePropertyTableType READONLY, | ||
| @stringExtendedQueryTags dbo.InsertStringExtendedQueryTagTableType_1 READONLY, | ||
| @longExtendedQueryTags dbo.InsertLongExtendedQueryTagTableType_1 READONLY, | ||
| @doubleExtendedQueryTags dbo.InsertDoubleExtendedQueryTagTableType_1 READONLY, | ||
| @dateTimeExtendedQueryTags dbo.InsertDateTimeExtendedQueryTagTableType_2 READONLY, | ||
| @personNameExtendedQueryTags dbo.InsertPersonNameExtendedQueryTagTableType_1 READONLY | ||
| AS | ||
| BEGIN | ||
| SET NOCOUNT ON | ||
|
|
||
| SET XACT_ABORT ON | ||
| BEGIN TRANSACTION | ||
|
|
||
| DECLARE @currentDate DATETIME2(7) = SYSUTCDATETIME() | ||
| DECLARE @resourceType TINYINT = 0 | ||
| DECLARE @studyKey BIGINT | ||
| DECLARE @maxWatermark BIGINT | ||
|
|
||
| CREATE TABLE #UpdatedInstances | ||
| (PartitionKey INT, | ||
| StudyInstanceUid VARCHAR(64), | ||
| SeriesInstanceUid VARCHAR(64), | ||
| SopInstanceUid VARCHAR(64), | ||
| Watermark BIGINT, | ||
| OriginalWatermark BIGINT, | ||
| InstanceKey BIGINT) | ||
|
|
||
| DELETE FROM #UpdatedInstances | ||
|
|
||
| UPDATE dbo.Instance | ||
| SET LastStatusUpdatedDate = @currentDate, | ||
| OriginalWatermark = ISNULL(OriginalWatermark, Watermark), | ||
| Watermark = NewWatermark, | ||
| NewWatermark = NULL | ||
| OUTPUT deleted.PartitionKey, @studyInstanceUid, deleted.SeriesInstanceUid, deleted.SopInstanceUid, inserted.Watermark, inserted.OriginalWatermark, deleted.InstanceKey INTO #UpdatedInstances | ||
| WHERE PartitionKey = @partitionKey | ||
| AND StudyInstanceUid = @studyInstanceUid | ||
| AND Status = 1 | ||
| AND NewWatermark IS NOT NULL | ||
|
|
||
| -- Create index on temp table so we can join on watermark when we need to update change feed with file path. | ||
| IF NOT EXISTS (SELECT * | ||
| FROM tempdb.sys.indexes | ||
| WHERE name = 'IXC_UpdatedInstances') | ||
| CREATE UNIQUE INDEX IXC_UpdatedInstances ON #UpdatedInstances (Watermark) | ||
|
|
||
| -- Create index on temp table so we can join on instance key and watermark when we need to insert file | ||
| -- properties when instance key alone is does not specify a unique row on the table | ||
| IF NOT EXISTS (SELECT * | ||
| FROM tempdb.sys.indexes | ||
| WHERE name = 'IXC_UpdatedInstanceKeyWatermark') | ||
| CREATE UNIQUE CLUSTERED INDEX IXC_UpdatedInstanceKeyWatermark ON #UpdatedInstances (InstanceKey, OriginalWatermark) | ||
|
|
||
| -- Only updating patient information in a study | ||
| UPDATE dbo.Study | ||
| SET PatientId = ISNULL(@patientId, PatientId), | ||
| PatientName = ISNULL(@patientName, PatientName), | ||
| PatientBirthDate = ISNULL(@patientBirthDate, PatientBirthDate), | ||
| ReferringPhysicianName = ISNULL(@referringPhysicianName, ReferringPhysicianName), | ||
| StudyDescription = ISNULL(@studyDescription, StudyDescription), | ||
| AccessionNumber = ISNULL(@accessionNumber, AccessionNumber), | ||
| @studyKey = StudyKey | ||
| WHERE PartitionKey = @partitionKey | ||
| AND StudyInstanceUid = @studyInstanceUid | ||
|
|
||
| -- The study does not exist. May be deleted | ||
| IF @@ROWCOUNT = 0 | ||
| THROW 50404, 'Study does not exist', 1 | ||
|
|
||
| -- Delete from file properties any rows with "stale" watermarks if we will be inserting new ones | ||
| IF EXISTS (SELECT 1 FROM @insertFileProperties) | ||
| DELETE FP | ||
| FROM dbo.FileProperty as FP | ||
| INNER JOIN #UpdatedInstances U | ||
| ON U.InstanceKey = FP.InstanceKey | ||
| WHERE U.OriginalWatermark != FP.Watermark | ||
|
|
||
| -- Insert new file properties from added blobs, @insertFileProperties will be empty when external store not | ||
| -- enabled | ||
| INSERT INTO dbo.FileProperty | ||
| (InstanceKey, Watermark, FilePath, ETag) | ||
| SELECT U.InstanceKey, I.Watermark, I.FilePath, I.ETag | ||
| FROM @insertFileProperties I | ||
| INNER JOIN #UpdatedInstances U | ||
| ON U.Watermark = I.Watermark | ||
|
|
||
| SELECT | ||
| @maxWatermark = max(Watermark) | ||
| FROM #UpdatedInstances | ||
|
|
||
| -- Update extended query tags value if any | ||
| BEGIN TRY | ||
| EXEC dbo.IIndexInstanceCoreV9 | ||
| @partitionKey, | ||
| @studyKey, | ||
| null, -- passing null to series key and instance | ||
| null, | ||
| @maxWatermark, | ||
| @stringExtendedQueryTags, | ||
| @longExtendedQueryTags, | ||
| @doubleExtendedQueryTags, | ||
| @dateTimeExtendedQueryTags, | ||
| @personNameExtendedQueryTags | ||
| END TRY | ||
| BEGIN CATCH | ||
| THROW | ||
| END CATCH | ||
|
|
||
| -- Insert into change feed table for update action type | ||
| INSERT INTO dbo.ChangeFeed | ||
| (Action, PartitionKey, StudyInstanceUid, SeriesInstanceUid, SopInstanceUid, OriginalWatermark) | ||
| SELECT 2, PartitionKey, StudyInstanceUid, SeriesInstanceUid, SopInstanceUid, Watermark | ||
| FROM #UpdatedInstances | ||
|
|
||
| -- Update existing instance currentWatermark to latest and update file path | ||
| UPDATE C | ||
| SET CurrentWatermark = U.Watermark, FilePath = I.FilePath | ||
| FROM dbo.ChangeFeed C | ||
| JOIN #UpdatedInstances U | ||
| ON C.PartitionKey = U.PartitionKey | ||
| AND C.StudyInstanceUid = U.StudyInstanceUid | ||
| AND C.SeriesInstanceUid = U.SeriesInstanceUid | ||
| AND C.SopInstanceUid = U.SopInstanceUid | ||
| LEFT OUTER JOIN @insertFileProperties I | ||
| ON I.Watermark = U.Watermark | ||
|
|
||
| COMMIT TRANSACTION | ||
| END | ||
| GO | ||
|
|
||
| COMMIT TRANSACTION |
Oops, something went wrong.