From 0b1ba91ebe07a4b465d32330f5dabf6d6ad85d95 Mon Sep 17 00:00:00 2001
From: Nicolas Riss <48218773+nriss@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:52:43 +0100
Subject: [PATCH] rm phast

---
 input/fsh/instances/14618.fsh              | 2 +-
 input/fsh/instances/14619.fsh              | 2 +-
 input/fsh/instances/14620.fsh              | 2 +-
 input/fsh/instances/14621.fsh              | 2 +-
 input/fsh/instances/14622.fsh              | 2 +-
 input/fsh/instances/14624.fsh              | 2 +-
 input/fsh/instances/14625.fsh              | 2 +-
 input/fsh/instances/14626.fsh              | 2 +-
 input/fsh/instances/14627.fsh              | 2 +-
 input/fsh/instances/14628.fsh              | 2 +-
 input/fsh/instances/14629.fsh              | 2 +-
 input/fsh/instances/14630.fsh              | 2 +-
 input/fsh/instances/14631.fsh              | 2 +-
 input/fsh/instances/14637.fsh              | 2 +-
 input/fsh/instances/14637u.fsh             | 2 +-
 input/fsh/instances/14638.fsh              | 2 +-
 input/fsh/instances/14639.fsh              | 2 +-
 input/fsh/instances/14640.fsh              | 2 +-
 input/fsh/instances/14641.fsh              | 2 +-
 input/fsh/instances/14642.fsh              | 2 +-
 input/fsh/instances/14643.fsh              | 2 +-
 input/fsh/instances/14644.fsh              | 2 +-
 input/fsh/instances/14645.fsh              | 2 +-
 input/fsh/instances/14646.fsh              | 2 +-
 input/fsh/instances/14647.fsh              | 2 +-
 input/fsh/instances/14648.fsh              | 2 +-
 input/fsh/instances/14649.fsh              | 2 +-
 input/fsh/instances/14650.fsh              | 2 +-
 input/fsh/instances/14651-30.fsh           | 2 +-
 input/fsh/instances/14651.fsh              | 2 +-
 input/fsh/instances/14652.fsh              | 2 +-
 input/fsh/instances/14654.fsh              | 2 +-
 input/fsh/instances/14656.fsh              | 2 +-
 input/fsh/instances/14657.fsh              | 2 +-
 input/fsh/instances/14658.fsh              | 2 +-
 input/fsh/instances/14659.fsh              | 2 +-
 input/fsh/instances/14660.fsh              | 2 +-
 input/fsh/instances/14661.fsh              | 2 +-
 input/fsh/instances/14662.fsh              | 2 +-
 input/fsh/instances/14663.fsh              | 2 +-
 input/fsh/instances/group-01.fsh           | 6 +++---
 input/fsh/invariants/frmed-med-2.fsh       | 2 +-
 input/fsh/profiles/FrMedication2unique.fsh | 4 ++--
 43 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/input/fsh/instances/14618.fsh b/input/fsh/instances/14618.fsh
