From 3679418f8fcdea7d6ae8a27547a15f95b83fa6b3 Mon Sep 17 00:00:00 2001
From: ningosi <nicotwendelee@gmail.com>
Date: Tue, 16 Nov 2021 22:27:35 +0300
Subject: [PATCH 1/6] Remove debug methods in the code

---
 omod/src/main/webapp/fragments/clinicalNotes.gsp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/omod/src/main/webapp/fragments/clinicalNotes.gsp b/omod/src/main/webapp/fragments/clinicalNotes.gsp
index d946fb4..9a56c03 100644
--- a/omod/src/main/webapp/fragments/clinicalNotes.gsp
+++ b/omod/src/main/webapp/fragments/clinicalNotes.gsp
@@ -564,5 +564,4 @@ ${ ui.includeFragment("patientdashboardapp", "patientDashboardAppScripts", [note
 <script>
 	var prescription = {drug: ko.observable(new Drug())};
 	ko.applyBindings(prescription, jq("#prescription-dialog")[0]);
-	console.log(" The prescription is >>>"+prescription);
 </script>

From 1f73d18c50dc4a412e538d3125daf670533a026e Mon Sep 17 00:00:00 2001
From: "Simon O. Injiri" <simoninjiri@gmail.com>
Date: Tue, 14 Dec 2021 10:58:43 +0300
Subject: [PATCH 2/6] Surveilance overhall (#21)

* append location on printout

* reformat referral section, rename history section labels

* rm typo
---
 .../patientdashboardapp/model/Outcome.java    |   2 +
 .../main/webapp/fragments/clinicalNotes.gsp   | 140 +++++++++---------
 2 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/api/src/main/java/org/openmrs/module/patientdashboardapp/model/Outcome.java b/api/src/main/java/org/openmrs/module/patientdashboardapp/model/Outcome.java
index 1c7da14..30c7549 100644
--- a/api/src/main/java/org/openmrs/module/patientdashboardapp/model/Outcome.java
+++ b/api/src/main/java/org/openmrs/module/patientdashboardapp/model/Outcome.java
@@ -25,6 +25,7 @@ public class Outcome {
     static final int DIED_OPTION = 3;
     static final int REVIEWED_OPTION = 4;
     static final int CURED_OPTION = 5;
+    static final int REFERRAL_OPTION =6;
     private static Logger logger = LoggerFactory.getLogger(Outcome.class);
     private Option option;
     private String followUpDate;
@@ -60,6 +61,7 @@ public static List<Option> getAvailableOutcomes() {
         options.add(new Option(CURED_OPTION, null, "Discharged"));
         options.add(new Option(FOLLOW_UP_OPTION, null, "Next Appointment Date"));
         options.add(new Option(ADMIT_OPTION, null, "Admit"));
+        options.add(new Option(REFERRAL_OPTION,null,"Referral"));
         options.add(new Option(DIED_OPTION, null, "Died"));
         return options;
     }
diff --git a/omod/src/main/webapp/fragments/clinicalNotes.gsp b/omod/src/main/webapp/fragments/clinicalNotes.gsp
index d946fb4..b0b0ddd 100644
--- a/omod/src/main/webapp/fragments/clinicalNotes.gsp
+++ b/omod/src/main/webapp/fragments/clinicalNotes.gsp
@@ -131,9 +131,12 @@ ${ ui.includeFragment("patientdashboardapp", "patientDashboardAppScripts", [note
 			</fieldset>
 
 			<fieldset class="no-confirmation">
-				<legend>Illness History</legend>
+				<legend>History</legend>
 				<p>
-					<label class="label" for="history">History of Presenting illness</label>
+					<label class="label" for="history">History of present illness</label>
+					<span>
+						Date of Onset<input type="date" id="date_of_onset_for_crrent_illnes"/>
+					</span>
 					<textarea data-bind="value: \$root.illnessHistory" id="history" name="history" rows="10" cols="74"></textarea>
 				</p>
 			</fieldset>
@@ -303,70 +306,6 @@ ${ ui.includeFragment("patientdashboardapp", "patientDashboardAppScripts", [note
 			<fieldset class="no-confirmation">
 				<legend>Outcome</legend>
 				<div>
-					<h2> Patient Referral</h2>
-					
-					<div class="onerow">
-						<div class="col4"><label for="internalReferral"						>Referral Available</label></div>
-						<div class="col4"><label for="internalReferral" id="refTitle"		>Internal Referral</label></div>
-						<div class="col4 last"><label for="internalReferral" id="facTitle"	>Facility</label></div>
-					</div>
-					
-					<div class="onerow">
-						<div class="col4">
-							<div class="input-position-class">
-								<select id="availableReferral" name="availableReferral">
-									<option value="0">Select Option</option>
-									<option value="1">Internal Referral</option>
-									<option value="2">External Referral</option>
-								</select>
-							</div>
-						</div>
-						
-						<div class="col4">
-							<div class="input-position-class">
-								<select id="internalReferral" name="internalReferral" data-bind="options: \$root.internalReferralOptions, optionsText: 'label', value: \$root.referredTo, optionsCaption: 'Please select...'">
-								</select>
-								
-								<select id="externalReferral" name="externalReferral" onchange="loadExternalReferralCases();" data-bind="options: \$root.externalReferralOptions, optionsText: 'label', value: \$root.referredTo, optionsCaption: 'Please select...'">
-								</select>
-							</div>							
-						</div>
-						
-						<div class="col4 last">
-							<div class="input-position-class">
-								<field>
-									<% fields.each { %>
-									${ ui.includeFragment("kenyaui", "widget/labeledField", it) }
-									<% } %>
-								</field>
-							</div>
-						</div>						
-					</div>
-
-					<div class="onerow" style="padding-top:2px;" id="refReason1">
-						<div class="col4">
-							<label for="referralReasons" style="margin-top:20px;">Referral Reasons</label>						
-						</div>
-						
-						<label id="specify-lbl" for="specify" style="margin-top:20px;">If Other, Please Specify</label>													
-					</div>
-					
-					<div class="onerow" style="padding-top:2px;" id="refReason2">
-						<div class="col4">
-							<select id="referralReasons" name="referralReasons" data-bind="options: \$root.referralReasonsOptions, optionsText: 'label', value: \$root.referralReasons, optionsCaption: 'Please select...'" style="margin-top: 5px;">
-							</select>						
-						</div>
-						
-						<div class="col4 last" style="width: 65%;">
-							<input type="text" id="specify" placeholder="Please Specify" name="specify" data-bind="value: \$root.specify"/>
-						</div>
-					</div>
-
-					<div class="onerow" style="padding-top:2px;" id="refReason3">
-						<label for="referralComments" style="margin-top:20px;">Comments</label>
-						<textarea type="text" id="referralComments"   name="referralComments" data-bind="value: \$root.referralComments" placeholder="COMMENTS"  style="height: 80px; width: 650px;"></textarea>
-					</div>
-
 					<div class="onerow" style="padding-top:2px;">
 						<h2>What is the outcome of this visit? <span class="important">*</span></h2>
 						<div data-bind="foreach: availableOutcomes" class="outcomes-container">
@@ -376,8 +315,6 @@ ${ ui.includeFragment("patientdashboardapp", "patientDashboardAppScripts", [note
 										<input type="radio" name="outcome" data-bind="click: updateOutcome"/>										
 										<span data-bind="text: option.label" style="color:#000; font-size: 1em; cursor: pointer"></span>										
 									</label>
-									
-									
 									<span data-bind="if: \$data.option.id === 1 && \$root.outcome() && \$root.outcome().option.id === 1">
 										<span id="follow-up-date" class="date" style="float: right;">
 											<input data-bind="value : followUpDate" style="width: 378px;" class="required">
@@ -388,9 +325,76 @@ ${ ui.includeFragment("patientdashboardapp", "patientDashboardAppScripts", [note
 									<span data-bind="if: \$data.option.id === 2 && \$root.outcome() && \$root.outcome().option.id === 2">
 										<select data-bind="options: \$root.inpatientWards, optionsText: 'label', value: admitTo" style="width: 400px !important; float: right;"></select>
 									</span>
+
 								</p>
 							</div>
 						</div>
+						<span data-bind="if: \$root.outcome() && \$root.outcome().option.id ===6">
+							<h2>Referral information</h2>
+
+							<div class="onerow">
+								<div class="col4"><label for="internalReferral"						>Referral Available</label></div>
+								<div class="col4"><label for="internalReferral" id="refTitle"		>Internal Referral</label></div>
+								<div class="col4 last"><label for="internalReferral" id="facTitle"	>Facility</label></div>
+							</div>
+
+							<div class="onerow">
+								<div class="col4">
+									<div class="input-position-class">
+										<select id="availableReferral" name="availableReferral">
+											<option value="0">Select Option</option>
+											<option value="1">Internal Referral</option>
+											<option value="2">External Referral</option>
+										</select>
+									</div>
+								</div>
+
+								<div class="col4">
+									<div class="input-position-class">
+										<select id="internalReferral" name="internalReferral" data-bind="options: \$root.internalReferralOptions, optionsText: 'label', value: \$root.referredTo, optionsCaption: 'Please select...'">
+										</select>
+
+										<select id="externalReferral" name="externalReferral" onchange="loadExternalReferralCases();" data-bind="options: \$root.externalReferralOptions, optionsText: 'label', value: \$root.referredTo, optionsCaption: 'Please select...'">
+										</select>
+									</div>
+								</div>
+
+								<div class="col4 last">
+									<div class="input-position-class">
+										<field>
+											<% fields.each { %>
+											${ ui.includeFragment("kenyaui", "widget/labeledField", it) }
+											<% } %>
+										</field>
+									</div>
+								</div>
+							</div>
+
+							<div class="onerow" style="padding-top:2px;" id="refReason1">
+								<div class="col4">
+									<label for="referralReasons" style="margin-top:20px;">Referral Reasons</label>
+								</div>
+
+								<label id="specify-lbl" for="specify" style="margin-top:20px;">If Other, Please Specify</label>
+							</div>
+
+							<div class="onerow" style="padding-top:2px;" id="refReason2">
+								<div class="col4">
+									<select id="referralReasons" name="referralReasons" data-bind="options: \$root.referralReasonsOptions, optionsText: 'label', value: \$root.referralReasons, optionsCaption: 'Please select...'" style="margin-top: 5px;">
+									</select>
+								</div>
+
+								<div class="col4 last" style="width: 65%;">
+									<input type="text" id="specify" placeholder="Please Specify" name="specify" data-bind="value: \$root.specify"/>
+								</div>
+							</div>
+
+							<div class="onerow" style="padding-top:2px;" id="refReason3">
+								<label for="referralComments" style="margin-top:20px;">Comments</label>
+								<textarea type="text" id="referralComments"   name="referralComments" data-bind="value: \$root.referralComments" placeholder="COMMENTS"  style="height: 80px; width: 650px;"></textarea>
+							</div>
+						</span>
+
 					</div>
 					
 					<field>

From 86e849ec41c3dc8389a1993d153c1936b18d97f3 Mon Sep 17 00:00:00 2001
From: ningosi <nicotwendelee@gmail.com>
Date: Mon, 24 Jan 2022 17:45:23 +0300
Subject: [PATCH 3/6] Adjust the hospital core and the ehrconfigs module to the
 latest versions

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e6c4c8..b8e8adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 		<calculationVersion>1.0</calculationVersion>
 		<htmlformentryVersion>2.3</htmlformentryVersion>
 		<htmlwidgetsVersion>1.6.6</htmlwidgetsVersion>
-		<hospitalcoreVersion>1.0.6-SNAPSHOT</hospitalcoreVersion>
+		<hospitalcoreVersion>1.0.7</hospitalcoreVersion>
 		<idgenVersion>2.6</idgenVersion>
 		<reportingVersion>0.9.8.1</reportingVersion>
 		<serializationxstreamVersion>0.2.7</serializationxstreamVersion>
@@ -48,7 +48,7 @@
 		<appuiVersion>1.8.0</appuiVersion>
 		<kenyaemrVersion>17.0.3</kenyaemrVersion>
 		<jodaTimeVersion>2.9.1</jodaTimeVersion>
-		<ehrconfigisVersion>1.0.0</ehrconfigisVersion>
+		<ehrconfigisVersion>1.1.1</ehrconfigisVersion>
 		<metadatadeployVersion>1.3</metadatadeployVersion>
 		<ehrlaboratoryVersion>1.0.1</ehrlaboratoryVersion>
 

From 23d350adf5726cbd48d812c94968688f0c31508c Mon Sep 17 00:00:00 2001
From: ningosi <nicotwendelee@gmail.com>
Date: Mon, 24 Jan 2022 17:49:18 +0300
Subject: [PATCH 4/6] Prepare for the next release life cycle

---
 api/pom.xml  | 2 +-
 omod/pom.xml | 2 +-
 pom.xml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index db0fef1..1b59f20 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>patientdashboardapp</artifactId>
-		<version>1.0.7-SNAPSHOT</version>
+		<version>1.0.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>patientdashboardapp-api</artifactId>
diff --git a/omod/pom.xml b/omod/pom.xml
index 37e7da9..bf3046c 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>patientdashboardapp</artifactId>
-		<version>1.0.7-SNAPSHOT</version>
+		<version>1.0.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>patientdashboardapp-omod</artifactId>
diff --git a/pom.xml b/pom.xml
index b8e8adf..edcb40d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>org.openmrs.module</groupId>
 	<artifactId>patientdashboardapp</artifactId>
-	<version>1.0.7-SNAPSHOT</version>
+	<version>1.0.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Patient Dashboard App Module</name>
 	<description>Useful functionality and summary for the patient</description>

From 62266c369192beb2205df3d2fa2b1fa906de1067 Mon Sep 17 00:00:00 2001
From: VIC <ngarivictor43@gmail.com>
Date: Tue, 15 Feb 2022 13:42:16 +0300
Subject: [PATCH 5/6] rearrange tabs and add highlight on extreme values

---
 omod/src/main/webapp/fragments/triageInfo.gsp | 34 +++++++++++--------
 omod/src/main/webapp/pages/main.gsp           | 22 ++++++------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/omod/src/main/webapp/fragments/triageInfo.gsp b/omod/src/main/webapp/fragments/triageInfo.gsp
index 5073a74..f3b8c67 100644
--- a/omod/src/main/webapp/fragments/triageInfo.gsp
+++ b/omod/src/main/webapp/fragments/triageInfo.gsp
@@ -161,64 +161,68 @@ jq(function(){
 			
 			<div class="info-body" >
                 <label><span class="status active"></span>Temperature:</label>
-                <span>${triage?.temperature?:"Not Captured"}</span>
+                <% if (triage?.temperature > 38) {%>
+                <span style="background-color: red;" >${triage?.temperature?:"-"}</span>
+                <%} else {%>
+                <span>${triage?.temperature?:"-"}</span>
+                <%}%>
                 <br>
 
                 <label><span class="status active"></span>Blood Pressure:</label>
-                <span>${ triage?.systolic && triage?.daistolic ? triage?.systolic + "/" + triage?.daistolic : "Not Captured" }</span>
+                <span>${ triage?.systolic && triage?.daistolic ? triage?.systolic + "/" + triage?.daistolic : "-" }</span>
                 <br>
 
                 <label><span class="status active"></span>Respiratory Rate:</label>
-                <span>${triage?.respiratoryRate?:"Not Captured"}</span>
+                <span>${triage?.respiratoryRate?:"-"}</span>
                 <br>
 				
 				<label><span class="status active"></span>Pulse Rate:</label>
-                <span>${triage?.pulsRate?:"Not Captured"}</span>
+                <span>${triage?.pulsRate?:"-"}</span>
                 <br>
 
                 <% if (patient.gender == "F" && patient.age > 10) {%>
                     <label><span class="status active"></span>Last Periods:</label>
-                    <span id="lastPeriods">${triage?.lastMenstrualDate ? ui.formatDatePretty(triage?.lastMenstrualDate): "Not Captured"}</span>
+                    <span id="lastPeriods">${triage?.lastMenstrualDate ? ui.formatDatePretty(triage?.lastMenstrualDate): "-"}</span>
                     <br>
                 <% } %>
 
                 <label><span class="status active"></span>Oxygen Saturation:</label>
-                <span>${triage?.oxygenSaturation? triage.oxygenSaturation.toString() + "%": "Not Captured"}</span>
+                <span>${triage?.oxygenSaturation? triage.oxygenSaturation.toString() + "%": "-"}</span>
                 <br>
 
-				<label><span class="status active"></span>Height:</label>
-				<span>${triage?.height?:"Not Captured"}</span>
+				<label><span class="status active"></span>Height(cm):</label>
+				<span>${triage?.height?:"-"}</span>
 				<br>
 				
 				<label><span class="status active"></span>Weight:</label>
-				<span>${triage?.weight?:"Not Captured"}</span>
+				<span>${triage?.weight?:"-"}</span>
 				<br>
 				
 				<% if (patient.age >= 2)  {%>
 					<label><span class="status active"></span>BMI:</label>
-					<span>${(triage && triage.weight && triage.height) ? formatter.format(triage?.weight/((triage?.height/100) * (triage?.height/100))) : "Not Captured"}</span>
+					<span>${(triage && triage.weight && triage.height) ? formatter.format(triage?.weight/((triage?.height/100) * (triage?.height/100))) : "-"}</span>
 					<br>
 				<% } %>
 				
 				<label><span class="status active"></span>M.U.A Circum:</label>
-				<span>${triage?.mua?:"Not Captured"}</span>
+				<span>${triage?.mua?:"-"}</span>
 				<br>
 				
 				<label><span class="status active"></span>Chest Circum:</label>
-				<span>${triage?.chest?:"Not Captured"}</span>
+				<span>${triage?.chest?:"-"}</span>
 				<br>
 				
 				<label><span class="status active"></span>Abdominal Circum:</label>
-				<span>${triage?.abdominal?:"Not Captured"}</span>
+				<span>${triage?.abdominal?:"-"}</span>
 				<br>
 				
 
 				<label><span class="status active"></span>Blood Group:</label>
-				<span>${triage?.bloodGroup && triage?.rhesusFactor ? triage?.bloodGroup + "/" + triage?.rhesusFactor : "Not Captured"}</span>
+				<span>${triage?.bloodGroup && triage?.rhesusFactor ? triage?.bloodGroup + "/" + triage?.rhesusFactor : "-"}</span>
 				<br>
 				
 				<label><span class="status active"></span>HIV Status:</label>
-				<span>${triage?.pitct ?: "Not Captured"}</span>
+				<span>${triage?.pitct ?: "-"}</span>
 				<br>
 			</div>
 		</div>
diff --git a/omod/src/main/webapp/pages/main.gsp b/omod/src/main/webapp/pages/main.gsp
index 54e3922..640662f 100644
--- a/omod/src/main/webapp/pages/main.gsp
+++ b/omod/src/main/webapp/pages/main.gsp
@@ -286,22 +286,22 @@
 	
 	<div class="dashboard-tabs">
 		<ul>
-			<li id="cn"><a href="#notes">Clinical Notes</a></li>
-			<li id="ti"><a href="#triage-info">Triage Information</a></li>
-			<li id="ch"><a href="#summary">Clinical History</a></li>
+            <li id="ti"><a href="#triage-info">Triage Information</a></li>
+            <li id="ch"><a href="#summary">Clinical History</a></li>
+            <li id="cn"><a href="#notes">Clinical Notes</a></li>
 			<li id="lr"><a href="#investigations">Lab Reports</a></li>
             <li id="rr"><a href="#radiology">Radiology Reports</a></li>
 		</ul>
-		<div id="notes">
-			${ ui.includeFragment("patientdashboardapp", "clinicalNotes", [patientId: patientId, opdId: opdId, queueId: queueId, opdLogId: opdLogId]) }
-		</div>
+        <div id="triage-info">
+            ${ ui.includeFragment("patientdashboardapp", "triageInfo", [patientId: patientId, opdId: opdId, queueId: queueId]) }
+        </div>
 
-		<div id="triage-info">
-			${ ui.includeFragment("patientdashboardapp", "triageInfo", [patientId: patientId, opdId: opdId, queueId: queueId]) }
-		</div>
+        <div id="summary">
+            ${ ui.includeFragment("patientdashboardapp", "visitSummary", [patientId: patientId]) }
+        </div>
 
-		<div id="summary">
-			${ ui.includeFragment("patientdashboardapp", "visitSummary", [patientId: patientId]) }
+		<div id="notes">
+			${ ui.includeFragment("patientdashboardapp", "clinicalNotes", [patientId: patientId, opdId: opdId, queueId: queueId, opdLogId: opdLogId]) }
 		</div>
 
 		<div id="investigations">

From 925dc877c4d4a69529eae814a33583dceec4c4f7 Mon Sep 17 00:00:00 2001
From: VIC <ngarivictor43@gmail.com>
Date: Tue, 15 Feb 2022 14:23:08 +0300
Subject: [PATCH 6/6] examination controller and place holder

---
 .../ClinicalNotesFragmentController.java      | 51 ++++++++++++++++---
 .../main/webapp/fragments/clinicalNotes.gsp   | 24 +++++++++
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/omod/src/main/java/org/openmrs/module/patientdashboardapp/fragment/controller/ClinicalNotesFragmentController.java b/omod/src/main/java/org/openmrs/module/patientdashboardapp/fragment/controller/ClinicalNotesFragmentController.java
index f7e343d..65c9552 100644
--- a/omod/src/main/java/org/openmrs/module/patientdashboardapp/fragment/controller/ClinicalNotesFragmentController.java
+++ b/omod/src/main/java/org/openmrs/module/patientdashboardapp/fragment/controller/ClinicalNotesFragmentController.java
@@ -2,9 +2,7 @@
 
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.openmrs.Concept;
-import org.openmrs.ConceptAnswer;
-import org.openmrs.ConceptSet;
+import org.openmrs.*;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.hospitalcore.BillingService;
 import org.openmrs.module.hospitalcore.InventoryCommonService;
@@ -25,9 +23,7 @@
 import org.openmrs.ui.framework.fragment.FragmentModel;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 /**
  *
@@ -151,4 +147,47 @@ public List<SimpleObject> getDrugUnit(UiUtils uiUtils){
         }
         return SimpleObject.fromCollection(drugUnitOptions,uiUtils,"id","label", "uuid") ;
     }
+
+    public List<SimpleObject> examination(@RequestParam("findingQuery") String findingQuery) {
+        List<ConceptClass> requiredConceptClasses = Arrays.asList(Context.getConceptService().getConceptClassByName(
+                "Diagnosis"), Context.getConceptService().getConceptClassByName("Anatomy"));
+        List<ConceptDatatype> requiredConceptDataTypes = Arrays.asList(
+                Context.getConceptService().getConceptDatatypeByName("Coded"), Context.getConceptService()
+                        .getConceptDatatypeByName("Text"));
+        List<Locale> locales = new ArrayList<Locale>();
+        locales.add(Context.getLocale());
+        List<ConceptSearchResult> possibleMatches = Context.getConceptService().getConcepts(findingQuery, locales, false,
+                requiredConceptClasses, null, requiredConceptDataTypes, null, null, null, null);
+        List<SimpleObject> searchResults = new ArrayList<SimpleObject>();
+
+        for (ConceptSearchResult conceptSearchResult : possibleMatches) {
+            Concept concept = conceptSearchResult.getConcept();
+            SimpleObject finding = new SimpleObject();
+
+            String text_name = "";
+            String text_type = "hidden";
+
+            finding.put("value", concept.getUuid());
+            finding.put("label", concept.getName().getName());
+
+            if (concept.getDatatype().getName().equals("Text")) {
+                text_type = "text";
+                text_name = "concept." + concept.getUuid();
+            }
+
+            finding.put("text_name", text_name);
+            finding.put("text_type", text_type);
+
+            List<SimpleObject> findingAnswers = new ArrayList<SimpleObject>();
+            for (ConceptAnswer answer : concept.getAnswers()) {
+                SimpleObject findingAnswer = new SimpleObject();
+                findingAnswer.put("uuid", answer.getAnswerConcept().getUuid());
+                findingAnswer.put("display", answer.getAnswerConcept().getName().getName());
+                findingAnswers.add(findingAnswer);
+            }
+            finding.put("answers", findingAnswers);
+            searchResults.add(finding);
+        }
+        return searchResults;
+    }
 }
diff --git a/omod/src/main/webapp/fragments/clinicalNotes.gsp b/omod/src/main/webapp/fragments/clinicalNotes.gsp
index 996ec17..9c5fd63 100644
--- a/omod/src/main/webapp/fragments/clinicalNotes.gsp
+++ b/omod/src/main/webapp/fragments/clinicalNotes.gsp
@@ -152,6 +152,30 @@ ${ ui.includeFragment("patientdashboardapp", "patientDashboardAppScripts", [note
 				</p>
 			</fieldset>
 
+            <fieldset class="no-confirmation">
+                <legend>Systemic Examinations</legend>
+                <div style="padding: 0 4px">
+
+                    <div>
+                        <label for="searchExaminations" class="label title-label">Systematic Examinations <span class="important"></span></label>
+                        <input type="text" id="searchExaminations" name="" value="" placeholder="Add Examination"/>
+                        <field>
+                            <input type="hidden" id="exams-set" class=""/>
+                            <span id="exams-lbl" class="field-error" style="display: none"></span>
+                        </field>
+
+                        <div class="tasks" id="task-exams" style="display:none;">
+                            <header class="tasks-header">
+                                <span id="title-symptom" class="tasks-title">PATIENT'S EXAMINATIONS</span>
+                                <a class="tasks-lists"></a>
+                            </header>
+
+                            <div id="exams-holder"></div>
+                        </div>
+                    </div>
+                </div>
+            </fieldset>
+
 			<fieldset class="no-confirmation">
 				<legend>Diagnosis</legend>
 				<div>