Navigation

Encounter.java

Timestamp:

07/17/08 15:20:10 (6 months ago)

Author:

catullus

Message:

sync-bidrectional: partly merge

Files:

openmrs/branches/data_synchronization_bidirectional
- Property svn:ignore changed from build* dist* ${env.CATALINA_HOME} docs .metadata setup.inf setup.rpt to build* dist* ${env.CATALINA_HOME} docs .metadata setup.inf setup.rpt *.iws *.ipr *.iml

r4121	r4969
306	306	if (obs == null)
307	307	obs = new HashSet<Obs>();
308		if (observation != null)
	308	if (observation != null) {
	309	if (observation.getObsDatetime() == null)
	310	observation.setObsDatetime(getEncounterDatetime());
	311	if (observation.getPerson() == null)
	312	observation.setPerson(getPatient());
	313	if (observation.getLocation() == null)
	314	observation.setLocation(getLocation());
309	315	obs.add(observation);
	316	}
310	317	}
311	318