index 5ddf0673c..4a9411d07 100644
--- a/input/fsh/instances/14618.fsh
+++ b/input/fsh/instances/14618.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-11"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-13T08:48:39.825Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14619.fsh b/input/fsh/instances/14619.fsh
index 68521854c..04ebd8cc8 100644
--- a/input/fsh/instances/14619.fsh
+++ b/input/fsh/instances/14619.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-31"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-19T16:22:39.825Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14620.fsh b/input/fsh/instances/14620.fsh
index 23677efc6..22689e9b2 100644
--- a/input/fsh/instances/14620.fsh
+++ b/input/fsh/instances/14620.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-101"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-13T08:48:39.825Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14621.fsh b/input/fsh/instances/14621.fsh
index 7c98e25d3..aa5f03224 100644
--- a/input/fsh/instances/14621.fsh
+++ b/input/fsh/instances/14621.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-121"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-19T18:33:41.714Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14622.fsh b/input/fsh/instances/14622.fsh
index 34adc2d48..ceb988530 100644
--- a/input/fsh/instances/14622.fsh
+++ b/input/fsh/instances/14622.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-141"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-20T19:05:30.603Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14624.fsh b/input/fsh/instances/14624.fsh
index d16d3de61..2c50d7d4a 100644
--- a/input/fsh/instances/14624.fsh
+++ b/input/fsh/instances/14624.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-21"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-28T14:52:40.936Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14625.fsh b/input/fsh/instances/14625.fsh
index f65b60661..d127fd162 100644
--- a/input/fsh/instances/14625.fsh
+++ b/input/fsh/instances/14625.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-51"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-28T15:12:37.603Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14626.fsh b/input/fsh/instances/14626.fsh
index 67fa90271..f084e95ff 100644
--- a/input/fsh/instances/14626.fsh
+++ b/input/fsh/instances/14626.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-71"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-28T15:20:31.592Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14627.fsh b/input/fsh/instances/14627.fsh
index cea6b3b03..9a9147c5c 100644
--- a/input/fsh/instances/14627.fsh
+++ b/input/fsh/instances/14627.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-91"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-29T13:04:23.435Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14628.fsh b/input/fsh/instances/14628.fsh
index 40e8be147..b0e6696cb 100644
--- a/input/fsh/instances/14628.fsh
+++ b/input/fsh/instances/14628.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-111"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-29T13:27:21.531Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14629.fsh b/input/fsh/instances/14629.fsh
index 898d066da..d55c8e83e 100644
--- a/input/fsh/instances/14629.fsh
+++ b/input/fsh/instances/14629.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-131"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-29T16:14:13.817Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14630.fsh b/input/fsh/instances/14630.fsh
index 2c1979c85..a9c76cd22 100644
--- a/input/fsh/instances/14630.fsh
+++ b/input/fsh/instances/14630.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-151"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-29T17:29:27.603Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14631.fsh b/input/fsh/instances/14631.fsh
index 744d3c00e..8fa66ee2a 100644
--- a/input/fsh/instances/14631.fsh
+++ b/input/fsh/instances/14631.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-161"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-30T11:42:16.592Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14637.fsh b/input/fsh/instances/14637.fsh
index f5597d8e5..ef561af3d 100644
--- a/input/fsh/instances/14637.fsh
+++ b/input/fsh/instances/14637.fsh
@@ -8,7 +8,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-171"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-02T16:27:47.623Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14637u.fsh b/input/fsh/instances/14637u.fsh
index 030972aa2..13fb8f44d 100644
--- a/input/fsh/instances/14637u.fsh
+++ b/input/fsh/instances/14637u.fsh
@@ -8,7 +8,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-171"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-02T16:27:47.623Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14638.fsh b/input/fsh/instances/14638.fsh
index 405a79c53..45b86083c 100644
--- a/input/fsh/instances/14638.fsh
+++ b/input/fsh/instances/14638.fsh
@@ -8,7 +8,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-1"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-02T15:26:27.603Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14639.fsh b/input/fsh/instances/14639.fsh
index 48b7106b5..dd8352b21 100644
--- a/input/fsh/instances/14639.fsh
+++ b/input/fsh/instances/14639.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-191"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-11T18:21:20.641Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14640.fsh b/input/fsh/instances/14640.fsh
index 9f94b7b59..16505ff08 100644
--- a/input/fsh/instances/14640.fsh
+++ b/input/fsh/instances/14640.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-201"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-12T11:59:40.552Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14641.fsh b/input/fsh/instances/14641.fsh
index f55968bc4..8ce389e33 100644
--- a/input/fsh/instances/14641.fsh
+++ b/input/fsh/instances/14641.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-211"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-12T14:08:35.552Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction[0].sequence = 1
diff --git a/input/fsh/instances/14642.fsh b/input/fsh/instances/14642.fsh
index 7d87a1862..244f2b7b1 100644
--- a/input/fsh/instances/14642.fsh
+++ b/input/fsh/instances/14642.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-221"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-12T14:29:15.461Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction[0].sequence = 1
diff --git a/input/fsh/instances/14643.fsh b/input/fsh/instances/14643.fsh
index 12f2d9e4f..a6ac7e6b0 100644
--- a/input/fsh/instances/14643.fsh
+++ b/input/fsh/instances/14643.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-231"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-12T14:48:44.461Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14644.fsh b/input/fsh/instances/14644.fsh
index 66529185b..f1f85904a 100644
--- a/input/fsh/instances/14644.fsh
+++ b/input/fsh/instances/14644.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-241"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-12T15:47:52.372Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14645.fsh b/input/fsh/instances/14645.fsh
index 43bc09490..bd86fbc96 100644
--- a/input/fsh/instances/14645.fsh
+++ b/input/fsh/instances/14645.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-251"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-13T09:28:14.342Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14646.fsh b/input/fsh/instances/14646.fsh
index a84ac499a..5eea5547b 100644
--- a/input/fsh/instances/14646.fsh
+++ b/input/fsh/instances/14646.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-261"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-13T13:40:33.162Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction[0].sequence = 1
diff --git a/input/fsh/instances/14647.fsh b/input/fsh/instances/14647.fsh
index 36eea58ec..4ad0bd939 100644
--- a/input/fsh/instances/14647.fsh
+++ b/input/fsh/instances/14647.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-271"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-08-14T18:17:26.372Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction[0].sequence = 1
diff --git a/input/fsh/instances/14648.fsh b/input/fsh/instances/14648.fsh
index d22f844a9..4c10c07ba 100644
--- a/input/fsh/instances/14648.fsh
+++ b/input/fsh/instances/14648.fsh
@@ -7,7 +7,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-281"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-09-29T10:32:47.623Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14649.fsh b/input/fsh/instances/14649.fsh
index fd73a4bc4..8b1b213ff 100644
--- a/input/fsh/instances/14649.fsh
+++ b/input/fsh/instances/14649.fsh
@@ -7,7 +7,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-291"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-10-02T17:10:36.512Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14650.fsh b/input/fsh/instances/14650.fsh
index c36b8a503..225c47498 100644
--- a/input/fsh/instances/14650.fsh
+++ b/input/fsh/instances/14650.fsh
@@ -7,7 +7,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-301"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-10-02T17:22:25.401Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14651-30.fsh b/input/fsh/instances/14651-30.fsh
index acf55880a..72aac8fd1 100644
--- a/input/fsh/instances/14651-30.fsh
+++ b/input/fsh/instances/14651-30.fsh
@@ -7,7 +7,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-321"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-10-15T10:25:27.401Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14651.fsh b/input/fsh/instances/14651.fsh
index b26ebdcbe..5ddfdd5ac 100644
--- a/input/fsh/instances/14651.fsh
+++ b/input/fsh/instances/14651.fsh
@@ -7,7 +7,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-311"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-10-14T15:38:27.726Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14652.fsh b/input/fsh/instances/14652.fsh
index 8a2d4602a..51b866639 100644
--- a/input/fsh/instances/14652.fsh
+++ b/input/fsh/instances/14652.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-331"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-10-15T20:06:12.345Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14654.fsh b/input/fsh/instances/14654.fsh
index d0921265f..928a33158 100644
--- a/input/fsh/instances/14654.fsh
+++ b/input/fsh/instances/14654.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-351"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-13T08:48:39.825Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14656.fsh b/input/fsh/instances/14656.fsh
index 4267fd1fb..25bc51171 100644
--- a/input/fsh/instances/14656.fsh
+++ b/input/fsh/instances/14656.fsh
@@ -6,7 +6,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-353"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * authoredOn = "2021-07-13T08:48:39.825Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14657.fsh b/input/fsh/instances/14657.fsh
index e189bf601..2ed6aa9ba 100644
--- a/input/fsh/instances/14657.fsh
+++ b/input/fsh/instances/14657.fsh
@@ -4,7 +4,7 @@ Usage: #example
 * contained = med-21
 * status = #completed
 * medicationReference.reference = "#med-21"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * performer.actor.reference = "Practitioner/smart-Practitioner-7148xxxx"
 * authorizingPrescription.reference = "MedicationRequest/14624"
 * type = $v3-ActCode#FFC "First Fill - Complete"
