honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1399 - Issue with DiagnosticReport R4 narrative generation template

This commit is contained in:
James Agnew 2019-08-12 17:17:45 -04:00
parent 31e374ded8
commit c04f1d15d8
2 changed files with 270 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hapi-fhir-base/src/main/resources/ca/uhn/fhir/narrative/DiagnosticReport.html
View File

@ -60,10 +60,10 @@
<tr th:class="${rowStat.odd}? 'hapiTableOfValuesRowOdd' : 'hapiTableOfValuesRowEven'" class="hapiTableOfValuesRowOdd"> <tr th:class="${rowStat.odd}? 'hapiTableOfValuesRowOdd' : 'hapiTableOfValuesRowEven'" class="hapiTableOfValuesRowOdd">
<td> <td>
<th:block th:switch="${fhirVersion}"> <th:block th:switch="${fhirVersion}">
<th:block th:case="'DSTU1'"> <th:block th:case="'DSTU2' or 'DSTU2_HL7ORG' or 'DSTU2_1' or 'DSTU3'">
<th:block th:if="${not result.resource.name.textElement.empty}" th:text="${result.resource.name.textElement.value}"/> <th:block th:if="${not result.resource.code.textElement.empty}" th:text="${result.resource.code.textElement.value}"/>
<th:block th:if="${result.resource.name.textElement.empty} and ${not #lists.isEmpty(result.resource.name.coding)} and ${not result.resource.name.coding[0].empty} and ${not result.resource.name.coding[0].displayElement.empty}" th:text="${result.resource.name.coding[0].display}"/> <th:block th:if="${result.resource.code.textElement.empty} and ${not #lists.isEmpty(result.resource.code.coding)} and ${not result.resource.code.coding[0].empty} and ${not result.resource.code.coding[0].displayElement.empty}" th:text="${result.resource.code.coding[0].display}"/>
<th:block th:if="${result.resource.name.textElement.empty} and ${not #lists.isEmpty(result.resource.name.coding)} and ${not result.resource.name.coding[0].empty} and ${result.resource.name.coding[0].displayElement.empty}" th:text="'?'"/> <th:block th:if="${result.resource.code.textElement.empty} and ${not #lists.isEmpty(result.resource.code.coding)} and ${not result.resource.code.coding[0].empty} and ${result.resource.code.coding[0].displayElement.empty}" th:text="'?'"/>
</th:block> </th:block>
<th:block th:case="*"> <th:block th:case="*">
<th:block th:if="${not result.resource.code.textElement.empty}" th:text="${result.resource.code.textElement.value}"/> <th:block th:if="${not result.resource.code.textElement.empty}" th:text="${result.resource.code.textElement.value}"/>
@ -75,8 +75,16 @@
</td> </td>
<td th:narrative="${result.resource.value}">2.2 g/L</td> <td th:narrative="${result.resource.value}">2.2 g/L</td>
<td> <td>
<th:block th:switch="${fhirVersion}">
<th:block th:case="'DSTU2' or 'DSTU2_HL7ORG' or 'DSTU2_1' or 'DSTU3'">
<th:block th:if="${not result.resource.interpretation.textElement.empty}" th:text="${result.resource.interpretation.text}"/> <th:block th:if="${not result.resource.interpretation.textElement.empty}" th:text="${result.resource.interpretation.text}"/>
<th:block th:if="${result.resource.interpretation.textElement.empty} and ${not result.resource.interpretation.coding.empty} and ${not result.resource.interpretation.coding[0].displayElement.empty}" th:text="${result.resource.interpretation.coding[0].display}"/> <th:block th:if="${result.resource.interpretation.textElement.empty} and ${not result.resource.interpretation.coding.empty} and ${not result.resource.interpretation.coding[0].displayElement.empty}" th:text="${result.resource.interpretation.coding[0].display}"/>
</th:block>
<th:block th:case="*">
<th:block th:if="${not result.resource.interpretation.empty} and ${not result.resource.interpretation[0].textElement.empty}" th:text="${result.resource.interpretation[0].text}"/>
<th:block th:if="${not result.resource.interpretation.empty} and ${result.resource.interpretation[0].textElement.empty} and ${not result.resource.interpretation[0].coding.empty} and ${not result.resource.interpretation[0].coding[0].displayElement.empty}" th:text="${result.resource.interpretation.coding[0].display}"/>
</th:block>
</th:block>
<!--/*--> N <!--*/--> <!--/*--> N <!--*/-->
</td> </td>
<td> <td>
@ -90,14 +98,14 @@
</tr> </tr>
<th:block th:switch="${fhirVersion}"> <th:block th:switch="${fhirVersion}">
<th:block th:case="'DSTU3'"> <th:block th:case="'DSTU2' or 'DSTU2_HL7ORG' or 'DSTU2_1' or 'DSTU3'">
<tr th:if="${not result.resource.commentElement.empty}" th:class="${rowStat.odd}? 'hapiTableOfValuesRowOdd' : 'hapiTableOfValuesRowEven'" class="hapiTableOfValuesRowOdd"> <tr th:if="${not result.resource.commentElement.empty}" th:class="${rowStat.odd}? 'hapiTableOfValuesRowOdd' : 'hapiTableOfValuesRowEven'" class="hapiTableOfValuesRowOdd">
<td th:text="${result.resource.commentElement.value}" colspan="5">This is a comment</td> <td th:text="${result.resource.commentElement.value}" colspan="5">This is a comment</td>
</tr> </tr>
</th:block> </th:block>
<th:block th:case="*"> <th:block th:case="*">
<tr th:if="${not result.resource.commentsElement.empty}" th:class="${rowStat.odd}? 'hapiTableOfValuesRowOdd' : 'hapiTableOfValuesRowEven'" class="hapiTableOfValuesRowOdd"> <tr th:if="${not result.resource.note.empty}" th:class="${rowStat.odd}? 'hapiTableOfValuesRowOdd' : 'hapiTableOfValuesRowEven'" class="hapiTableOfValuesRowOdd">
<td th:text="${result.resource.commentsElement.value}" colspan="5">This is a comment</td> <td th:text="${result.resource.note[0].text}" colspan="5">This is a comment</td>
</tr> </tr>
</th:block> </th:block>
</th:block> </th:block>

249
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorR4Test.java Normal file
View File

File diff suppressed because one or more lines are too long