Skip to content

Commit

Permalink
fix conflict 7b7da57
Browse files Browse the repository at this point in the history
  • Loading branch information
@nriss
nriss committed Nov 8, 2023
1 parent 045e7de commit 3cf814a
Show file tree
Hide file tree
Showing 1,448 changed files with 22,768 additions and 23,595 deletions.
10 changes: 5 additions & 5 deletions ig/nr-add-def-ins-collection/CodeSystem-fr-core-circonstances-sortie-testing.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

<script src="assets/js/prism.js"></script>

<style type="text/css">h2{--heading-prefix:"3.101"}
h3,h4,h5,h6{--heading-prefix:"3.101"}</style>
<style type="text/css">h2{--heading-prefix:"3.102"}
h3,h4,h5,h6{--heading-prefix:"3.102"}</style>
<div id="segment-header" class="segment"> <!-- segment-header -->
<div class="container"> <!-- container -->
<!-- Placeholder for child template header declarations -->
Expand Down Expand Up @@ -138,7 +138,7 @@
<div class="inner-wrapper">

<div class="col-12">
<!--ReleaseHeader--><p id="publish-box">Guide d'implémentation Fr Core - Local Development build (v2.0.0). See the <a href="http://hl7.fr/ig/fhir/core/history.html">Directory of published versions</a></p><!--EndReleaseHeader-->
<!--ReleaseHeader--><p id="publish-box">Guide d'implémentation Fr Core - Local Development build (v2.0.0). See the <a href="https://hl7.fr/ig/fhir/core/history.html">Directory of published versions</a></p><!--EndReleaseHeader-->



Expand Down Expand Up @@ -193,7 +193,7 @@ <h2 id="root">CodeSystem: FR Core CodeSystem Circonstances Sortie - Testing

Draft

as of 2023-11-06
as of 2023-11-08


</td>
Expand Down Expand Up @@ -270,7 +270,7 @@ <h3>Test Scripts</h3>

<div class="inner-wrapper">
<p>
IG &#169; 2023+ <a style="color:var(--footer-hyperlink-text-color)" href="http://interopsante.org/">Interop&#39;Santé</a>. Package hl7.fhir.fr.core#2.0.0 based on <a style="color: var(--footer-hyperlink-text-color)" href="http://hl7.org/fhir/R4/">FHIR 4.0.1</a>. Generated <span title="Mon, Nov 6, 2023 13:13+0000">2023-11-06</span>
IG &#169; 2023+ <a style="color:var(--footer-hyperlink-text-color)" href="http://interopsante.org/">Interop&#39;Santé</a>. Package hl7.fhir.fr.core#2.0.0 based on <a style="color: var(--footer-hyperlink-text-color)" href="http://hl7.org/fhir/R4/">FHIR 4.0.1</a>. Generated <span title="Wed, Nov 8, 2023 15:32+0000">2023-11-08</span>
<br/>
<span style="color: var(--footer-highlight-text-color)">
Links: <a style="color: var(--footer-hyperlink-text-color)" href="toc.html">Table of Contents</a> |
Expand Down
4 changes: 2 additions & 2 deletions ig/nr-add-def-ins-collection/CodeSystem-fr-core-circonstances-sortie.change.history.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@


<div style="counter-reset: section 10" class="col-12">
<!--ReleaseHeader--><p id="publish-box">Guide d'implémentation Fr Core - Local Development build (v2.0.0). See the <a href="http://hl7.fr/ig/fhir/core/history.html">Directory of published versions</a></p><!--EndReleaseHeader-->
<!--ReleaseHeader--><p id="publish-box">Guide d'implémentation Fr Core - Local Development build (v2.0.0). See the <a href="https://hl7.fr/ig/fhir/core/history.html">Directory of published versions</a></p><!--EndReleaseHeader-->



Expand Down Expand Up @@ -256,7 +256,7 @@ <h2 id="root">: FRCoreCodeSystemCirconstancesSortie - Change History</h2>