diff --git a/input/fsh/instances/14658.fsh b/input/fsh/instances/14658.fsh
index 657b7b074..a7ceca2c2 100644
--- a/input/fsh/instances/14658.fsh
+++ b/input/fsh/instances/14658.fsh
@@ -4,7 +4,7 @@ Usage: #example
 * contained = med-31
 * status = #completed
 * medicationReference.reference = "#med-31"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * performer.actor.reference = "Practitioner/smart-Practitioner-7148xxxx"
 * authorizingPrescription.reference = "MedicationRequest/14654"
 * type = $v3-ActCode#FFC "First Fill - Complete"
diff --git a/input/fsh/instances/14659.fsh b/input/fsh/instances/14659.fsh
index 01c338cb6..706dbba51 100644
--- a/input/fsh/instances/14659.fsh
+++ b/input/fsh/instances/14659.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-361"
-* subject.reference = "Patient/phast-14603"
+* subject.reference = "Patient/14603"
 * authoredOn = "2021-07-14T09:07:28.914Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14660.fsh b/input/fsh/instances/14660.fsh
index b02de192e..291cfafbb 100644
--- a/input/fsh/instances/14660.fsh
+++ b/input/fsh/instances/14660.fsh
@@ -5,7 +5,7 @@ Usage: #example
 * status = #active
 * intent = #order
 * medicationReference.reference = "#med-371"
