|
@@ -1,7 +1,6 @@
|
|
|
package com.lantone.qc.trans.taizhou;
|
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
-import com.google.common.collect.Maps;
|
|
|
import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
|
|
|
import com.lantone.qc.pub.model.label.ChiefLabel;
|
|
|
import com.lantone.qc.pub.model.label.DiagLabel;
|
|
@@ -42,14 +41,12 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
|
|
|
String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
|
|
|
|
|
|
Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
|
|
|
- Map<String, String> sourceMapCopy = Maps.newHashMap();
|
|
|
- sourceMapCopy.putAll(sourceMap);
|
|
|
+ Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
|
|
|
// 年龄从生日转换
|
|
|
- if (StringUtil.isBlank(sourceMapCopy.get("年龄")) && StringUtil.isNotBlank(sourceMapCopy.get("生日"))) {
|
|
|
- int age = DateUtil.getAge(sourceMapCopy.get("生日"));
|
|
|
- sourceMapCopy.put("年龄", String.valueOf(age));
|
|
|
+ if (StringUtil.isBlank(structureMap.get("年龄")) && StringUtil.isNotBlank(structureMap.get("出生日期"))) {
|
|
|
+ int age = DateUtil.getAge(structureMap.get("出生日期"));
|
|
|
+ structureMap.put("年龄", String.valueOf(age));
|
|
|
}
|
|
|
- Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMapCopy, keyContrasts);
|
|
|
BeHospitalizedDoc beHospitalizedDoc = beHospitalizedDocGen(structureMap); // 不走共用
|
|
|
beHospitalizedDoc.setText(content);
|
|
|
beHospitalizedDoc.setPageData((Map)sourceMap);
|