<div class="inner-wrapper">
<p>
IG &#169; 2023+ <a style="color:var(--footer-hyperlink-text-color)" href="http://interopsante.org/">Interop&#39;Santé</a>. Package hl7.fhir.fr.core#2.0.0 based on <a style="color: var(--footer-hyperlink-text-color)" href="http://hl7.org/fhir/R4/">FHIR 4.0.1</a>. Generated <span title="Mon, Nov 6, 2023 13:13+0000">2023-11-06</span>
IG &#169; 2023+ <a style="color:var(--footer-hyperlink-text-color)" href="http://interopsante.org/">Interop&#39;Santé</a>. Package hl7.fhir.fr.core#2.0.0 based on <a style="color: var(--footer-hyperlink-text-color)" href="http://hl7.org/fhir/R4/">FHIR 4.0.1</a>. Generated <span title="Wed, Nov 8, 2023 15:32+0000">2023-11-08</span>
<br/>
<span style="color: var(--footer-highlight-text-color)">
Links: <a style="color: var(--footer-hyperlink-text-color)" href="toc.html">Table of Contents</a> |
Expand Down
16 changes: 8 additions & 8 deletions ig/nr-add-def-ins-collection/CodeSystem-fr-core-circonstances-sortie.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

<script src="assets/js/prism.js"></script>

<style type="text/css">h2{--heading-prefix:"3.101"}
h3,h4,h5,h6{--heading-prefix:"3.101"}</style>
<style type="text/css">h2{--heading-prefix:"3.102"}
h3,h4,h5,h6{--heading-prefix:"3.102"}</style>
<div id="segment-header" class="segment"> <!-- segment-header -->
<div class="container"> <!-- container -->
<!-- Placeholder for child template header declarations -->
Expand Down Expand Up @@ -138,7 +138,7 @@
<div class="inner-wrapper">

<div class="col-12">
<!--ReleaseHeader--><p id="publish-box">Guide d'implémentation Fr Core - Local Development build (v2.0.0). See the <a href="http://hl7.fr/ig/fhir/core/history.html">Directory of published versions</a></p><!--EndReleaseHeader-->
<!--ReleaseHeader--><p id="publish-box">Guide d'implémentation Fr Core - Local Development build (v2.0.0). See the <a href="https://hl7.fr/ig/fhir/core/history.html">Directory of published versions</a></p><!--EndReleaseHeader-->



Expand Down Expand Up @@ -188,10 +188,10 @@ <h2 id="root">CodeSystem: FR Core CodeSystem Circonstances Sortie
<table class="colsd">

<tr>
<td colspan="4"><i>Official URL</i>: <span class="copy-text">http://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie<button title="Click to copy URL" class="btn-copy" data-clipboard-text="http://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie"/></span>
<td colspan="4"><i>Official URL</i>: <span class="copy-text">https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie<button title="Click to copy URL" class="btn-copy" data-clipboard-text="https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie"/></span>
</td>
<td><i>Version</i>:
<span class="copy-text">2.0.0<button title="Click to copy versioned URL" class="btn-copy" data-clipboard-text="http://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie|2.0.0"/></span>
<span class="copy-text">2.0.0<button title="Click to copy versioned URL" class="btn-copy" data-clipboard-text="https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie|2.0.0"/></span>
</td>
</tr>

Expand All @@ -207,7 +207,7 @@ <h2 id="root">CodeSystem: FR Core CodeSystem Circonstances Sortie

Draft

as of 2023-11-06
as of 2023-11-08


</td>
Expand Down Expand Up @@ -240,7 +240,7 @@ <h2 id="root">CodeSystem: FR Core CodeSystem Circonstances Sortie
<ul><li>This CodeSystem is not used here; it may be used elsewhere (e.g. specifications and/or implementations that use this content)</li></ul>


