Index: metadata/api/hibernate/org/openmrs/api/db/hibernate/Encounter.hbm.xml
===================================================================
--- metadata/api/hibernate/org/openmrs/api/db/hibernate/Encounter.hbm.xml	(revision 14044)
+++ metadata/api/hibernate/org/openmrs/api/db/hibernate/Encounter.hbm.xml	(working copy)
@@ -77,5 +77,9 @@
 			<column name="voided_by" />
 		</many-to-one>
 
+        <bag name="providers" table="encounter_provider_map" cascade="all" lazy="false">
+            <key column="encounter_id"/>
+            <many-to-many column="provider_id" class="Person"/>
+        </bag>        
 	</class>
 </hibernate-mapping>
Index: metadata/model/liquibase-update-to-latest.xml
===================================================================
--- metadata/model/liquibase-update-to-latest.xml	(revision 14044)
+++ metadata/model/liquibase-update-to-latest.xml	(working copy)
@@ -3301,4 +3301,35 @@
 			<where>message_state IN (0,1)</where>
 		</update>
 	</changeSet>
+
+    <changeSet id="20100608-1025" author="gobi and karthiks">
+    	<preConditions onFail="MARK_RAN">
+			<not>
+				<tableExists tableName="encounter_provider_map"/>
+			</not>
+		</preConditions>
+		<comment>
+			Ticket 2369, to store multiple providers for an encounter instead of just one
+		</comment>
+		<createTable tableName="encounter_provider_map">
+			<column name="encounter_id" type="int"/>
+			<column name="provider_id" type="int"/>
+			<column name="organization_role" type="varchar(255)" defaultValue="Unknown" />
+		</createTable>
+
+		<addForeignKeyConstraint constraintName="fk_encounter_id"
+			baseTableName="encounter_provider_map" baseColumnNames="encounter_id"
+			referencedTableName="encounter" referencedColumnNames="encounter_id"
+			/>
+		<addForeignKeyConstraint constraintName="fk_provider_id"
+			baseTableName="encounter_provider_map" baseColumnNames="provider_id"
+			referencedTableName="person" referencedColumnNames="person_id"
+			/>
+		<addUniqueConstraint tableName="encounter_provider" columnNames="encounter_id,provider_id" constraintName="unique_encounter_provider_ids"/>
+		<sql>
+            <![CDATA[
+				INSERT INTO encounter_provider (encounter_id, provider_id) SELECT encounter_id, provider_id FROM encounter;
+			]]>
+		</sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file
Index: src/api/org/openmrs/Encounter.java
===================================================================
--- src/api/org/openmrs/Encounter.java	(revision 14044)
+++ src/api/org/openmrs/Encounter.java	(working copy)
@@ -48,16 +48,17 @@
 	
 	private EncounterType encounterType;
 	
-	private Person provider;
-	
 	private Set<Order> orders;
 	
 	private Set<Obs> obs;
 	
+    private List<Person> providers;
+
 	// Constructors
 	
 	/** default constructor */
 	public Encounter() {
+		providers = new ArrayList<Person>();
 	}
 	
 	/**
@@ -65,6 +66,7 @@
 	 * @should set encounter id
 	 */
 	public Encounter(Integer encounterId) {
+		this();
 		this.encounterId = encounterId;
 	}
 	
@@ -403,27 +405,73 @@
 	/**
 	 * @return Returns the provider.
 	 * @since 1.6 (used to return User)
+	 * @deprecated use{@link #getProviders()}
 	 */
