Navigation

Changeset 3095

Timestamp:

01/16/08 19:03:44 (10 months ago)

Author:

djazayeri

Message:

double entry reconciliation module - trim leading and trailing whitespace before comparing values for equality

Files:

r2717	r3095
49	49	data.put(o.getConcept().getName().getName(), list);
50	50	}
51		list.add(o.getValueAsString(locale) + " . " + df.format(o.getObsDatetime()));
	51	list.add(o.getValueAsString(locale).trim() + " . " + df.format(o.getObsDatetime()));
52	52	}
53	53	work.add(data);

r2687	r3095
31	31	numeric.setName("Numeric");
32	32
	33	ConceptDatatype text = new ConceptDatatype();
	34	text.setConceptDatatypeId(2);
	35	text.setHl7Abbreviation("ST");
	36	text.setName("Text");
	37
33	38	Concept cd4 = new Concept();
34	39	cd4.setConceptId(1);
…	…
40	45	weight.addName(new ConceptName("WEIGHT", "WEIGHT", "WEIGHT", locale));
41	46	weight.setDatatype(numeric);
	47
	48	Concept comments = new Concept();
	49	comments.setConceptId(3);
	50	comments.addName(new ConceptName("COMMENTS", "COMMENTS", "Free-text comments", locale));
	51	comments.setDatatype(text);
42	52
43	53	Obs obs1 = new Obs();
…	…
62	72	obs3.setObsDatetime(before);
63	73
	74	Obs obsWithoutSpace = new Obs();
	75	obsWithoutSpace.setConcept(comments);
	76	obsWithoutSpace.setValueText("This is a test");
	77	obsWithoutSpace.setObsDatetime(before);
	78
	79	Obs obsWithSpace = new Obs();
	80	obsWithSpace.setConcept(comments);
	81	obsWithSpace.setValueText(" This is a test ");
	82	obsWithSpace.setObsDatetime(before);
	83
64	84	Encounter first = new Encounter();
65	85	first.setEncounterDatetime(now);
…	…
68	88	first.addObs(obs2);
69	89	first.addObs(voidedObs);
	90	first.addObs(obsWithoutSpace);
70	91
71	92	Encounter second = new Encounter();
…	…
74	95	second.addObs(obs1);
75	96	second.addObs(obs2);
	97	second.addObs(obsWithSpace);
76	98
77	99	List<Encounter> toCheck = new ArrayList<Encounter>();