-* subject.reference = "Patient/phast-14604"
+* subject.reference = "Patient/14604"
 * authoredOn = "2021-07-15T11:02:39.847Z"
 * requester.reference = "Practitioner/smart-Practitioner-71482713"
 * dosageInstruction.sequence = 1
diff --git a/input/fsh/instances/14661.fsh b/input/fsh/instances/14661.fsh
index 27d67246f..c8fb162dc 100644
--- a/input/fsh/instances/14661.fsh
+++ b/input/fsh/instances/14661.fsh
@@ -4,7 +4,7 @@ Usage: #example
 * contained = med-381
 * status = #completed
 * medicationReference.reference = "#med-381"
-* subject.reference = "Patient/phast-14602"
+* subject.reference = "Patient/14602"
 * performer.actor.reference = "Practitioner/smart-Practitioner-7148xxxx"
 * authorizingPrescription.reference = "MedicationRequest/14654"
 * type = $v3-ActCode#RFP "Refill - Part"
diff --git a/input/fsh/instances/14662.fsh b/input/fsh/instances/14662.fsh
index 5361ab157..57adcb6d9 100644
--- a/input/fsh/instances/14662.fsh
+++ b/input/fsh/instances/14662.fsh
@@ -4,7 +4,7 @@ Usage: #example
 * contained = med-391
 * status = #completed
 * medicationReference.reference = "#med-391"
-* subject.reference = "Patient/phast-14603"
+* subject.reference = "Patient/14603"
 * performer.actor.reference = "Practitioner/smart-Practitioner-7148xxxx"
 * authorizingPrescription.reference = "MedicationRequest/14659"
 * type = $v3-ActCode#RFC "Refill - Complete"
diff --git a/input/fsh/instances/14663.fsh b/input/fsh/instances/14663.fsh
index 06e7ff2c8..fb30c06bf 100644
--- a/input/fsh/instances/14663.fsh
+++ b/input/fsh/instances/14663.fsh
@@ -4,7 +4,7 @@ Usage: #example
 * contained = med-401
 * status = #completed
 * medicationReference.reference = "#med-401"
-* subject.reference = "Patient/phast-14604"
+* subject.reference = "Patient/14604"
 * performer.actor.reference = "Practitioner/smart-Practitioner-7148xxxx"
 * authorizingPrescription.reference = "MedicationRequest/14660"
 * type = $v3-ActCode#RFP "Refill - Part"
diff --git a/input/fsh/instances/group-01.fsh b/input/fsh/instances/group-01.fsh
index 4f06ef153..e4b50d0b2 100644
--- a/input/fsh/instances/group-01.fsh
+++ b/input/fsh/instances/group-01.fsh
@@ -3,6 +3,6 @@ InstanceOf: Group
 Usage: #inline
 * type = #person
 * actual = true