-	public Person getProvider() {
-		return provider;
+	@Deprecated
+    public Person getProvider() {
+		if (!providers.isEmpty()) {
+			return providers.get(0);
+		}
+		return null;
 	}
 	
 	/**
 	 * @param provider The provider to set.
-	 * @deprecated use {@link #setProvider(Person)} 
+	 * @deprecated use {@link #addProvider(Person)}
 	 */
-	public void setProvider(User provider) {
+	@Deprecated
+    public void setProvider(User provider) {
 		setProvider(provider.getPerson());
 	}
 	
 	/**
-     * @param provider The provider to set.
-     */
+	 * @param provider The provider to set.
+	 * @deprecated use {@link #addProvider(Person)}
+	 */
+    @Deprecated
     public void setProvider(Person provider) {
-	    this.provider = provider;
+		addProvider(provider);
     }
 
 	/**
+     * @return Returns the providers
+     */
+    public List<Person> getProviders() {
+        return providers;
+    }
+
+    /**
+     * @param provider a new provider
+     */
+    public void addProvider(Person provider) {
+		if (!providers.contains(provider)) {
+			providers.add(provider);
+		}
+    }
+
+    /**
+     * @param provider a provider is removed
+     */
+	public boolean removeProvider(Person provider) {
+		return providers.remove(provider);
+    }
+
+    /**
+     * @param providers The providers to set.
+     */
+    public void setProviders(List<Person> providers) {
+		if (providers != null) {
+        this.providers = providers;
+		} else {
+			this.providers = new ArrayList<Person>();
+		}
+    }
+	
+	public void clearProviders() {
+		setProviders(null);
+	}
+
+    /**
 	 * @return Returns the form.
 	 */
 	public Form getForm() {
@@ -450,6 +498,7 @@
 		ret += this.getLocation() == null ? "(no Location) " : this.getLocation().getName() + " ";
 		ret += this.getPatient() == null ? "(no Patient) " : this.getPatient().getPatientId().toString() + " ";
 		ret += this.getForm() == null ? "(no Form) " : this.getForm().getName() + " ";
+		ret += this.getProviders().size() == 0 ? "(no Providers) " : "num Providers: " + this.getProviders().size() + " ";
 		ret += this.getObsAtTopLevel(false) == null ? "(no Obss) " : "num Obs: " + this.getObsAtTopLevel(false) + " ";
 		ret += this.getOrders() == null ? "(no Orders) " : "num Orders: " + this.getOrders().size() + " ";
 		return "Encounter: [" + ret + "]";
Index: src/web/org/openmrs/web/controller/encounter/EncounterFormController.java
===================================================================
--- src/web/org/openmrs/web/controller/encounter/EncounterFormController.java	(revision 14044)
+++ src/web/org/openmrs/web/controller/encounter/EncounterFormController.java	(working copy)
@@ -13,6 +13,7 @@
  */
 package org.openmrs.web.controller.encounter;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +35,7 @@
 import org.openmrs.FormField;
 import org.openmrs.Location;
 import org.openmrs.Obs;
+import org.openmrs.Person;
 import org.openmrs.api.EncounterService;
 import org.openmrs.api.FormService;
 import org.openmrs.api.context.Context;
@@ -100,14 +102,14 @@
 				if (StringUtils.hasText(request.getParameter("patientId")))
 					encounter.setPatient(Context.getPatientService().getPatient(
 					    Integer.valueOf(request.getParameter("patientId"))));
-				if (StringUtils.hasText(request.getParameter("providerId")))
-					encounter.setProvider(Context.getPersonService().getPerson(
-					    Integer.valueOf(request.getParameter("providerId"))));
+				
 				if (encounter.isVoided())
 					ValidationUtils.rejectIfEmptyOrWhitespace(errors, "voidReason", "error.null");
 				
 				ValidationUtils.rejectIfEmptyOrWhitespace(errors, "patient", "error.null");
-				ValidationUtils.rejectIfEmptyOrWhitespace(errors, "provider", "error.null");
+				if (fetchProviderIDs(request) == null) {
+					errors.rejectValue("providers", "error.null", null, null);
+				}
 				ValidationUtils.rejectIfEmptyOrWhitespace(errors, "encounterDatetime", "error.null");
 				
 			}
@@ -148,9 +150,6 @@
 					encounter.setPatient(Context.getPatientService().getPatient(
 					    Integer.valueOf(request.getParameter("patientId"))));
 				
-				// set the provider if they changed it
-				encounter.setProvider(Context.getPersonService().getPerson(Integer.valueOf(request.getParameter("providerId"))));
-				
 				if (encounter.isVoided() && encounter.getVoidedBy() == null)
 					// if this is a "new" voiding, call voidEncounter to set appropriate attributes
 					Context.getEncounterService().voidEncounter(encounter, encounter.getVoidReason());
@@ -186,10 +185,10 @@
 		Encounter encounter = null;
 		
 		if (Context.isAuthenticated()) {
-			EncounterService es = Context.getEncounterService();
-			String encounterId = request.getParameter("encounterId");
-			if (encounterId != null) {
-				encounter = es.getEncounter(Integer.valueOf(encounterId));
+			encounter = fetchEncounter(request);
+			String[] providerIds = fetchProviderIDs(request);
+			if (providerIds != null) {
+				updateProvidersOfEncounter(encounter, providerIds);
 			}
 		}
 		
@@ -199,6 +198,51 @@
 		return encounter;
 	}
 	
+	private void updateProvidersOfEncounter(Encounter encounter, String[] newProviderIds) {
+		
+		List<Person> providers = encounter.getProviders();
+		
+		Map<String, Person> mapExistingProviders = new HashMap<String, Person>();
+		for (Person person : providers) {
+			mapExistingProviders.put(person.getPersonId().toString(), person);
+		}
+		List<Person> newProviders = new ArrayList<Person>();
+		for (String providerId : newProviderIds) {
+			Person currentPerson = mapExistingProviders.get(providerId);
+			if (currentPerson == null) {
+				newProviders.add(Context.getPersonService().getPerson(Integer.valueOf(providerId)));
+			} else {
+				newProviders.add(currentPerson);
+			}
+		}
+		encounter.setProviders(newProviders);
+		
+	}
+	
+	private Encounter fetchEncounter(HttpServletRequest request) {
+		Encounter encounter = null;
+		EncounterService es = Context.getEncounterService();
+		String encounterId = request.getParameter("encounterId");
+		if (encounterId != null) {
+			encounter = es.getEncounter(Integer.valueOf(encounterId));
+			return encounter;
+		} else {
+			Encounter emptyEncounter = new Encounter();
+			emptyEncounter.setProviders(new ArrayList<Person>());
+			return emptyEncounter;
+		}
+		
+	}
+	
+	private String[] fetchProviderIDs(HttpServletRequest request) {
+		String[] providerIds = null;
+		String strProviders = request.getParameter("encounterProviders");
+		if (StringUtils.hasText(strProviders)) {
+			providerIds = strProviders.split(" ");
+		}
+		return providerIds;
+	}
+	
 	/**
 	 * @see org.springframework.web.servlet.mvc.SimpleFormController#referenceData(javax.servlet.http.HttpServletRequest,
 	 *      java.lang.Object, org.springframework.validation.Errors)
@@ -246,7 +290,7 @@
 				
 				//get the obs that was not created with the original encounter
 				Encounter en = o.getEncounter();
-				if(o.getDateCreated().compareTo(en.getDateCreated())!=0){
+				if (o.getDateCreated().compareTo(en.getDateCreated()) != 0) {
 					obsAfterEncounter.add(o.getId());
 				}
 				
@@ -269,7 +313,7 @@
 					ff = new FormField();
 				
 				// we only put the top-level obs in the obsMap.  Those would
-				// be the obs that don't have an obs grouper 
+				// be the obs that don't have an obs grouper
 				if (o.getObsGroup() == null) {
 					// populate the obs map with this formfield and obs
 					List<Obs> list = obsMapToReturn.get(ff);
Index: test/api/org/openmrs/api/EncounterServiceTest.java
===================================================================
--- test/api/org/openmrs/api/EncounterServiceTest.java	(revision 14044)
+++ test/api/org/openmrs/api/EncounterServiceTest.java	(working copy)
@@ -146,8 +146,12 @@
 		enc.setLocation(new Location(1));
 		enc.setEncounterType(new EncounterType(1));
 		enc.setEncounterDatetime(new Date());
-		enc.setPatient(new Patient(3));
-		enc.setProvider(new Person(1));
+		Patient patient = new Patient(3);
+		patient.setGender("M");
+		enc.setPatient(patient);
+		Person provider = new Person(1);
+		provider.setGender("M");
+		enc.setProvider(provider);
 		es.saveEncounter(enc);
 		
 		// Now add an obs to it
Index: web/WEB-INF/messages.properties
===================================================================
--- web/WEB-INF/messages.properties	(revision 14044)
+++ web/WEB-INF/messages.properties	(working copy)
@@ -654,6 +654,7 @@
 Encounter.type=Encounter Type
 Encounter.location=Location
 Encounter.provider=Provider
+Encounter.providers=Providers
 Encounter.provider.find=Find Provider
 Encounter.datetime=Encounter Date
 Encounter.find=Find Encounter
Index: web/WEB-INF/openmrs_static_content-servlet.xml
===================================================================
--- web/WEB-INF/openmrs_static_content-servlet.xml	(revision 14044)
+++ web/WEB-INF/openmrs_static_content-servlet.xml	(working copy)
@@ -14,6 +14,7 @@
 			<props>
 				<prop key="**/OpenmrsSearch.js">jstlContentController</prop>
 				<prop key="**/PersonSearch.js">jstlContentController</prop>
+				<prop key="**/ProviderSearch.js">jstlContentController</prop>
 				<prop key="**/PatientSearch.js">jstlContentController</prop>
 				<prop key="**/UserSearch.js">jstlContentController</prop>
 				<prop key="**/ObsSearch.js">jstlContentController</prop>
Index: web/WEB-INF/view/admin/encounters/encounterForm.jsp
===================================================================
--- web/WEB-INF/view/admin/encounters/encounterForm.jsp	(revision 14044)
+++ web/WEB-INF/view/admin/encounters/encounterForm.jsp	(working copy)
@@ -18,6 +18,37 @@
 
 </script>
 
+<script type="text/javascript">
+	dojo.require("dojo.widget.openmrs.ProviderSearch");
+	dojo.require("dojo.widget.openmrs.OpenmrsPopup");
+	
+	dojo.addOnLoad( function() {
+		
+		searchWidget = dojo.widget.manager.getWidgetById("pSearch");			
+		
+		dojo.event.topic.subscribe("pSearch/select", 
+			function(msg) {
+				for (var i=0; i< msg.objs.length; i++) {
+					var obj = msg.objs[i];
+					var options = $("encounterProviderNames").options;
+					
+					var isAddable = true;
+					for (x=0; x<options.length; x++)
+						if (options[x].value == obj.personId)
+							isAddable = false;
+					
+					if (isAddable) {
+						var opt = new Option(obj.personName, obj.personId);
+						opt.selected = true;
+						options[options.length] = opt;
+						copyIds("encounterProviderNames", "encounterProviders", " ");
+					}
+				}
+			}
+		);
+	});
+	
+</script>
 
 <script type="text/javascript">
 
@@ -73,7 +104,56 @@
 	function enableSaveButton(relType, id) {
 		document.getElementById("saveEncounterButton").disabled = false;
 	}
-
+		
+	function removeItem(nameList, idList, delim)
+	{
+		var sel   = document.getElementById(nameList);
+		var input = document.getElementById(idList);
+		var optList   = sel.options;
+		var lastIndex = -1;
+		var i = 0;
+		while (i<optList.length) {
+			// loop over and erase all selected items
+			if (optList[i].selected) {
+				optList[i] = null;
+				lastIndex = i;
+			}
+			else {
+				i++;
+			}
+		}
+		copyIds(nameList, idList, delim);
+		while (lastIndex >= optList.length)
+			lastIndex = lastIndex - 1;
+		if (lastIndex >= 0) {
+			optList[lastIndex].selected = true;
+			return optList[lastIndex];
+		}
+		return null;
+	}
+	
+	function copyIds(from, to, delimiter)
+	{
+		var sel = document.getElementById(from);
+		var input = document.getElementById(to);
+		var optList = sel.options;
+		var remaining = new Array();
+		var i=0;
+		while (i < optList.length)
+		{
+			remaining.push(optList[i].value);
+			i++;
+		}
+		input.value = remaining.join(delimiter);
+	}	
+	
+	function listKeyPress(from, to, delim, event) {
+		var keyCode = event.keyCode;
+		if (keyCode == 8 || keyCode == 46) {
+			removeItem(from, to, delim);
+			window.Event.keyCode = 0;	//attempt to prevent backspace key (#8) from going back in browser
+		}
+	}	
 </script>
 
 <style>
@@ -107,14 +187,24 @@
 			</td>
 		</tr>
 		<tr>
-			<th><spring:message code="Encounter.provider"/></th>
-			<td>
-				<spring:bind path="encounter.provider">
-					<openmrs_tag:personField formFieldName="providerId" initialValue="${status.value.personId}" roles="Provider" callback="enableSaveButton"/>
-					<c:if test="${status.errorMessage != ''}"><span class="error">${status.errorMessage}</span></c:if>
-				</spring:bind>
+			<th><spring:message code="Encounter.providers"/></th>
+			<td valign="top">
+                <select class="largeWidth" size="6" id="encounterProviderNames" multiple="multiple" onkeyup="listKeyPress('encounterProviderNames', 'encounterProviders', ' ', event);">
+					<c:forEach items="${encounter.providers}" var="set">
+						<option value="${set.personId}"> ${set.personName} </option>
+					</c:forEach>
+				</select>
 			</td>
-		</tr>
+			<td valign="top" class="buttons">
+				<span dojoType="ProviderSearch" widgetId="pSearch"></span>
+				<span dojoType="OpenmrsPopup" searchWidget="pSearch" searchTitle='<spring:message code="Encounter.provider.find"/>' changeButtonValue='<spring:message code="general.add"/>' ></span>
+				<input type="button" value="<spring:message code="general.remove"/>" class="smallButton" onClick="removeItem('encounterProviderNames', 'encounterProviders', ' ');" style="display: block" />				
+			</td>
+			<spring:bind path="encounter.providers">
+                <input type="hidden" id="encounterProviders" name="encounterProviders" size="40" value='<c:forEach items="${encounter.providers}" var="set">${set.personId} </c:forEach>' />                                    
+				<c:if test="${status.errorMessage != ''}"><td><span class="error">${status.errorMessage}</span></td></c:if>
+			</spring:bind>
+		</tr>        
 		<tr>
 			<th><spring:message code="Encounter.location"/></th>
 			<td>
@@ -216,7 +306,7 @@
 	</table>
 	
 	<input type="hidden" name="phrase" value='<request:parameter name="phrase" />'/>
-	<input type="submit" id="saveEncounterButton" value='<spring:message code="Encounter.save"/>' disabled>
+	<input type="submit" id="saveEncounterButton" value='<spring:message code="Encounter.save"/>' >
 	&nbsp;
 	<input type="button" value='<spring:message code="general.cancel"/>' onclick="history.go(-1); return; document.location='index.htm?autoJump=false&phrase=<request:parameter name="phrase"/>'">
 	</form>
Index: web/WEB-INF/view/scripts/dojo/src/widget/openmrs/ProviderSearch.js.withjstl
===================================================================
--- web/WEB-INF/view/scripts/dojo/src/widget/openmrs/ProviderSearch.js.withjstl	(revision 0)
+++ web/WEB-INF/view/scripts/dojo/src/widget/openmrs/ProviderSearch.js.withjstl	(revision 0)
@@ -0,0 +1,362 @@
+<%@ include file="/WEB-INF/template/include.jsp" %>
+
+/*
+	Copyright (c) 2006, The OpenMRS Cooperative
+	All Rights Reserved.
+*/
+
+dojo.provide("dojo.widget.openmrs.ProviderSearch");
+dojo.require("dojo.widget.openmrs.OpenmrsSearch");
+
+var openmrsSearchBase = djConfig["baseScriptUri"].substring(0, djConfig["baseScriptUri"].indexOf("/", 1));
+importJavascriptFile(openmrsSearchBase + "/dwr/interface/DWRPersonService.js");
+
+dojo.widget.tags.addParseTreeHandler("dojo:ProviderSearch");
+
+dojo.widget.defineWidget(
+	"dojo.widget.openmrs.ProviderSearch",
+	dojo.widget.openmrs.OpenmrsSearch,
+	{
+		personId: "",
+		roles: "Provider",
+		canAddNewPerson: "",
+		initialized: "",
+		
+		initializer: function(){
+			dojo.debug("initializing ProviderSearch");
+			dojo.event.connect("after", this, "doObjectsFound", this, "postDoObjectsFound");
+		},
+
+		postCreate: function() {
+			if (this.personId != "") {
+				this.selectPerson(this.personId);
+			}
+			if (this.canAddNewPerson == 'true') {
+		        this.initCreateNewPerson();
+				this.domNode.style.width="620px";
+			}
+		},
+		
+		selectPerson: function(personId) {
+			DWRPersonService.getPerson(personId, this.simpleClosure(this, "select"));
+		},
+
+		
+		selectPersonListItem: function(personListItem) {
+			if (personListItem.personId == null) 
+				alert(personListItem);
+			else 
+				this.select(personListItem);
+		    
+		    this.hideNewPersonForm();
+		    return false;
+		},
+
+		doFindObjects: function(text) {
+			var tmpIncludedVoided = (this.showIncludeVoided && this.includeVoided.checked);
+			var newPersonId = DWRPersonService.findPeopleByRoles(text, tmpIncludedVoided, this.roles, this.simpleClosure(this, "doObjectsFound"));
+            if (this.canAddNewPerson == 'true') {
+                if (this.initialized == 'true') {
+                    document.getElementById("newPersonButton").disabled = false;
+                }
+            }
+			return false;
+		},
+		
+		postDoObjectsFound: function( ) {
+			if (this.canAddNewPerson == 'true') { 
+			    // Hide tmpNode place holder after search table has appeared.
+				document.getElementById('tmpNode').style.display = 'none';
+			}
+		},
+		
+		getGiven : function(p) { return p.givenName == null ? this.noCell() : p.givenName;  },
+		getMiddle: function(p) { return p.middleName == null ? this.noCell() : p.middleName; },
+		getFamily: function(p) { return p.familyName == null ? this.noCell() : p.familyName; },
+		getGender: function(p) {
+				if (p.gender == null) { return this.noCell(); }
+				
+				var td = document.createElement("td");
+				td.className = "personGender";
+				var src = "<openmrs:contextPath />/images/";
+				if (p.gender.toUpperCase() == "F")
+					src += "female.gif";
+				else if (p.gender.toUpperCase() == "M")
+					src += "male.gif";
+				else
+					return "";
+				var img = document.createElement("img");
+				td.innerHTML = "<img src='" + src + "'>";
+				return td;
+		},
+		
+		getBirthdayEstimated: function(p) {
+				if (typeof p == 'string') return this.noCell();
+				if (p.birthdateEstimated)
+					return "&asymp;";
+				else
+					return "";
+		},
+		
+		getBirthday: function(p) { 
+				if (typeof p == 'string') return this.noCell();
+				str = this.getDateString(p.birthdate);
+				return str;
+		},
+		
+		getAge: function(p) { 
+				if (typeof p == 'string') return this.noCell();
+				if (p.age == null) return "";
+				var td = document.createElement("td");
+				td.className = 'personAge';
+				var age = p.age;
+				if (age < 1)
+					age = "<1";
+				td.innerHTML = age;
+				return td;
+		},
+		
+		getAttribute: function(p, arg2, attrName) {
+			if (typeof p == 'string') return this.noCell();
+			return p.attributes[attrName];
+		},
+		
+		getIdentifier: function(p) {
+			var td = document.createElement("td");
+			
+			if (p.patientId)
+				td.onmouseover = function() { window.status = "Patient Id: " + p.patientId; };
+			td.onmouseout = function() { window.status = "" };
+			
+			/* Because this is the first column, return 'p' */
+			if (typeof p == 'string') {
+				td.colSpan = this.getHeaderCellContent().length;
+				td.innerHTML = p;
+			}
+			else if (p.identifier) {
+				td.className = "patientIdentifier";
+				var obj = document.createTextNode(p.identifier + " ");
+				td.appendChild(obj);
+			}
+			
+			return td;
+		},
+
+		getCellFunctions: function() {
+			var arr = new Array();
+			arr.push(this.simpleClosure(this, "getNumber"));
+			arr.push(this.simpleClosure(this, "getIdentifier"));
+			arr.push(this.simpleClosure(this, "getGiven"));
+			arr.push(this.simpleClosure(this, "getMiddle"));
+			arr.push(this.simpleClosure(this, "getFamily"));
+			arr.push(this.simpleClosure(this, "getAge"));
+			arr.push(this.simpleClosure(this, "getGender"));
+			arr.push(this.simpleClosure(this, "getBirthdayEstimated"));
+			arr.push(this.simpleClosure(this, "getBirthday"));
+			<openmrs:forEachDisplayAttributeType personType="" displayType="listing" var="attrType">
+				arr.push(this.simpleClosure(this, "getAttribute", "${attrType.name}"));
+			</openmrs:forEachDisplayAttributeType>
+			return arr;
+		},
+		
+		showHeaderRow: true,
+		getHeaderCellContent: function() {
+			var arr = new Array();
+			arr.push('');
+			arr.push('<spring:message code="Patient.identifier" javaScriptEscape="true"/>');
+			arr.push('<spring:message code="PersonName.givenName" javaScriptEscape="true"/>');
+			arr.push('<spring:message code="PersonName.middleName" javaScriptEscape="true"/>');
+			arr.push('<spring:message code="PersonName.familyName" javaScriptEscape="true"/>');
+			arr.push('<spring:message code="Person.age" javaScriptEscape="true"/>');
+			arr.push('<spring:message code="Person.gender" javaScriptEscape="true"/>');
+			arr.push('');
+			arr.push('<spring:message code="Person.birthdate" javaScriptEscape="true"/>');
+			<openmrs:forEachDisplayAttributeType personType="" displayType="listing" var="attrType">
+				arr.push('<spring:message code="PersonAttributeType.${fn:replace(attrType.name, ' ', '')}" javaScriptEscape="true" text="${attrType.name}"/>');
+			</openmrs:forEachDisplayAttributeType>
+			
+			return arr;
+		},
+		
+		allowAutoJump: function() {
+			return false;
+		},
+
+        // Override superclass.clearSearch( ) to disable newPersonButton.
+        clearSearch: function() {
+            dojo.widget.openmrs.ProviderSearch.superclass.clearSearch.call(this);
+            if (this.canAddNewPerson == 'true') {
+                if (this.initialized == 'true') {
+                    this.hideNewPersonForm();
+                    document.getElementById("newPersonButton").disabled = true;
+                }
+            }
+        },
+
+        initCreateNewPerson: function( ) {
+            // Create a tmpNode placeholder until the search table shows up.
+            var tmpNode = document.createElement("div");
+            tmpNode.id = 'tmpNode';
+            tmpNode.innerHTML = "<br/><br/><br/>";
+            this.domNode.appendChild(tmpNode, this.domNode.lastChild);
+            // Create the New Person Button and Form.
+            this.domNode.appendChild(this.createNewPersonButton(), this.domNode.lastChild);
+            this.domNode.appendChild(this.createNewPersonForm(), this.domNode.lastChild);
+            // Attach events.
+            dojo.event.connect(document.getElementById("newPersonButton"), "onclick", this, "showNewPersonForm");                     
+            dojo.event.connect(document.getElementById('cancel'), "onclick", this, "hideNewPersonForm");
+            dojo.event.connect(document.getElementById('submitPerson'), "onclick", this, "submitNewPerson");
+            dojo.event.connect(document.getElementById('newPersonForm'), "onkeydown", this, "validateSubmitKey");
+            // Set initialized flag.
+            this.initialized = 'true';
+        },
+        
+        submitNewPerson: function(event) {
+            var errors = document.getElementsByName("error");
+            for (var i=0; i<errors.length; i++)
+                errors[i].style.display = "none";
+            var valid = true;
+            var ipName = document.getElementsByName('ipName');
+            if ("" == ipName[0].value) { // || "" == ipName[2].value) {
+                valid = false;
+                document.getElementById("errorGiven").style.display = "";
+            }
+            if ("" == ipName[2].value) {
+                valid = false;
+                document.getElementById("errorFamily").style.display = "";
+            }
+            var ipDate = document.getElementsByName('ipDate');
+            if ("" == ipDate[0].value && "" == ipDate[1].value) {
+                valid = false;
+                document.getElementById("errorAge").style.display = "";
+            }
+            var year = new Date().getFullYear();
+            var birthyear = (ipDate[0] == null || "" == ipDate[0].value) ? "" : ipDate[0].value.substr(6, 4);
+            if (("" == ipDate[0].value || birthyear.length < 4 || birthyear < (year-120) || this.isFutureDate(ipDate[0].value)) && "" == ipDate[1].value) {
+                valid = false;
+                document.getElementById("errorAge").style.display = "";
+            }
+            var ipGender = document.getElementsByName('ipGender');
+            if (!ipGender[0].checked && !ipGender[1].checked) {
+                valid = false;
+                document.getElementById("errorGender").style.display = "";
+            }
+            if (valid == false) return false;
+            var gender = (ipGender[0].checked ? "M" : "F");
+            var tmpIncludedVoided = (this.showIncludeVoided && this.includeVoided.checked);
+            var format = document.getElementById('datepattern');
+            DWRPersonService.createPerson(ipName[0].value, ipName[1].value, ipName[2].value, ipDate[0].value, format.value, ipDate[1].value, gender, this.simpleClosure(this, "selectPersonListItem"));
+            this.hideNewPersonForm( );
+            return false;
+        },
+        
+        validateSubmitKey: function(event) {
+            if (event.keyCode != dojo.event.browser.keys.KEY_ENTER) {
+                if (event.keyCode == dojo.event.browser.keys.KEY_ESCAPE) {
+                    this.hideNewPersonForm();
+                }
+                return false;
+            }
+            if (document.getElementById("newPersonForm").style.display == "none") {
+                return false;
+            }
+            return this.submitNewPerson(event);
+        },
+        
+        showNewPersonForm: function( ) {
+                document.getElementById("newPersonForm").style.display = "";
+                document.getElementById("newPersonButton").style.display = "none";
+                var givenNameInput = document.getElementById("givenName");
+            	//if (!givenNameInput.disabled && givenNameInput.display) // in case its not loaded yet (ie6)
+            	//	givenNameInput.focus();
+                var errors = document.getElementsByName("error");
+                for (var i=0; i<errors.length; i++)
+                    errors[i].style.display = "none";
+        },
+
+        hideNewPersonForm: function( ) {
+                document.getElementById("newPersonForm").style.display = "none";
+                document.getElementById("newPersonButton").style.display = "";
+                var newPersonButton = document.getElementById("newPersonButton");
+                //if (!newPersonButton.disabled && newPersonButton.display) // in case its not loaded yet (ie6) 
+                //	newPersonButton.focus();
+        },
+
+        isFutureDate: function(birthdate) {
+                if (birthdate == "")
+                    return false;
+                var currentTime = new Date().getTime();
+                var datePattern = '<openmrs:datePattern />';
+                var datePatternStart = datePattern.substr(0,1).toLowerCase();
+                var enteredTime = new Date();
+                var year, month, day;
+                if (datePatternStart == 'm') { /* M-D-Y */
+                    year = birthdate.substr(6, 4);
+                    month = birthdate.substr(0, 2);
+                    day = birthdate.substr(3, 2);
+                }
+                else if (datePatternStart == 'y') { /* Y-M-D */
+                    year = birthdate.substr(0, 4);
+                    month = birthdate.substr(3, 2);
+                    day = birthdate.substr(8, 2);
+                }
+                else { /* (datePatternStart == 'd') D-M-Y */
+                    year = birthdate.substr(6, 4);
+                    month = birthdate.substr(3, 2);
+                    day = birthdate.substr(0, 2);
+                }
+                /* alert("year: " + year + " month: " + month + " day " + day); */
+                enteredTime.setYear(year);
+                enteredTime.setMonth(month - 1);
+                enteredTime.setDate(day);
+                
+                return enteredTime.getTime() > currentTime;
+        },
+
+        createNewPersonButton: function( ) {
+            var buttonForm = document.createElement("form");
+            var message = "<b id='newPersonButtonMsg'><spring:message code='Person.addNew.msg' /><br/></b>";
+            var button = "<input type='button' name='showhide' id='newPersonButton' value='<spring:message code='Person.addNew'/>'/>";
+            buttonForm.id = 'newPersonButtonForm';
+            buttonForm.innerHTML = message + button;
+            return buttonForm;
+        },
+
+        createNewPersonForm: function( ) {
+            var tbl_top = "<div style='border: 2px solid black; background-color: rgb(224, 224, 224);' ><table><tr><th></th><th><spring:message code='Person.addNew'/>:</th></tr>";
+
+            var r1d1 = "<tr><td><spring:message code='PersonName.givenName'/></td>";
+            var r1d2 = "<td><input type='text' name='ipName' id='givenName' size='30' value=''/></td>";
+            var r1d3 = "</tr><tr><td></td><td><span id='errorGiven' name='error' class='error'><spring:message code='PersonName.givenName'/>: <spring:message code='Person.name.required'/></span></td></tr>";
+            
+            var r2d1 = "<tr><td><spring:message code='PersonName.middleName'/></td>";
+            var r2d2 = "<td><input type='text' name='ipName' id='middleName' size='30' value='' /></td></tr>";
+
+            var r3d1 = "<tr><td><spring:message code='PersonName.familyName'/></td>"
+            var r3d2 = "<td><input type='text' name='ipName' id='familyName' size='30' value='' /></td>";
+            var r3d3 = "</tr><tr><td></td><td><span id='errorFamily' name='error' class='error'><spring:message code='PersonName.familyName'/>: <spring:message code='Person.name.required'/></span></td></tr>";
+
+            var r4d1 = "<tr><td><spring:message code='Person.birthdate'/><br/><input type='hidden' id='datepattern' value='<openmrs:datePattern />'/><i style='font-weight: normal; font-size: 0.8em;'>(<spring:message code='general.format'/>: <openmrs:datePattern />)</i></td>";
+            var r4d2 = "<td valign='top'><input type='text' name='ipDate' id='birthdate' size='11' value='' onclick='showCalendar(this)' /><spring:message code='Person.age.or'/><input type='text' name='ipDate' id='age' size='5' value='' /><td>";
+            var r4d3 = "</tr><tr><td></td><td><span id='errorAge' name='error' class='error'><spring:message code='Person.birthdate.required'/></span></td>";
+
+            var r5d1 = "<tr><td><spring:message code='Person.gender'/></td>";
+            var r5d2 = "<td><openmrs:forEachRecord name='gender'><input type='radio' name='ipGender' id='gender-${record.key}' value='${record.key}' /><label for='gender-${record.key}'> <spring:message code='Person.gender.${record.value}'/> </label></openmrs:forEachRecord></td>";
+            var r5d3 = "</tr><tr><td></td><td><span id='errorGender' name='error' class='error'><spring:message code='Person.gender.required'/></span></td>"; 
+
+            var r6d1 = "<tr><td></td><td><input type='submit' id='submitPerson' value='<spring:message code='Person.create'/>' /><input type='button' name='showhide' id='cancel' value='<spring:message code='general.cancel'/>'/></td></tr>";
+
+            var tbl_bot = "<input type='hidden' name='personType' value='${model.personType}'/><input type='hidden' name='viewType' value='${model.viewType}'/></table></div>";
+
+            var newPersonForm = document.createElement("form");
+            newPersonForm.id = "newPersonForm";
+            newPersonForm.style.display = "none";    
+            newPersonForm.onsubmit = function() {return false};   
+            newPersonForm.innerHTML = tbl_top + r1d1 + r1d2 + r1d3 + r2d1 + r2d2 + r3d1 + r3d2 + r3d3 + r4d1 + r4d2 + r4d3 + r5d1 + r5d2 + r5d3 + r6d1 + tbl_bot;
+
+            return newPersonForm;
+        }
+        
+	},
+	"html"
+);