|
@@ -152,6 +152,12 @@ public class EZAnalysis {
|
|
}
|
|
}
|
|
|
|
|
|
private void vaccinateHandle(InputInfo inputInfo, Map<String, String> map) {
|
|
private void vaccinateHandle(InputInfo inputInfo, Map<String, String> map) {
|
|
|
|
+ String yfjzx = map.get("预防接种史");
|
|
|
|
+ if (StringUtil.isBlank(yfjzx)) {
|
|
|
|
+ yfjzx = "";
|
|
|
|
+ } else if (!(yfjzx.endsWith(",") || yfjzx.endsWith(",") || yfjzx.endsWith(".") || yfjzx.endsWith("。") || yfjzx.endsWith("、"))) {
|
|
|
|
+ yfjzx += "。";
|
|
|
|
+ }
|
|
StringBuffer sbf = new StringBuffer();
|
|
StringBuffer sbf = new StringBuffer();
|
|
PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
|
|
PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
|
|
List<Vaccinate> vaccinates = pastLabel.getVaccinates();
|
|
List<Vaccinate> vaccinates = pastLabel.getVaccinates();
|
|
@@ -167,7 +173,9 @@ public class EZAnalysis {
|
|
sbf.append(i.getNegative().getName()).append(i.getName()).append(",");
|
|
sbf.append(i.getNegative().getName()).append(i.getName()).append(",");
|
|
});
|
|
});
|
|
}
|
|
}
|
|
- map.put("预防接种史", sbf.toString());
|
|
|
|
|
|
+ if (sbf.length() > 0) {
|
|
|
|
+ map.put("预防接种史", yfjzx + sbf.toString());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
private void operationHandle(InputInfo inputInfo, Map<String, String> map) {
|
|
private void operationHandle(InputInfo inputInfo, Map<String, String> map) {
|