<div xmlns="http://www.w3.org/1999/xhtml"><p>This case-sensitive code system <code>http://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie</code> defines the following codes:</p><table class="codes"><tr><td style="white-space:nowrap"><b>Code</b></td><td><b>Display</b></td></tr><tr><td style="white-space:nowrap">2<a name="fr-core-circonstances-sortie-2"> </a></td><td>Mesure disciplinaire</td></tr><tr><td style="white-space:nowrap">3<a name="fr-core-circonstances-sortie-3"> </a></td><td>Décision médicale</td></tr><tr><td style="white-space:nowrap">4<a name="fr-core-circonstances-sortie-4"> </a></td><td>Contre avis médical</td></tr><tr><td style="white-space:nowrap">5<a name="fr-core-circonstances-sortie-5"> </a></td><td>en attente d'examen</td></tr><tr><td style="white-space:nowrap">6<a name="fr-core-circonstances-sortie-6"> </a></td><td>Convenance personnelle</td></tr><tr><td style="white-space:nowrap">R<a name="fr-core-circonstances-sortie-R"> </a></td><td>Essai (contexte psychiatrique)</td></tr><tr><td style="white-space:nowrap">E<a name="fr-core-circonstances-sortie-E"> </a></td><td>Evasion</td></tr><tr><td style="white-space:nowrap">F<a name="fr-core-circonstances-sortie-F"> </a></td><td>Fugue</td></tr></table></div>
<div xmlns="http://www.w3.org/1999/xhtml"><p>This case-sensitive code system <code>https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie</code> defines the following codes:</p><table class="codes"><tr><td style="white-space:nowrap"><b>Code</b></td><td><b>Display</b></td></tr><tr><td style="white-space:nowrap">2<a name="fr-core-circonstances-sortie-2"> </a></td><td>Mesure disciplinaire</td></tr><tr><td style="white-space:nowrap">3<a name="fr-core-circonstances-sortie-3"> </a></td><td>Décision médicale</td></tr><tr><td style="white-space:nowrap">4<a name="fr-core-circonstances-sortie-4"> </a></td><td>Contre avis médical</td></tr><tr><td style="white-space:nowrap">5<a name="fr-core-circonstances-sortie-5"> </a></td><td>en attente d'examen</td></tr><tr><td style="white-space:nowrap">6<a name="fr-core-circonstances-sortie-6"> </a></td><td>Convenance personnelle</td></tr><tr><td style="white-space:nowrap">R<a name="fr-core-circonstances-sortie-R"> </a></td><td>Essai (contexte psychiatrique)</td></tr><tr><td style="white-space:nowrap">E<a name="fr-core-circonstances-sortie-E"> </a></td><td>Evasion</td></tr><tr><td style="white-space:nowrap">F<a name="fr-core-circonstances-sortie-F"> </a></td><td>Fugue</td></tr></table></div>



Expand Down Expand Up @@ -295,7 +295,7 @@ <h2 id="root">CodeSystem: FR Core CodeSystem Circonstances Sortie

