Fix study series QIDO bug (#3313)

* Fix study series bug * Add e2e tests * Assert * Fix int tests * fix comment * Revert file
microsoft · Jan 19, 2024 · e9bcf46 · e9bcf46
1 parent 6e37dc7
commit e9bcf46
Show file tree

Hide file tree

Showing 10 changed files with 6,709 additions and 5 deletions.
diff --git a/src/Microsoft.Health.Dicom.SqlServer/Features/Schema/Migrations/56.diff.sql b/src/Microsoft.Health.Dicom.SqlServer/Features/Schema/Migrations/56.diff.sql
@@ -0,0 +1,62 @@
+SET XACT_ABORT ON
+
+BEGIN TRANSACTION
+GO
+
+/***************************************************************************************/
+-- STORED PROCEDURE
+--     Get Study level QIDO response
+--
+/***************************************************************************************/
+CREATE OR ALTER PROCEDURE dbo.GetStudyResult (
+	@partitionKey       INT,
+	@watermarkTableType dbo.WatermarkTableType READONLY
+) AS
+BEGIN
+    SET NOCOUNT     ON
+    SET XACT_ABORT  ON
+
+    SELECT  DISTINCT
+            sv.StudyInstanceUid,
+            sv.PatientId,
+            sv.PatientName,
+            sv.ReferringPhysicianName,
+            sv.StudyDate,
+            sv.StudyDescription,
+            sv.AccessionNumber,
+            sv.PatientBirthDate,
+            sv.ModalitiesInStudy,
+            sv.NumberofStudyRelatedInstances
+    FROM    dbo.Instance i
+    JOIN    @watermarkTableType input ON  i.Watermark = input.Watermark AND i.PartitionKey = @partitionKey
+    JOIN    dbo.StudyResultView sv  ON  i.StudyKey = sv.StudyKey AND i.PartitionKey = sv.PartitionKey
+END
+GO
+
+/***************************************************************************************/
+-- STORED PROCEDURE
+--     Get Series level QIDO response
+--
+/***************************************************************************************/
+CREATE OR ALTER PROCEDURE dbo.GetSeriesResult (
+	@partitionKey       INT,
+	@watermarkTableType dbo.WatermarkTableType READONLY
+) AS
+BEGIN
+    SET NOCOUNT     ON
+    SET XACT_ABORT  ON
+
+    SELECT  DISTINCT
+            i.StudyInstanceUid,
+            sv.SeriesInstanceUid,
+            sv.Modality,
+            sv.PerformedProcedureStepStartDate,
+            sv.ManufacturerModelName,
+            sv.NumberofSeriesRelatedInstances
+    FROM    dbo.Instance i
+    JOIN    @watermarkTableType input ON  i.Watermark = input.Watermark AND i.PartitionKey = @partitionKey
+    JOIN    dbo.SeriesResultView sv  ON  i.StudyKey = sv.StudyKey AND i.SeriesKey = sv.SeriesKey AND i.PartitionKey = sv.PartitionKey
+END
+GO
+
+COMMIT TRANSACTION