Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update and removed obsgroup-ids on the NCD fellow-up form #66

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update and removed obsgroup-ids on the NCD fellow-up form #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a184478
Update and removed obsgroup-ids on the NCD fellow-up form
tommyiversonj Feb 28, 2023
710ee7d
Update on Hep and HCV test codes
tommyiversonj Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 5 additions & 32 deletions configuration/pih/htmlforms/ncd-adult-followup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,6 @@

<includeIf velocityTest="$pt_has_rf or $pt_has_scd">
<tr>
<obsgroup groupingConceptId="PIH:CONJUNCTIVA">
<td style="width: 35%">
<label>
Conjunctiva
Expand All @@ -700,13 +699,11 @@
answerLabels="Normal, Pale"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_rf or $pt_has_lf or $pt_has_hf">
<tr>
<obsgroup groupingConceptId="PIH:12636">
<td style="width: 35%">
<label>
Body Edema
Expand All @@ -720,13 +717,11 @@
answerLabels="1+ Pitting, 2+ Pitting, 3+ Pitting"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_hf">
<tr>
<obsgroup groupingConceptId="PIH:PATIENTS FLUID MANAGEMENT">
<td style="width: 35%">
<label>
Volume Status
Expand All @@ -741,13 +736,11 @@
answerLabels="Hypo, Normal, Hyper"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_hf">
<tr>
<obsgroup groupingConceptId="PIH:NYHA CLASS">
<td style="width: 35%">
<label>
NYHA Stage
Expand All @@ -761,13 +754,11 @@
answerLabels="Class I, Class II, Class III, Class IV"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_hf">
<tr>
<obsgroup groupingConceptId="PIH:14323">
<td style="width: 35%">
<label>
Heart Failure Diagnosis
Expand All @@ -781,13 +772,11 @@
answerLabels="Cardiomyopathy, Afib, RHD, Valvular Heart Disease, Hypertensive, RVF, Pericardial Disease, Congenital, Ischemic"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_rf">
<tr>
<obsgroup groupingConceptId="CIEL:165570">
<td style="width: 35%">
<label>
CKD Stage
Expand All @@ -801,13 +790,11 @@
answerLabels="CKD I,CKD II,CKD III,CKD IV,CKD V"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_rf">
<tr>
<obsgroup groupingConceptId="PIH:12657">
<td style="width: 35%">
<label>
Diet Recs
Expand All @@ -821,13 +808,12 @@
answerLabels="Na,K+,Pro,Kcal"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_lf">
<tr>
<obsgroup groupingConceptId="PIH:HEPATITIS C TEST - QUALITATIVE">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section won't work. You can either add a construct/obsgroup OR add a dateLabel attribute to the Hep C test obs

dateLabel: Text to display after the obs.value widget and before the obs.datetime widget (obs.obs_datetime). Specifying this implies showDate="true".
OPTIONAL
Example:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lnball Thanks for the feedback

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lnball Kindly double-check my update. Hope am correct!

<obsgroup groupingConceptId="PIH:HEPATITIS C TEST - QUALITATIVE">
<td style="width: 35%">
<label>
Hep C Ab Test
Expand All @@ -838,7 +824,7 @@
<label class="inline">
Date:
</label>
<obs conceptId="PIH:12847" class="inline"/>
<obs conceptId="PIH:12847" class="inline" showDate="true"/>
</span>
<span class="block;">
<label>
Expand All @@ -849,7 +835,6 @@
answerConceptIds="PIH:703, PIH:664, PIH:1138"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

Expand All @@ -866,7 +851,7 @@
<label class="inline">
Date:
</label>
<obs conceptId="PIH:12847" class="inline"/>
<obs conceptId="PIH:12847" class="inline" showDate="true"/>
</span>
<span class="block;">
<label>
Expand All @@ -877,13 +862,11 @@
answerConceptIds="PIH:703, PIH:664, PIH:1138"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_lf">
<tr>
<obsgroup groupingConceptId="PIH:14348">
<td style="width: 35%">
<label>
Received Hep B Vaccine
Expand All @@ -896,13 +879,12 @@
answerConceptIds="PIH:1065, PIH:1066, PIH:1067" />
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$$pt_has_rf">
<tr>
<obsgroup groupingConceptId="PIH:11457">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same problem here

<obsgroup groupingConceptId="PIH:11457">
<td style="width: 35%">
<label>
HCV spot test
Expand All @@ -913,7 +895,7 @@
<label class="inline">
Date:
</label>
<obs conceptId="PIH:12847" class="inline"/>
<obs conceptId="PIH:12847" class="inline" showDate="true"/>
</span>
<span class="block;">
<label>
Expand All @@ -924,13 +906,11 @@
answerConceptIds="PIH:703, PIH:664, PIH:1138"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_asthma or $pt_has_copd">
<tr>
<obsgroup groupingConceptId="PIH:Asthma classification">
<td style="width: 35%">
<label>
CLD class
Expand All @@ -944,13 +924,11 @@
answerLabels="Intermittent, Moderate persistent, Mild persistent, Severe persistent"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_asthma or $pt_has_copd">
<tr>
<obsgroup groupingConceptId="PIH:11991">
<td style="width: 35%">
<label>
Beta-agonist use
Expand All @@ -964,13 +942,11 @@
answerLabels="Every day, Once a week, More than once a week, Weekly, Monthly, Not at all"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_htn">
<tr>
<obsgroup groupingConceptId="PIH:Type of hypertension diagnosis">
<td style="width: 35%">
<label>
Hypertension Diagnosis
Expand All @@ -985,13 +961,11 @@
answerLabels="Essential HTN, Secondary HTN"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

<includeIf velocityTest="$pt_has_htn">
<tr>
<obsgroup groupingConceptId="PIH:12699">
<td style="width: 35%">
<label>
HTN Stage
Expand All @@ -1005,7 +979,6 @@
answerLabels="Stage I, Stage II, Stage III, Stage IV"/>
</span>
</td>
</obsgroup>
</tr>
</includeIf>

Expand Down