-* member[0].entity = Reference(Patient/phast-14602)
-* member[+].entity = Reference(Patient/phast-14603)
-* member[+].entity = Reference(Patient/phast-14604)
\ No newline at end of file
+* member[0].entity = Reference(Patient/14602)
+* member[+].entity = Reference(Patient/14603)
+* member[+].entity = Reference(Patient/14604)
\ No newline at end of file
diff --git a/input/fsh/invariants/frmed-med-2.fsh b/input/fsh/invariants/frmed-med-2.fsh
index ebb638798..3fd03ddc5 100644
--- a/input/fsh/invariants/frmed-med-2.fsh
+++ b/input/fsh/invariants/frmed-med-2.fsh
@@ -1,4 +1,4 @@
 Invariant: frmed-med-2
 Description: "If fr-medication is an othter-medication, its code SHALL NOT be UCD"
 Severity: #error
-Expression: "coding.system != 'http://phast.fr/fhir/ValueSet/Pharmacy/CIOdc/SIPh-CIO_UCD'"
\ No newline at end of file
+// Expression: "coding.system != 'http://phast.fr/fhir/ValueSet/Pharmacy/CIOdc/SIPh-CIO_UCD'" //A remplacer avec le code officiel d'ucd
\ No newline at end of file
diff --git a/input/fsh/profiles/FrMedication2unique.fsh b/input/fsh/profiles/FrMedication2unique.fsh
index 07acae9d7..c0cc7a9ed 100644
--- a/input/fsh/profiles/FrMedication2unique.fsh
+++ b/input/fsh/profiles/FrMedication2unique.fsh
@@ -20,7 +20,7 @@ Description: "ressource Medication unique regroupant les 4 profils en 1 (ucd, uc
 * code.coding[ucdCode] ^short = "Codes that identify this branded medication"
 * code.coding[ucdCode] ^definition = "Codes that identify this branded medication"
 * code.coding[ucdCode] ^binding.description = "UCD code"
-* code.coding[ucdCode].system = "^http:\\/\\/phast\\.fr\\/fhir\\/ValueSet\\/Pharmacy\\/CIOdc\\/SIPh-CIO_UCD$"
+// * code.coding[ucdCode].system = "^http:\\/\\/phast\\.fr\\/fhir\\/ValueSet\\/Pharmacy\\/CIOdc\\/SIPh-CIO_UCD$" //TODO : remplacer avec le système FHIR d'UCD
 * code.coding[ucdCode].system ^short = "UCD codeSystem"
 * code.coding[ucdCode].system ^definition = "The UCD code system (under the responsibility of the Club Inter Pharmaceutique (CIP)"
 * code.coding[ucdCode].system ^comment = "In the absence of a uri defined by the Club Interpharceutique or the competent government authorities, the uri defined by PHAST is used."
@@ -37,7 +37,7 @@ Description: "ressource Medication unique regroupant les 4 profils en 1 (ucd, uc
 * code.coding[otherMedicationCode] obeys frmed-med-2 and frmed-med-3 and frmed-med-4
 * code.coding[otherMedicationCode] ^short = "Generaly no code for compound medicinal product"
 * code.coding[otherMedicationCode] ^definition = "A code identifing the compound medicinal product. Generaly none : no code defined for G5 1L + NaCl 3g + KCl 2g."
-// * code.coding[otherMedicationCode].system = "^((?!http:\\/\\/phast\\.fr\\/fhir\\/ValueSet\\/Pharmacy\\/CIOdc\\/SIPh-CIO_UCD|http:\\/\\/snomed\\.info\\/sct).)*$" //TODO
+// * code.coding[otherMedicationCode].system = "^((?!http:\\/\\/phast\\.fr\\/fhir\\/ValueSet\\/Pharmacy\\/CIOdc\\/SIPh-CIO_UCD|http:\\/\\/snomed\\.info\\/sct).)*$" 
 
 * code.text MS
 * code.text ^comment = "If there is no code (usually not available for a compound drug or must be local if available), a name SHALL be provided."