diff --git a/FHIR-us-ccda.xml b/FHIR-us-ccda.xml
index 5d8b9b10..e8045a67 100644
--- a/FHIR-us-ccda.xml
+++ b/FHIR-us-ccda.xml
@@ -26,6 +26,7 @@
+
@@ -36,6 +37,8 @@
+
+
@@ -91,6 +94,7 @@
+
@@ -160,19 +164,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/_gencontinuous.bat b/_gencontinuous.bat
new file mode 100644
index 00000000..ca2867a5
--- /dev/null
+++ b/_gencontinuous.bat
@@ -0,0 +1,2 @@
+@ECHO OFF
+CALL ./_genonce.bat -watch
\ No newline at end of file
diff --git a/_gencontinuous.sh b/_gencontinuous.sh
new file mode 100644
index 00000000..b9ac5933
--- /dev/null
+++ b/_gencontinuous.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./_genonce.sh -watch
diff --git a/_genonce.sh b/_genonce.sh
index 38efcb44..4f981f05 100755
--- a/_genonce.sh
+++ b/_genonce.sh
@@ -14,6 +14,8 @@ fi
echo "$txoption"
+export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -Dfile.encoding=UTF-8"
+
publisher=$input_cache_path/$publisher_jar
if test -f "$publisher"; then
java -jar $publisher -ig . $txoption $*
diff --git a/_updatePublisher.bat b/_updatePublisher.bat
new file mode 100644
index 00000000..67aebf58
--- /dev/null
+++ b/_updatePublisher.bat
@@ -0,0 +1,219 @@
+@ECHO OFF
+
+SETLOCAL
+
+SET dlurl=https://github.com/HL7/fhir-ig-publisher/releases/latest/download/publisher.jar
+SET publisher_jar=publisher.jar
+SET input_cache_path=%CD%\input-cache\
+SET skipPrompts=false
+
+SET scriptdlroot=https://raw.githubusercontent.com/HL7/ig-publisher-scripts/main
+SET update_bat_url=%scriptdlroot%/_updatePublisher.bat
+SET gen_bat_url=%scriptdlroot%/_genonce.bat
+SET gencont_bat_url=%scriptdlroot%/_gencontinuous.bat
+SET gencont_sh_url=%scriptdlroot%/_gencontinuous.sh
+SET gen_sh_url=%scriptdlroot%/_genonce.sh
+SET update_sh_url=%scriptdlroot%/_updatePublisher.sh
+
+IF "%~1"=="/f" SET skipPrompts=y
+
+
+ECHO.
+ECHO Checking internet connection...
+PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
+ECHO We're offline, nothing to do...
+GOTO end
+
+:isonline
+ECHO We're online
+
+
+:processflags
+SET ARG=%1
+IF DEFINED ARG (
+ IF "%ARG%"=="-f" SET FORCE=true
+ IF "%ARG%"=="--force" SET FORCE=true
+ SHIFT
+ GOTO processflags
+)
+
+FOR %%x IN ("%CD%") DO SET upper_path=%%~dpx
+
+ECHO.
+IF NOT EXIST "%input_cache_path%%publisher_jar%" (
+ IF NOT EXIST "%upper_path%%publisher_jar%" (
+ SET jarlocation="%input_cache_path%%publisher_jar%"
+ SET jarlocationname=Input Cache
+ ECHO IG Publisher is not yet in input-cache or parent folder.
+ REM we don't use jarlocation below because it will be empty because we're in a bracketed if statement
+ GOTO create
+ ) ELSE (
+ ECHO IG Publisher FOUND in parent folder
+ SET jarlocation="%upper_path%%publisher_jar%"
+ SET jarlocationname=Parent folder
+ GOTO upgrade
+ )
+) ELSE (
+ ECHO IG Publisher FOUND in input-cache
+ SET jarlocation="%input_cache_path%%publisher_jar%"
+ SET jarlocationname=Input Cache
+ GOTO upgrade
+)
+
+:create
+IF DEFINED FORCE (
+ MKDIR "%input_cache_path%" 2> NUL
+ GOTO download
+)
+
+IF "%skipPrompts%"=="y" (
+ SET create=Y
+) ELSE (
+ SET /p create="Ok? (Y/N) "
+)
+IF /I "%create%"=="Y" (
+ ECHO Will place publisher jar here: %input_cache_path%%publisher_jar%
+ MKDIR "%input_cache_path%" 2> NUL
+ GOTO download
+)
+GOTO done
+
+:upgrade
+IF "%skipPrompts%"=="y" (
+ SET overwrite=Y
+) ELSE (
+ SET /p overwrite="Overwrite %jarlocation%? (Y/N) "
+)
+
+IF /I "%overwrite%"=="Y" (
+ GOTO download
+)
+GOTO done
+
+:download
+ECHO Downloading most recent publisher to %jarlocationname% - it's ~100 MB, so this may take a bit
+
+FOR /f "tokens=4-5 delims=. " %%i IN ('ver') DO SET VERSION=%%i.%%j
+IF "%version%" == "10.0" GOTO win10
+IF "%version%" == "6.3" GOTO win8.1
+IF "%version%" == "6.2" GOTO win8
+IF "%version%" == "6.1" GOTO win7
+IF "%version%" == "6.0" GOTO vista
+
+ECHO Unrecognized version: %version%
+GOTO done
+
+:win10
+CALL POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%dlurl%\",\"%jarlocation%\") } else { Invoke-WebRequest -Uri "%dlurl%" -Outfile "%jarlocation%" }
+
+GOTO done
+
+:win7
+rem this may be triggering the antivirus - bitsadmin.exe is a known threat
+rem CALL bitsadmin /transfer GetPublisher /download /priority normal "%dlurl%" "%jarlocation%"
+
+rem this didn't work in win 10
+rem CALL Start-BitsTransfer /priority normal "%dlurl%" "%jarlocation%"
+
+rem this should work - untested
+call (New-Object Net.WebClient).DownloadFile('%dlurl%', '%jarlocation%')
+GOTO done
+
+:win8.1
+:win8
+:vista
+GOTO done
+
+
+
+:done
+
+
+
+
+ECHO.
+ECHO Updating scripts
+IF "%skipPrompts%"=="y" (
+ SET updateScripts=Y
+) ELSE (
+ SET /p updateScripts="Update scripts? (Y/N) "
+)
+IF /I "%updateScripts%"=="Y" (
+ GOTO scripts
+)
+GOTO end
+
+
+:scripts
+
+REM Download all batch files (and this one with a new name)
+
+SETLOCAL DisableDelayedExpansion
+
+
+
+:dl_script_1
+ECHO Updating _updatePublisher.sh
+call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%update_sh_url%\",\"_updatePublisher.new.sh\") } else { Invoke-WebRequest -Uri "%update_sh_url%" -Outfile "_updatePublisher.new.sh" }
+if %ERRORLEVEL% == 0 goto upd_script_1
+echo "Errors encountered during download: %errorlevel%"
+goto dl_script_2
+:upd_script_1
+start copy /y "_updatePublisher.new.sh" "_updatePublisher.sh" ^&^& del "_updatePublisher.new.sh" ^&^& exit
+
+
+:dl_script_2
+ECHO Updating _genonce.bat
+call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gen_bat_url%\",\"_genonce.new.bat\") } else { Invoke-WebRequest -Uri "%gen_bat_url%" -Outfile "_genonce.bat" }
+if %ERRORLEVEL% == 0 goto upd_script_2
+echo "Errors encountered during download: %errorlevel%"
+goto dl_script_3
+:upd_script_2
+start copy /y "_genonce.new.bat" "_genonce.bat" ^&^& del "_genonce.new.bat" ^&^& exit
+
+:dl_script_3
+ECHO Updating _gencontinuous.bat
+call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gencont_bat_url%\",\"_gencontinuous.new.bat\") } else { Invoke-WebRequest -Uri "%gencont_bat_url%" -Outfile "_gencontinuous.bat" }
+if %ERRORLEVEL% == 0 goto upd_script_3
+echo "Errors encountered during download: %errorlevel%"
+goto dl_script_4
+:upd_script_3
+start copy /y "_gencontinuous.new.bat" "_gencontinuous.bat" ^&^& del "_gencontinuous.new.bat" ^&^& exit
+
+
+:dl_script_4
+ECHO Updating _genonce.sh
+call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gen_sh_url%\",\"_genonce.new.sh\") } else { Invoke-WebRequest -Uri "%gen_sh_url%" -Outfile "_genonce.sh" }
+if %ERRORLEVEL% == 0 goto upd_script_4
+echo "Errors encountered during download: %errorlevel%"
+goto dl_script_5
+:upd_script_4
+start copy /y "_genonce.new.sh" "_genonce.sh" ^&^& del "_genonce.new.sh" ^&^& exit
+
+:dl_script_5
+ECHO Updating _gencontinuous.sh
+call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gencont_sh_url%\",\"_gencontinuous.new.sh\") } else { Invoke-WebRequest -Uri "%gencont_sh_url%" -Outfile "_gencontinuous.sh" }
+if %ERRORLEVEL% == 0 goto upd_script_5
+echo "Errors encountered during download: %errorlevel%"
+goto dl_script_6
+:upd_script_5
+start copy /y "_gencontinuous.new.sh" "_gencontinuous.sh" ^&^& del "_gencontinuous.new.sh" ^&^& exit
+
+
+
+:dl_script_6
+ECHO Updating _updatePublisher.bat
+call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%update_bat_url%\",\"_updatePublisher.new.bat\") } else { Invoke-WebRequest -Uri "%update_bat_url%" -Outfile "_updatePublisher.new.bat" }
+if %ERRORLEVEL% == 0 goto upd_script_6
+echo "Errors encountered during download: %errorlevel%"
+goto end
+:upd_script_6
+start copy /y "_updatePublisher.new.bat" "_updatePublisher.bat" ^&^& del "_updatePublisher.new.bat" ^&^& exit
+
+
+:end
+
+
+IF "%skipPrompts%"=="true" (
+ PAUSE
+)
diff --git a/_updatePublisher.sh b/_updatePublisher.sh
index a817ce3e..0f9ecbed 100755
--- a/_updatePublisher.sh
+++ b/_updatePublisher.sh
@@ -25,18 +25,13 @@ while [ "$#" -gt 0 ]; do
case $1 in
-f|--force) FORCE=true ;;
-y|--yes) skipPrompts=true ; FORCE=true ;;
- -s|--skip) skipPrompts=true ;;
*) echo "Unknown parameter passed: $1. Exiting"; exit 1 ;;
esac
shift
done
echo "Checking internet connection"
-case "$OSTYPE" in
- linux-gnu* ) ping tx.fhir.org -4 -c 1 -w 1000 >/dev/null ;;
- darwin* ) ping tx.fhir.org -c 1 >/dev/null ;;
- *) echo "unknown: $OSTYPE"; exit 1 ;;
-esac
+curl -sSf tx.fhir.org > /dev/null
if [ $? -ne 0 ] ; then
echo "Offline (or the terminology server is down), unable to update. Exiting"
@@ -44,11 +39,11 @@ if [ $? -ne 0 ] ; then
fi
if [ ! -d "$input_cache_path" ] ; then
- if [ $skipPrompts != true ]; then
+ if [ $FORCE != true ]; then
echo "$input_cache_path does not exist"
message="create it?"
read -r -p "$message" response
- else
+ else
response=y
fi
fi
@@ -90,14 +85,48 @@ if [[ $skipPrompts == false ]]; then
fi
read -r -p "$message" response
else
- if [[ $FORCE == true ]]; then
- response=y
- fi
+ response=y
fi
-if [[ $response =~ ^[yY].*$ ]]; then
+if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then
echo "Downloading most recent publisher to $jarlocationname - it's ~100 MB, so this may take a bit"
curl -L $dlurl -o "$jarlocation" --create-dirs
else
echo cancelled publisher update
fi
+
+if [[ $skipPrompts != true ]]; then
+ message="Update scripts? (enter 'y' or 'Y' to continue, any other key to cancel)?"
+ read -r -p "$message" response
+ fi
+
+if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then
+ echo "Downloading most recent scripts "
+
+ curl -L $update_bat_url -o /tmp/_updatePublisher.new
+ cp /tmp/_updatePublisher.new _updatePublisher.bat
+ rm /tmp/_updatePublisher.new
+
+ curl -L $gen_bat_url -o /tmp/_genonce.new
+ cp /tmp/_genonce.new _genonce.bat
+ rm /tmp/_genonce.new
+
+ curl -L $gencont_bat_url -o /tmp/_gencontinuous.new
+ cp /tmp/_gencontinuous.new _gencontinuous.bat
+ rm /tmp/_gencontinuous.new
+
+ curl -L $gencont_sh_url -o /tmp/_gencontinuous.new
+ cp /tmp/_gencontinuous.new _gencontinuous.sh
+ chmod +x _gencontinuous.sh
+ rm /tmp/_gencontinuous.new
+
+ curl -L $gen_sh_url -o /tmp/_genonce.new
+ cp /tmp/_genonce.new _genonce.sh
+ chmod +x _genonce.sh
+ rm /tmp/_genonce.new
+
+ curl -L $update_sh_url -o /tmp/_updatePublisher.new
+ cp /tmp/_updatePublisher.new _updatePublisher.sh
+ chmod +x _updatePublisher.sh
+ rm /tmp/_updatePublisher.new
+fi
diff --git a/input/hl7.fhir.us.ccda.xml b/input/hl7.fhir.us.ccda.xml
index 15a5b420..61b80bbb 100644
--- a/input/hl7.fhir.us.ccda.xml
+++ b/input/hl7.fhir.us.ccda.xml
@@ -11,7 +11,7 @@
-
+
@@ -817,91 +817,151 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -920,7 +980,7 @@
-
+
diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
index 83c7ddcc..2772f35b 100644
--- a/input/ignoreWarnings.txt
+++ b/input/ignoreWarnings.txt
@@ -8,34 +8,5 @@ A definition for CodeSystem 'urn:oid:2.16.840.1.113883.3.247.1.1' could not be f
Unknown Code '486' in the system%
-# LOINC Imaging Document Codes value set marked as incomplete (and also too large), but has all (6343) codes from 2022-07 release of http://cts.nlm.nih.gov/fhir/ValueSet/1.3.6.1.4.1.12009.10.2.5
-INFORMATION: ValueSet/1.3.6.1.4.1.12009.10.2.5: ValueSet.compose.include[0]: The value set include has too many codes to validate (6,342), so each individual code has not been checked
-INFORMATION: ValueSet.where(id = '1.3.6.1.4.1.12009.10.2.5'): The value set expansion is too large, and only a subset has been displayed
-
-
-# Draft, trial-use and external reference elements in examples prior to 2023 ballot
-Reference to draft CodeSystem http://terminology.hl7.org/CodeSystem/organization-type|0.1.0
-Reference to draft CodeSystem http://terminology.hl7.org/CodeSystem/condition-category|0.5.0
-
-
# Missing performers in examples prior to 2023 ballot
Best Practice Recommendation: In general, all observations should have a performer
-
-
-# Publisher is adding these modifier extensions - https://chat.fhir.org/#narrow/stream/179252-IG-creation/topic/Regression.20in.20ConceptMap
-The modifier extension http://hl7.org/fhir/1.0/StructureDefinition/extension-ConceptMap.element.target.equivalence from FHIR version 1.0 is not allowed to be used at this point (allowed = e:ConceptMap.element.target; this element is [[BackboneElement, ConceptMap.group.element.target]; this is a warning since contexts may be renamed between FHIR versions)
-
-
-# Publisher is not checking all SNOMED/LOINC codes in ConceptMap
-Source Code System http://snomed.info/sct doesn't have all content (content = not-present), so the source codes cannot be checked
-Target Code System http://snomed.info/sct doesn't have all content (content = not-present), so the target codes cannot be checked
-Source Code System http://loinc.org doesn't have all content (content = not-present), so the source codes cannot be checked
-Target Code System http://loinc.org doesn't have all content (content = not-present), so the target codes cannot be checked
-
-
-# Poor / Buggy Displays from AddressUse Code System
-WARNING: ConceptMap/CF-TelecomUse: ConceptMap.group[0].element[7].code: The source display 'mobile contact' for the code 'http://terminology.hl7.org/CodeSystem/v3-AddressUse|2.1.0#MC' is not valid. Possible displays: 'mobile contact)'
-
-
-# Deprecated extension is still needed in R4
-The extension http://hl7.org/fhir/StructureDefinition/composition-clinicaldocument-versionNumber|5.1.0-cibuild is deprecated
\ No newline at end of file
diff --git a/input/images/CF_allergy_example.png b/input/images/CF_allergy_example.png
deleted file mode 100644
index fa87d87c..00000000
Binary files a/input/images/CF_allergy_example.png and /dev/null differ
diff --git a/input/images/CF_immunization_example.png b/input/images/CF_immunization_example.png
deleted file mode 100644
index 2c73b52b..00000000
Binary files a/input/images/CF_immunization_example.png and /dev/null differ
diff --git a/input/images/CF_medication_example.png b/input/images/CF_medication_example.png
deleted file mode 100644
index 8b9e32a5..00000000
Binary files a/input/images/CF_medication_example.png and /dev/null differ
diff --git a/input/images/CF_patient_example.png b/input/images/CF_patient_example.png
deleted file mode 100644
index 0ffc4858..00000000
Binary files a/input/images/CF_patient_example.png and /dev/null differ
diff --git a/input/images/CF_problem_example.png b/input/images/CF_problem_example.png
deleted file mode 100644
index 82b315cd..00000000
Binary files a/input/images/CF_problem_example.png and /dev/null differ
diff --git a/input/images/CF_procedure_example.png b/input/images/CF_procedure_example.png
deleted file mode 100644
index 730ba001..00000000
Binary files a/input/images/CF_procedure_example.png and /dev/null differ
diff --git a/input/images/colors.css b/input/images/colors.css
new file mode 100644
index 00000000..43099b8d
--- /dev/null
+++ b/input/images/colors.css
@@ -0,0 +1,128 @@
+td, th {
+ border: 1px solid black!important;
+}
+
+.codeArea {
+ font-family: 'Courier New', Courier, monospace;
+ white-space: pre;
+ background: #f5f2f0; /* FHIR prism template */
+ border: 1px solid #ccc;
+ border-radius: 4px;
+}
+
+.comment {
+ color: #999;
+}
+.field {
+ color: #2f6f9f;
+}
+.attrib {
+ color: #690;
+}
+.value {
+ color: #d44950;
+}
+
+mark span{
+ color: black !important;
+}
+
+.color10 {
+ background-color: #ffff00ff;
+}
+.color11 {
+ background-color: #7cfc00ff;
+}
+.color12 {
+ background-color: #00ffffff;
+}
+.color13 {
+ background-color: #ffc0cbff;
+}
+.color14 {
+ background-color: #87cefaff;
+}
+.color15 {
+ background-color: #c0c0c0ff;
+}
+.color16 {
+ background-color: #eee8aaff;
+}
+.color17 {
+ background-color: #ffa500ff;
+}
+.color18 {
+ background-color: #ffd700ff;
+}
+.color19 {
+ background-color: #9acd32ff;
+}
+.color20 {
+ background-color: #1e90ffff;
+}
+.color21 {
+ background-color: #deb887ff;
+}
+.color22{
+ background-color: #dda0ddff;
+}
+.color23 {
+ background-color: #ff6347ff;
+}
+.color24 {
+ background-color: #b8860bff;
+}
+.color25 {
+ background-color: #808080ff;
+}
+.color26 {
+ background-color: #2e8b57ff;
+}
+.color27 {
+ background-color: #4682b4ff;
+}
+.color28 {
+ background-color: #808000ff;
+}
+.color29 {
+ background-color: #5f9ea0ff;
+}
+.color30 {
+ background-color: #ba55d3ff;
+}
+.color31 {
+ background-color: #d3d3d3ff;
+}
+.color32 {
+ background-color: #d2691eff;
+}
+.color33 {
+ background-color: #ffe4c4ff;
+}
+.color34 {
+ background-color: #ff7f50ff;
+}
+.color35 {
+ background-color: #98fb98ff;
+}
+.color36 {
+ background-color: #ff00ffff;
+}
+.color37 {
+ background-color: #778899ff;
+}
+.color38 {
+ background-color: #ff4500ff;
+}
+.color39 {
+ background-color: #20b2aaff;
+}
+.color40 {
+ background-color: #9370dbff;
+}
+.color41 {
+ background-color: #ff8c00ff;
+}
+.color42 {
+ background-color: #ff0000ff;
+}
\ No newline at end of file
diff --git a/input/includes/CF_allergy_example.md b/input/includes/CF_allergy_example.md
deleted file mode 100644
index eafadde6..00000000
--- a/input/includes/CF_allergy_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_immunization_example.md b/input/includes/CF_immunization_example.md
deleted file mode 100644
index 2ddc3c5c..00000000
--- a/input/includes/CF_immunization_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_medication_example.md b/input/includes/CF_medication_example.md
deleted file mode 100644
index 8dfdafae..00000000
--- a/input/includes/CF_medication_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_patient_example.md b/input/includes/CF_patient_example.md
deleted file mode 100644
index 8d3bd10c..00000000
--- a/input/includes/CF_patient_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_problem_example.md b/input/includes/CF_problem_example.md
deleted file mode 100644
index b3e7276b..00000000
--- a/input/includes/CF_problem_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_procedure_example.md b/input/includes/CF_procedure_example.md
deleted file mode 100644
index a073501a..00000000
--- a/input/includes/CF_procedure_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/examplebutton.html b/input/includes/examplebutton.html
deleted file mode 100644
index 6abd4f05..00000000
--- a/input/includes/examplebutton.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% assign target = include.example | split: "." | first %}
-{% assign file_type = include.example | split: "." | last %}
-
-
-
-
-
- {% if file_type =="xhtml" or file_type =="html" or file_type =="md"%}
- {% include {{include.example}} %}
- {% else %}
- {% include {{target}}.md %}
- {% endif %}
-
-
-
\ No newline at end of file
diff --git a/input/includes/menu.xml b/input/includes/menu.xml
index c5fa711d..b6ca240e 100644
--- a/input/includes/menu.xml
+++ b/input/includes/menu.xml
@@ -24,6 +24,9 @@
#### Links to example content
The consensus mapping example developed through multiple vendors are available below:
* [Allergy CDA example](./Binary-CF-allergy.html)
-* [Allergy FHIR example](./AllergyIntolerance-CF-allergy.html)
-
-### Prior work and Expanded Spreadsheets
-
-As reviewed in the methodology, a more comprehensive review was performed via spreadsheets. These spreadsheets have been consolidated and further revised in the tables above but are provided for [reference here](https://github.com/HL7/ccda-on-fhir/blob/master/mappings/CF/CCDA-FHIR%20Allergy.csv)
\ No newline at end of file
+* [Allergy FHIR example](./AllergyIntolerance-CF-allergy.html)
\ No newline at end of file
diff --git a/input/pagecontent/CF-encounters.md b/input/pagecontent/CF-encounters.md
new file mode 100644
index 00000000..a66949fe
--- /dev/null
+++ b/input/pagecontent/CF-encounters.md
@@ -0,0 +1,162 @@
+
+
+This page provides a mapping from CDA to FHIR. For guidance on how to read the table below, see [Reading the C-CDA ↔ FHIR Mapping Pages](./mappingGuidance.html).
+
+Encounter Activities in the Encounters Section (or elsewhere in the document, such as `` on Clinical Notes) correspond FHIR Encounter resources. If the document itself contains a `componentOf/encompassingEncounter`, this should also be converted to a FHIR Encounter resource. In all cases, when the same encounter is referenced multiple times (such as the `encompassingEncounter` and an Encounter Activity in the Encounters Section containing the same ``), it should be converted to a single FHIR resource.
+
+### C-CDA Encounter to FHIR
+(b) - indicates element is only present in Encounter Activity in the body of the document (h) - indicates element is only present in EncompassingEncounter in the header of the document
+
+|C-CDA¹ [Encounter Activity](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-EncounterActivity.html) or [EncompassingEncounter](https://hl7.org/cda/stds/core/2.0.0-sd-snapshot1/StructureDefinition-EncompassingEncounter.html)|FHIR [Encounter](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-encounter.html)|Transform Steps|
+|:----|:----|:----|
+|/id|.identifier|[CDA id ↔ FHIR identifier](mappingGuidance.html#cda-id--fhir-identifier)|
+|/code |.class|Only the V3 ActCode system, which may be present in the root element or any ``. Other code systems may map to V3 ActCode (for example CPT codes 99211-99215 map to `AMB`, 99221-99223 to `IMP`, 99281-99285 to `EMER`, etc), but if this mapping is not possible, use the [Data Absent Reason](http://hl7.org/fhir/StructureDefinition/data-absent-reason) extension.|
+|/code|.type|The remaining codes besides V3 ActCode [CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)
+|/statusCode (b)|.status|[CDA → FHIR encounter status](ConceptMap-CF-EncounterStatus.html) **Note:** statusCode is optional in C-CDA. If missing, fallback to effectiveTime mapping.
+|/effectiveTime|.status|If effectiveTime is a single timestamp or contains a high, status = `"finished"`. If low is present and high is missing, the status may be `"in-progress"` but implementers may choose to evaluate historical values as `"finished"` or `"unknown"` if appropriate.
+|/effectiveTime/@value /effectiveTime/low/@value|.period.start|[CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)
+|/effectiveTime/high/@value|.period.end|[CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)
+|/sdtc:dischargeDispositionCode (b) /dischargeDispositionCode (h)|.hospialization.dischargeDisposition|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)
+|/performer (b) /encounterParticipant (h)|.participant|[C-CDA → FHIR Participation](CF-participations.html)
+|/performer/sdtc:functionCode (b)|.participant.type|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)
+|/participant[@typeCode="LOC"] (b) /location (h)|.location|[C-CDA → FHIR Participation](CF-participations.html)
+|**[Indication](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-Indication.html)** (b) /entryRelationship[@typeCode="RSON"]/observation|.reasonCode or .reasonReference|If the id of the indication references a problem in the document that has been converted to a FHIR resource, populate .reasonReference with a reference to that resource. Otherwise, map observation/value to .reasonCode. [CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)
+|**[Encounter Diagnosis](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-EncounterDiagnosis.html)** (b) /entryRelationship/act[code/@code="29308-4"]/observation|**[Encounter Diagnosis](https://hl7.org/fhir/us/core/StructureDefinition-us-core-condition-encounter-diagnosis.html)** & .diagnosis.condition|The observation maps identically to [CDA → FHIR Problems](./CF-problems.html). Since this is an encounter diagnosis, the `Observation.category` should be set to `encounter-diagnosis`.
+
+
+### Example: Encounter
+
+
\ No newline at end of file
diff --git a/input/pagecontent/CF-immunizations.md b/input/pagecontent/CF-immunizations.md
index e2a24354..1c69e028 100644
--- a/input/pagecontent/CF-immunizations.md
+++ b/input/pagecontent/CF-immunizations.md
@@ -1,18 +1,14 @@
-
+
This page provides a mapping from CDA to FHIR. For the FHIR to CDA mapping, please refer to [Immunizations FHIR → CDA](./FC-immunizations.html). For guidance on how to read the table below, see [Reading the C-CDA ↔ FHIR Mapping Pages](./mappingGuidance.html)
-Mapping is from `@moodCode="EVN"` (i.e. historical) immunizations, not `INT` (future / planned) immunizations.
+Mapping is from `@moodCode="EVN"` (i.e. historical) immunizations, not `INT` (future / planned) immunizations. For INT, use the MedicationRequest resource.
### C-CDA to FHIR
-|C-CDA¹ [Immunization Activity substanceAdministration](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-ImmunizationActivity.html)|FHIR [Immunization](http://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-immunization.html#profile)|Transform Steps|
+|C-CDA¹ [Immunization Activity substanceAdministration](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-ImmunizationActivity.html)|FHIR [Immunization](http://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-immunization.html#profile)|Transform Steps|
|:----|:----|:----|
|/@negationInd="true"||Set ```.status="not-done"``` when @negationInd="true"|
|/id|.identifier|[CDA id ↔ FHIR identifier](mappingGuidance.html#cda-id--fhir-identifier)|
@@ -25,29 +21,356 @@ Mapping is from `@moodCode="EVN"` (i.e. historical) immunizations, not `INT` (fu
|/consumable/manufacturedProduct/manufacturedMaterial/code|.vaccineCode|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)
|/consumable/manufacturedMaterial/lotNumberText|.lotNumber||
|/consumable/manufacturedMaterial/manufacturerOrganization|.manufacturer|
-|N/A|.primarySource|Since this is unavailable in CDA, when mapping to a FHIR profile that requires the element (such as USCore prior to Release 6), include a [data-absent-reason extension](http://hl7.org/fhir/StructureDefinition/data-absent-reason).
+|N/A|.primarySource|Since this is unavailable in CDA, when mapping to a FHIR profile that requires the element (such as USCore prior to Release 6), include a [data-absent-reason extension](http://hl7.org/fhir/StructureDefinition/data-absent-reason) such as 'unsupported'.
|/author|**[Provenance](http://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-provenance.html)**|[CDA ↔ FHIR Provenance](mappingGuidance.html#cda--fhir-provenance)|
|/author/time|.recorded|Earliest, if more than one. [CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)
|/performer|.performer|Set ```performer.function="AP"```
-|**[Immunization Refusal Reason](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-ImmunizationRefusalReason.html)** /entryRelationship[@typeCode="RSON"]²/observation/code (only if code is from ValueSet [No Immunization Reason](https://vsac.nlm.nih.gov/valueset/2.16.840.1.113883.1.11.19717/expansion/Latest))|.statusReason|[CDA refusal → FHIR statusReason](ConceptMap-CF-ImmunizationRefusal.html) Indicates the reason the immunization event was **not** performed. This is generally only used for the status of "not-done".|
-|**[Indication](http://hl7.org/cda/stds/ccda/draft1/StructureDefinition-2.16.840.1.113883.10.20.22.4.19.html)** /entryRelationship[@typeCode="RSON"]²/observation/value (only if observation/code is from ValueSet [Problem Type](https://vsac.nlm.nih.gov/valueset/2.16.840.1.113883.3.88.12.3221.7.2/expansion/Latest))|.reasonCode|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
-|**[Reaction](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-ReactionObservation.html)** /entryRelationship[@typeCode="MFST"]/observation/value|.reaction|It is recommended that reaction observation value be mapped to reaction detail (Observation) valueCodeable concept. Comments are welcome on how this may be best implemented.
-|**[Comment Activity](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-CommentActivity.html)** /entryRelationship/act[code/@code="48767-8"]/text|**[Annotation](https://hl7.org/fhir/datatypes.html#Annotation)** .note||
+|**[Immunization Refusal Reason](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-ImmunizationRefusalReason.html)** /entryRelationship[@typeCode="RSON"]²/observation/code (only if code is from ValueSet [No Immunization Reason](https://vsac.nlm.nih.gov/valueset/2.16.840.1.113883.1.11.19717/expansion/Latest))|.statusReason|[CDA refusal → FHIR statusReason](ConceptMap-CF-ImmunizationRefusal.html) Indicates the reason the immunization event was **not** performed. This is generally only used for the status of "not-done".|
+|**[Indication](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-Indication.html)** /entryRelationship[@typeCode="RSON"]²/observation/value (only if observation/code is from ValueSet [Problem Type](https://vsac.nlm.nih.gov/valueset/2.16.840.1.113883.3.88.12.3221.7.2/expansion/Latest))|.reasonCode|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
+|**[Reaction](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-ReactionObservation.html)** /entryRelationship[@typeCode="MFST"]/observation/value|.reaction|It is recommended that reaction observation value be mapped to reaction detail (Observation) valueCodeable concept. Comments are welcome on how this may be best implemented.
+|**[Comment Activity](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-CommentActivity.html)** /entryRelationship/act[code/@code="48767-8"]/text|**[Annotation](https://hl7.org/fhir/datatypes.html#Annotation)** .note|See [Comment → Annotation](mappingGuidance.html#comment--annotation)|
1\. XPath abbrievated for C-CDA Immunization Activity as: ClinicalDocument/component/structuredBody/component/section[code/@code="11369-6"]/entry/substanceAdministration
2\. Both indication and refusal reason are observations related by @typeCode="RSON". Typically templateIds should not be used to identify content, but the Indication template does not require a specific code. If the observation/code comes from ValueSet [No Immunization Reason](https://vsac.nlm.nih.gov/valueset/2.16.840.1.113883.1.11.19717/expansion/Latest), then it is clearly a refusal reason. If it comes from ValueSet [Problem Type](https://vsac.nlm.nih.gov/valueset/2.16.840.1.113883.3.88.12.3221.7.2/expansion/Latest), then it is an indication. But if the code comes from neither value set, the observation is *possibly* an indication, but the only way to know is to check the templateId.
-### Illustrative example
+### Example: Standard Immunization
-{% include examplebutton.html example="CF_immunization_example" b_title = "Click on Here To See Highlighted Example" %}
+
#### Links to example content
The consensus mapping example developed through multiple vendors are available below:
* [Immuniztion CDA example](./Binary-CF-immunization.html)
-* [Immuniztion FHIR example](./Immunization-CF-immunization.html)
-
-### Prior work and Expanded Spreadsheets
-
-As reviewed in the methodology, a more comprehensive review was performed via spreadsheets. These spreadsheets have been consolidated and further revised in the tables above but are provided for [reference here](https://github.com/HL7/ccda-on-fhir/blob/master/mappings/CF/CCDA-FHIR%20Immunization.csv)
\ No newline at end of file
+* [Immuniztion FHIR example](./Immunization-CF-immunization.html)
\ No newline at end of file
diff --git a/input/pagecontent/CF-index.md b/input/pagecontent/CF-index.md
index 26392e1f..092e2591 100644
--- a/input/pagecontent/CF-index.md
+++ b/input/pagecontent/CF-index.md
@@ -9,10 +9,16 @@
#### Available Maps
- [Allergies](CF-allergies.html)
+- [Encounters](CF-encounters.html)
- [Immunizations](CF-immunizations.html)
- [Medications](CF-medications.html)
+- [Notes](CF-notes.html)
+- [Participation](CF-participations.html) (Including Author, DataEnterer, Informant, Performer, Participant)
- [Patient](CF-patient.html)
- [Problems](CF-problems.html)
- [Procedures](CF-procedures.html)
+- [Results](CF-results.html)
+- [Social History](CF-social.html) (Including Smoking Status, Pregnancy Observation)
+- [Vital Signs](CF-vitals.html)
Please refer to [mapping background](mappingBackground.html) for more information how maps were selected and developed.
diff --git a/input/pagecontent/CF-medications.md b/input/pagecontent/CF-medications.md
index 76012b6e..01021b06 100644
--- a/input/pagecontent/CF-medications.md
+++ b/input/pagecontent/CF-medications.md
@@ -1,8 +1,4 @@
-
+
This page provides a mapping from CDA to FHIR. For the FHIR to CDA mapping, please refer to [Medications FHIR → CDA](./FC-medications.html). For guidance on how to read the table below, see [Reading the C-CDA ↔ FHIR Mapping Pages](./mappingGuidance.html)
@@ -23,9 +19,9 @@ The second `` represents the frequency and contains the attribute
The C-CDA Example Search site maintains a document of [Common Medication Frequencies](http://cdasearch.hl7.org/examples/view/9588687865c0f945a326364a9449321690c7a7ef) which can be cross-referenced with a similar table in FHIR's [Timing Data Type](http://hl7.org/fhir/R4/datatypes.html#Timing) to properly map CDA frequencies to FHIR timing values.
-### C-CDA to FHIR
+### C-CDA to FHIR (MedicationRequest)
-|C-CDA¹ [Medication Activity substanceAdministration](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-MedicationActivity.html)|FHIR [MedicationRequest](http://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-medicationrequest.html)|Transform Steps|
+|C-CDA¹ [Medication Activity substanceAdministration](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-MedicationActivity.html)|FHIR [MedicationRequest](http://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-medicationrequest.html)|Transform Steps|
|:----|:----|:----|
|/@negationInd="true"|set .doNotPerform=true||
|@moodCode|.intent|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept) [Mood to intent](ConceptMap-CF-MedActivityMood.html)|
@@ -34,33 +30,361 @@ The C-CDA Example Search site maintains a document of [Common Medication Frequen
|/effectiveTime[1]/@value|.dosageInstruction.timing.event|**Constraint**: Use this when effectiveTime@value is populated [CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)|
|/effectiveTime[1]/low|.dosageInstruction.timing.repeat.boundsPeriod.start|**Constraint**: Use this when effectiveTime/@value is not populated [CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)|
|/effectiveTime[1]/high|.dosageInstruction.timing.repeat.boundsPeriod.end|**Constraint**: Use this when effectiveTime/@value is not populated [CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)|
-|**Periodic Frequency** /effectiveTime[operator="A" and xsi:type="PIVL_TS"] .../@institutionSpecified .../period/@value .../period/@unit|.dosageInstruction.timing.repeat.frequency .dosageInstruction.timing.repeat.period .dosageInstruction.timing.repeat.periodUnit|Compare: [C-CDA Common Medication Frequencies](http://cdasearch.hl7.org/examples/view/9588687865c0f945a326364a9449321690c7a7ef) and [FHIR Timing Data Type](http://hl7.org/fhir/R4/datatypes.html#Timing)
+|**Periodic Frequency** /effectiveTime[operator="A" and xsi:type="PIVL_TS"] .../@institutionSpecified .../period/@value .../period/@unit|.dosageInstruction.timing.repeat.frequency .dosageInstruction.timing.repeat.period .dosageInstruction.timing.repeat.periodUnit|Compare: [C-CDA Common Medication Frequencies](http://cdasearch.hl7.org/examples/view/9588687865c0f945a326364a9449321690c7a7ef) and [FHIR Timing Data Type](http://hl7.org/fhir/R4/datatypes.html#Timing) to determine whether `frequency` or `period` should be used. If CDA `period` contains `low` and `high` (e.g. a range like 4-6 hours or 3-4 times a day), map `low` the same as `@value` (e.g. to `repeat.period` or `repeat.frequency`) and map `high` to `repeat.periodMax` or `repeat.frequencyMax` depending on whether it is a frequency or period.
|**Event-Based Timing** /effectiveTime[operator="A" and xsi:type="EIVL_TS"] .../event/@code .../offset|.dosageInstruction.timing.repeat.when .dosageInstruction.timing.repeat.offset|@code vocabulary matches .when CDA offset must be converted to minutes for FHIR
|/routeCode|.dosageInstruction.route|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
+|/approachSiteCode|.dosageInstruction.site|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
|/doseQuantity|.dosageInstruction.doseAndRate.doseQuantity|[CDA ↔ FHIR Quantity](mappingGuidance.html#cda--fhir-quantity)|
|/rateQuantity|.dosageInstruction.doseAndRate.rateQuantity|[CDA ↔ FHIR Quantity](mappingGuidance.html#cda--fhir-quantity)|
-|/consumable/manufacturedProduct/manufacturedMaterial/code|.medicationCodeableConcept|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
+|/maxDoseQuantity/numerator|.dosageInstruction.maxDosePerPeriod.numerator|[CDA ↔ FHIR Quantity](mappingGuidance.html#cda--fhir-quantity)|
+|/maxDoseQuantity/denominator|.dosageInstruction.maxDosePerPeriod.denominator|[CDA ↔ FHIR Quantity](mappingGuidance.html#cda--fhir-quantity)|
+|/administrationUnitCode|Medication.form|[See below](#c-cda-to-fhir-medication)
+|/consumable/manufacturedProduct/manufacturedMaterial/code|.medicationCodeableConcept OR .medicationReference|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept) Only one of these fields may be populated. When generating a Medication resource ([see below](#c-cda-to-fhir-medication)), use the medicationReference field.|
+|/consumable/manufacturedProduct/manufacturerOrganization|Medication.manufacturer|[See below](#c-cda-to-fhir-medication)
|/author|.requester & **[Provenance](http://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-procedure.html)**|[CDA ↔ FHIR Provenance](mappingGuidance.html#cda--fhir-provenance)|
|/author/time|.authoredOn|Earliest, if more than one. [CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)|
+|**[Drug Vehicle](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-DrugVehicle.html)** /participant[@typeCode="CSM"]/playingEntity/code|Medication.ingredient|[See below](#c-cda-to-fhir-medication)
+|**[Indication](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-Indication.html)** /entryRelationship[@typeCode="RSON"]/observation/value|.reasonCode|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
+|**[Free text sig](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-MedicationFreeTextSig.html)** /entryRelationship/substanceAdministration[code/@code="76662-6"]/text|.dosageInstruction.text||
+|**[Instruction Activity](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-Instruction.html)** /entryRelationship[@typeCode="SUBJ" and @inversionInd="true"]/act|.dosageInstruction.patientInstruction .dosageInstruction.additionalInstruction|act/text or act/code/originalText can map to patientInstructions. If coded, can map to additionalInstruction.
+|**[Supply Order](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-MedicationSupplyOrder.html)** /entryRelationship[@typeCode="REFR"]/substanceAdministration[@moodCode="INT"]||Note: moodCode=INT means supply, moodCode=EVN means dispense, which is not documented here.
+|../effectiveTime/high|.dispenseRequest.validityPeriod.end|[CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates) `low` would similarly map to `start`, but only high is called out in C-CDA.|
+|../repeatNumber|.dispenseRequest.numberOfRepeatsAllowed|**Caution:** in CDA, repeatNumber indicates total number of dispenses allowed. In FHIR, this field is exclusive of the original dispense. So the `numberOfRepeatsAllowed` will be one less than `repeatNumber`.
+|../quantity|.dispenseRequest.quantity|[CDA ↔ FHIR Quantity](mappingGuidance.html#cda--fhir-quantity)
+|**[Comment Activity](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-CommentActivity.html)** /entryRelationship/act[code/@code="48767-8"]/text|**[Annotation](https://hl7.org/fhir/datatypes.html#Annotation)** .note|See [Comment → Annotation](mappingGuidance.html#comment--annotation)|
|/precondition|.asNeededBoolean = true|The presence of a precondition element indicates asNeededBoolean should be true. More complex maps may be possible with .asNeededCodeableConcept.|
-|**[Indication](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-Indication.html)** /entryRelationship[@typeCode="RSON"]/observation/value|.reasonCode|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
-|**[Free text sig](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-MedicationFreeTextSig.html)** /entryRelationship/substanceAdministration[code/@code="76662-6"]/text|.dosageInstruction.text||
-|**[Instruction Activity](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-Instruction.html)** /entryRelationship[@typeCode="SUBJ" and @inversionInd="true"]/act|.dosageInstruction.patientInstruction .dosageInstruction.additionalInstruction|act/text or act/code/originalText can map to patientInstructions. If coded, can map to additionalInstruction.
-|**[Comment Activity](https://hl7.org/cda/us/ccda/2024Jan/StructureDefinition-CommentActivity.html)** /entryRelationship/act[code/@code="48767-8"]/text|**[Annotation](https://hl7.org/fhir/datatypes.html#Annotation)** .note||
1\. XPath abbrievated for C-CDA Medication Activity as: ClinicalDocument/component/structuredBody/component/section[code/@code="10160-0"]/entry/substanceAdministration
+### C-CDA to FHIR (Medication)
+MedicationRequest (and other resources) may represent the medication as a simple CodeableConcept. But when additional information about the medication needs to be conveyed, a Medication resource should be created instead and referenced by the MedicationRequest resource. Implementers may also opt to always create Medication resources.
-### Illustrative example
+|C-CDA¹ [Medication Activity substanceAdministration](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-MedicationActivity.html)|FHIR [Medication](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-medication.html)|Transform Steps|
+|:----|:----|:----|
+|/administrationUnitCode|.form|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)
+|/consumable/manufacturedProduct/manufacturedMaterial/code|.code|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)|
+|/consumable/manufacturedProduct/manufacturerOrganization|**[Organization](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-organization.html)** .manufacturer|
+|**[Drug Vehicle](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-DrugVehicle.html)** /participant[@typeCode="CSM"]/playingEntity/code|.ingredient.itemCodeableConcept|Set `.isActive = false` [CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept)
+
+### Example
+
+
+Note: The following shows a MedicationRequest resource with a Medication resource embedded in its contained property. This was done for ease of creating a single, visual, highlighted example, but implementers may choose to create separate, external resources according to their own policy.
-{% include examplebutton.html example="CF_medication_example" b_title = "Click on Here To See Highlighted Example" %}
+
#### Links to example content
The consensus mapping example developed through multiple vendors are available below:
* [Medication CDA example](./Binary-CF-medication.html)
-* [MedicationRequest FHIR example](./MedicationRequest-CF-medication.html)
-
-### Prior work and Expanded Spreadsheets
-
-As reviewed in the methodology, a more comprehensive review was performed via spreadsheets. These spreadsheets have been consolidated and further revised in the tables above but are provided for [reference here](https://github.com/HL7/ccda-on-fhir/blob/master/mappings/CF/CCDA-FHIR%20MedicationRequest.csv)
\ No newline at end of file
+* [MedicationRequest FHIR example](./MedicationRequest-CF-medication.html)
\ No newline at end of file
diff --git a/input/pagecontent/CF-notes.md b/input/pagecontent/CF-notes.md
new file mode 100644
index 00000000..59824213
--- /dev/null
+++ b/input/pagecontent/CF-notes.md
@@ -0,0 +1,132 @@
+
+
+This page provides a mapping from CDA to FHIR. For guidance on how to read the table below, see [Reading the C-CDA ↔ FHIR Mapping Pages](./mappingGuidance.html).
+
+Clinical Notes may appear in their own section or as an entry in any open section. They are identified by an `` with a `` value of `34109-9`.
+
+### C-CDA to FHIR
+
+|C-CDA¹ [Note Activity](https://hl7.org/cda/us/ccda/3.0.0/StructureDefinition-NoteActivity.html)|[DocumentReference](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-documentreference.html)|Transform Steps|
+|:----|:----|:----|
+|/id|.identifier|[CDA id ↔ FHIR identifier](mappingGuidance.html#cda-id--fhir-identifier)|
+|/code/translation|.type|[CDA coding ↔ FHIR CodeableConcept](mappingGuidance.html#cda-coding--fhir-codeableconcept) **NOTE:** The root code in C-CDA is always `34109-9: Note`. A more specific code may be sent in translation which should be sent as the DocumentReference.type. If there is no translation, however, `34109-9` may be sent as the type.
+||.category|Set to `clinical-note`.
+|/text/@mediaType & /text/text()|.content.attachment.contentType & .content.attachment.data|If @mediaType is present, then representation should = B64, and the inner-text contents are embedded base64-encoded data. In this case, the mediaType and base64-encoded data map 1:1 to attachment.contentType and .data.
+|/text/reference/@value|.content.attachment.contentType & .content.attachment.data|Convert the narrative element referenced by @value following [Narrative Text](mappingGuidance.html#narrative-text) guidance and use `application/xhtml+xml` as the contentType. If the narrative has minimal markup (i.e. only `` and `` elements which can be converted to line breaks), it can be converted to `text/plain`. To send the raw CDA narrative without converting, use `application/cda+xml`, but this is less useful to receivers.
+|/effectiveTime|.context.period|[CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)
+|/author|.author|[C-CDA → FHIR Participation](CF-participations.html)
+|/author/time|.date|[CDA ↔ FHIR Time/Dates](mappingGuidance.html#cda--fhir-timedates)
+|/entryRelationship[@typeCode=COMP]/encounter or Parent `` element or ``|.context.encounter|C-CDA requires an encounter for notes, but allows for context conduction. If the Note Activity is in an entryRelationship chain that includes an Encounter Activity, use that. Otherwise, if the document contains an ``, that is the encounter for the note. [CDA → FHIR Encounters](CF-encounters.html)
+|/reference/externalDocument/id|.relatesTo.target.identifier|[CDA id ↔ FHIR identifier](mappingGuidance.html#cda-id--fhir-identifier)|
+
+### Example
+
+
CDA Note Activity Example
FHIR DocumentReference Resource
+
+
<actclassCode="ACT"moodCode="EVN">
+ <templateIdroot="2.16.840.1.113883.10.20.22.4.202"extension="2016-11-01"/>
+ <code
+ code="34109-9"
+ codeSystem="2.16.840.1.113883.6.1"
+ codeSystemName="LOINC"
+ displayName="Note">
+ <!-- Code must match or be equivalent to section code -->
+ <translation
+ code="11488-4"
+ codeSystem="2.16.840.1.113883.6.1"
+ codeSystemName="LOINC"
+ displayName="Consultation note"/>
+ </code>
+ <textmediaType="application/rtf"representation="B64">
+ e1xydGYxXGFuc2kgSGVsbG8gd29ybGQhfQ==
+ <referencevalue="#ConsultNote1"/>
+ </text>
+ <statusCodecode="completed"/>
+ <!-- Clinically-relevant time of the note -->
+ <effectiveTimevalue="20160908"/>
+ <!-- Author Participation -->
+ <author>
+ <templateIdroot="2.16.840.1.113883.10.20.22.4.119"/>
+ <!-- Time note was actually written -->
+ <timevalue="20160908083215-0500"/>
+ <assignedAuthor>
+ <!-- Full author information is elsewhere in the document . -->
+ <idroot="20cf14fb-b65c-4c8c-a54d-b0cca834c18c"/>
+ <!-- Becomes reference: Practitioner/DrSpecialist -->
+ <assignedPerson>
+ <name>
+ <prefix>Dr.</prefix>
+ <family>Specialist</family>
+ </name>
+ </assignedPerson>
+ </assignedAuthor>
+ </author>
+ <entryRelationshiptypeCode="COMP">
+ <!-- Creates an encounter with reference: Encounter/123 -->
+ <encounter>
+ ...
+ </encounter>
+ </entryRelationship>
+ <referencetypeCode="REFR">
+ <externalDocument>
+ <idroot="4dc41c26-43a4-48d9-b17e-067890006b29" />
+ </externalDocument>
+ </reference>
+</act>
\ No newline at end of file
diff --git a/input/pagecontent/CF-participations.md b/input/pagecontent/CF-participations.md
new file mode 100644
index 00000000..9b56c532
--- /dev/null
+++ b/input/pagecontent/CF-participations.md
@@ -0,0 +1,141 @@
+
+
+CDA defines participants in a number of elements, but the structure is often similar. These represent people (usually providers), organizations, and in some cases devices, locations, or some combination of all of the above.
+
+The FHIR equivalent of these fields are most commonly Practitioner, Organization, and PractitionerRole resources. Occasionally RelatedPerson, Device, or Location may be appropriate targets of CDA participants as well.
+
+### Comparison of CDA Participant elements
+
+The following table shows the common and unique fields of each CDA participation type. Since all (except Participant) are just specific flavors of participation, they can all be mapped to FHIR fairly similarly. For Participant mapping, the `@typeCode` and `@classCode` attributes are key in determining the type of FHIR resource to create.
+
+|[Author](https://hl7.org/cda/stds/core/2.0.0-sd/StructureDefinition-Author.html) (Non-Device)|[Data Enterer](https://hl7.org/cda/stds/core/2.0.0-sd/StructureDefinition-DataEnterer.html)|[Informant](https://hl7.org/cda/stds/core/2.0.0-sd/StructureDefinition-Informant.html)|[Performer](https://hl7.org/cda/stds/core/2.0.0-sd/StructureDefinition-Performer2.html) / [Performer (Service Event)](https://hl7.org/cda/stds/core/2.0.0-sd/StructureDefinition-Performer1.html)|[Participant](https://hl7.org/cda/stds/core/2.0.0-sd/StructureDefinition-Participant1.html) (ClinicalDocument)|[Participant](https://hl7.org/cda/stds/core/2.0.0-sd/StructureDefinition-Participant2.html) (Everywhere Else)|
+|:----|:----|:----|:----|:----|:----|
+|`@typeCode=AUT`|`@typeCode=ENT`|`@typeCode=INF`|`@typeCode=PRF`|@typeCode|@typeCode
+|functionCode|||sdtc:functionCode (no sdtc: in ServiceEvent)|functionCode|sdtc:functionCode
+|time|time||time|time|time
+||||modeCode (not in serviceEvent)||awarenessCode
+|**assignedAuthor**|**assignedEntity**|**assignedEntity** or **relatedEntity**|**assignedEntity**|**associatedEntity**|**participantRole**
+|`/@classCode=ASSIGNED`|`/@classCode=ASSIGNED`|/@classCode (assignedEntity = `ASSIGNED`)|/`@classCode=ASSIGNED`|/@classCode|/@classCode
+|/id|/id|/id (not in related)|/id|/id|/id
+|/code|/code|/code|/code|/code|/code
+|/addr|/addr|/addr|/addr|/addr|/addr
+|/telecom|/telecom|/telecom|/telecom|/telecom|/telecom
+|||/effectiveTime (only in related)
+||/sdtc:patient/id|/sdtc:patient/id (not in related)|/sdtc:patient/id
+|/**assignedPerson**|/**assignedPerson**|/**assignedPerson** or /**relatedPerson**|/**assignedPerson**|/**associatedPerson**|/**playingEntity**
+|//`@classCode=PSN`|//`@classCode=PSN`|//`@classCode=PSN`|//`@classCode=PSN`|//`@classCode=PSN`|//@classCode
+|//name|//name|//name|//name|//name|//name
+|//sdtc:desc|//sdtc:desc|//sdtc:desc|//sdtc:desc|//sdtc:desc|//desc
+|//asPatientRelationship/code|//asPatientRelationship/code|//asPatientRelationship/code|//asPatientRelationship/code|//asPatientRelationship/code
+||||||//code
+||||||//quantity
+||||||//sdtc:birthTime
+|/**representedOrganization**|/**representedOrganization**|/**representedOrganization** (not in related)|/**representedOrganization**|/**scopingOrganization**|/**scopingEntity**
+|/`@classCode=ORG`|/`@classCode=ORG`|/`@classCode=ORG`|/`@classCode=ORG`|/`@classCode=ORG`|//@classCode
+|//id|//id|//id|//id|//id|//id
+|//name|//name|//name|//name|//name|//desc
+|//telecom|//telecom|//telecom|//telecom|//telecom
+|//addr|//addr|//addr|//addr|//addr
+|//standardIndustryClassCode|//standardIndustryClassCode|//standardIndustryClassCode|//standardIndustryClassCode|//standardIndustryClassCode|//code
+|//asOrganizationPartOf (recursive)|//asOrganizationPartOf (recursive)|//asOrganizationPartOf (recursive)|//asOrganizationPartOf (recursive)|//asOrganizationPartOf
+
+### Mapping to different FHIR resource types
+
+The general process for creating FHIR resources from CDA Participations is as follows:
+
+- If the device element is populated (Author and Participation), create a **[Device](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-implantable-device.html)** resource
+- If the relatedPerson element is present (Informant only), the `` element is present, or Participant/@typeCode indicates a non-clinical Person, create a **[RelatedPerson](https://hl7.org/fhir/us/core/StructureDefinition-us-core-relatedperson.html)** resource. Note that RelatedPerson has no Organization component, so if CDA conveys an organization, an additional Person resource may need to be created with a `level4` link to RelatedPerson.
+- If the @typeCode (Participant only) indicates a physical location, create a **[Location](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-location.html)** resource.
+- If there is no person element present and only an organization element is present, create an **[Organization](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-organization.html)** resource.
+- If there is both a person element and either an organization or a person/code element (see below for more details), create a **[PractitionerRole](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-practitionerrole.html)** and **[Practitioner](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-practitioner.html)** resource. If there is an organization, also create an **[Organization](https://hl7.org/fhir/us/core/STU4/StructureDefinition-us-core-organization.html)** resource.
+
+In some cases a specific FHIR resource type may not be allowed (for example, a `.recorder` that can reference Practitioner or PractitionerRole but not Device). Implementers should be aware of requirements and make adjustments accordingly.
+
+### Mapping functionCode & time
+In most cases the `` and `
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_immunization_example.md b/input/includes/CF_immunization_example.md
deleted file mode 100644
index 2ddc3c5c..00000000
--- a/input/includes/CF_immunization_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_medication_example.md b/input/includes/CF_medication_example.md
deleted file mode 100644
index 8dfdafae..00000000
--- a/input/includes/CF_medication_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_patient_example.md b/input/includes/CF_patient_example.md
deleted file mode 100644
index 8d3bd10c..00000000
--- a/input/includes/CF_patient_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_problem_example.md b/input/includes/CF_problem_example.md
deleted file mode 100644
index b3e7276b..00000000
--- a/input/includes/CF_problem_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/CF_procedure_example.md b/input/includes/CF_procedure_example.md
deleted file mode 100644
index a073501a..00000000
--- a/input/includes/CF_procedure_example.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-An illustrative example with highlighting is shown above based on the consensus of mapping and guidance. Not all possible elements in CDA or FHIR may be represented. To access the content for the above example, click on the links below.
diff --git a/input/includes/examplebutton.html b/input/includes/examplebutton.html
deleted file mode 100644
index 6abd4f05..00000000
--- a/input/includes/examplebutton.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% assign target = include.example | split: "." | first %}
-{% assign file_type = include.example | split: "." | last %}
-