|
@@ -40,10 +40,15 @@ public class TzXmlUtil {
|
|
|
List<Element> emrTermElements = doc.getRootElement().element("TermList").elements("EMR-TERM");
|
|
|
String ename, setnomark, text;
|
|
|
for (Element emrTermElement : emrTermElements) {
|
|
|
- ename = StringUtil.removeBlank(emrTermElement.attributeValue("ename"));
|
|
|
+ ename = emrTermElement.attributeValue("ename");
|
|
|
+ if (StringUtil.isBlank(ename)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ ename = StringUtil.removeBlank(ename);
|
|
|
setnomark = emrTermElement.attributeValue("setnomark");
|
|
|
+ setnomark = setnomark == null ? "" : setnomark;
|
|
|
text = emrTermElement.getStringValue().trim();
|
|
|
- if (retMap == null || StringUtil.isEmpty(retMap.get(ename))) {
|
|
|
+ if (StringUtil.isBlank(retMap.get(ename))) {
|
|
|
if (StringUtil.isBlank(text)) {
|
|
|
retMap.put(ename, setnomark);
|
|
|
} else {
|