<div class="inner-wrapper">
<p>
IG &#169; 2023+ <a style="color:var(--footer-hyperlink-text-color)" href="http://interopsante.org/">Interop&#39;Santé</a>. Package hl7.fhir.fr.core#2.0.0 based on <a style="color: var(--footer-hyperlink-text-color)" href="http://hl7.org/fhir/R4/">FHIR 4.0.1</a>. Generated <span title="Mon, Nov 6, 2023 13:13+0000">2023-11-06</span>
IG &#169; 2023+ <a style="color:var(--footer-hyperlink-text-color)" href="http://interopsante.org/">Interop&#39;Santé</a>. Package hl7.fhir.fr.core#2.0.0 based on <a style="color: var(--footer-hyperlink-text-color)" href="http://hl7.org/fhir/R4/">FHIR 4.0.1</a>. Generated <span title="Wed, Nov 8, 2023 15:32+0000">2023-11-08</span>
<br/>
<span style="color: var(--footer-highlight-text-color)">
Links: <a style="color: var(--footer-hyperlink-text-color)" href="toc.html">Table of Contents</a> |
Expand Down
6 changes: 3 additions & 3 deletions ig/nr-add-def-ins-collection/CodeSystem-fr-core-circonstances-sortie.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"id" : "fr-core-circonstances-sortie",
"text" : {
"status" : "generated",
"div" : "<div xmlns=\"http://www.w3.org/1999/xhtml\"><p>This case-sensitive code system <code>http://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie</code> defines the following codes:</p><table class=\"codes\"><tr><td style=\"white-space:nowrap\"><b>Code</b></td><td><b>Display</b></td></tr><tr><td style=\"white-space:nowrap\">2<a name=\"fr-core-circonstances-sortie-2\"> </a></td><td>Mesure disciplinaire</td></tr><tr><td style=\"white-space:nowrap\">3<a name=\"fr-core-circonstances-sortie-3\"> </a></td><td>Décision médicale</td></tr><tr><td style=\"white-space:nowrap\">4<a name=\"fr-core-circonstances-sortie-4\"> </a></td><td>Contre avis médical</td></tr><tr><td style=\"white-space:nowrap\">5<a name=\"fr-core-circonstances-sortie-5\"> </a></td><td>en attente d'examen</td></tr><tr><td style=\"white-space:nowrap\">6<a name=\"fr-core-circonstances-sortie-6\"> </a></td><td>Convenance personnelle</td></tr><tr><td style=\"white-space:nowrap\">R<a name=\"fr-core-circonstances-sortie-R\"> </a></td><td>Essai (contexte psychiatrique)</td></tr><tr><td style=\"white-space:nowrap\">E<a name=\"fr-core-circonstances-sortie-E\"> </a></td><td>Evasion</td></tr><tr><td style=\"white-space:nowrap\">F<a name=\"fr-core-circonstances-sortie-F\"> </a></td><td>Fugue</td></tr></table></div>"
"div" : "<div xmlns=\"http://www.w3.org/1999/xhtml\"><p>This case-sensitive code system <code>https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie</code> defines the following codes:</p><table class=\"codes\"><tr><td style=\"white-space:nowrap\"><b>Code</b></td><td><b>Display</b></td></tr><tr><td style=\"white-space:nowrap\">2<a name=\"fr-core-circonstances-sortie-2\"> </a></td><td>Mesure disciplinaire</td></tr><tr><td style=\"white-space:nowrap\">3<a name=\"fr-core-circonstances-sortie-3\"> </a></td><td>Décision médicale</td></tr><tr><td style=\"white-space:nowrap\">4<a name=\"fr-core-circonstances-sortie-4\"> </a></td><td>Contre avis médical</td></tr><tr><td style=\"white-space:nowrap\">5<a name=\"fr-core-circonstances-sortie-5\"> </a></td><td>en attente d'examen</td></tr><tr><td style=\"white-space:nowrap\">6<a name=\"fr-core-circonstances-sortie-6\"> </a></td><td>Convenance personnelle</td></tr><tr><td style=\"white-space:nowrap\">R<a name=\"fr-core-circonstances-sortie-R\"> </a></td><td>Essai (contexte psychiatrique)</td></tr><tr><td style=\"white-space:nowrap\">E<a name=\"fr-core-circonstances-sortie-E\"> </a></td><td>Evasion</td></tr><tr><td style=\"white-space:nowrap\">F<a name=\"fr-core-circonstances-sortie-F\"> </a></td><td>Fugue</td></tr></table></div>"
},
"url" : "http://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie",
"url" : "https://hl7.fr/ig/fhir/core/CodeSystem/fr-core-circonstances-sortie",
"version" : "2.0.0",
"name" : "FRCoreCodeSystemCirconstancesSortie",
"title" : "FR Core CodeSystem Circonstances Sortie",
"status" : "draft",
"date" : "2023-11-06T13:13:47+00:00",
"date" : "2023-11-08T15:32:47+00:00",
"publisher" : "Interop'Santé",
"contact" : [{
"name" : "Interop'Santé",
Expand Down
Loading

0 comments on commit 3cf814a

Please sign in to comment.