|
@@ -3,6 +3,8 @@ package com.lantone.qc.trans.hangzhoufubao.util;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
|
+
|
|
|
+
|
|
|
import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
|
|
|
import com.lantone.qc.trans.yuhangsy.util.comsis.YuhangsyCommonAnalysisUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -82,29 +84,40 @@ public class BeHospitalizedHtmlAnalysis implements HtmlAnalysis {
|
|
|
}
|
|
|
}
|
|
|
String admissionDate = map.get("入院日期");
|
|
|
- String s = CommonAnalysisUtil.extractDateHangzhou(admissionDate);
|
|
|
- if (StringUtil.isNotBlank(s)) {
|
|
|
- String replace = admissionDate.replace(s, "");
|
|
|
- map.put(admissionDate, s + " " + replace);
|
|
|
+
|
|
|
+ if (StringUtil.isNotBlank(admissionDate)) {
|
|
|
+ String s = CommonAnalysisUtil.extractDateHangzhou(admissionDate);
|
|
|
+ if (StringUtil.isNotBlank(s)) {
|
|
|
+ String replace = admissionDate.replace(s, "");
|
|
|
+ map.put(admissionDate, s + " " + replace);
|
|
|
+ }
|
|
|
}
|
|
|
String recordDate = map.get("记录日期");
|
|
|
- String extractRecordDate = CommonAnalysisUtil.extractDateHangzhou(recordDate);
|
|
|
- if (StringUtil.isNotBlank(extractRecordDate)) {
|
|
|
- String replace = recordDate.replace(extractRecordDate, "");
|
|
|
- map.put(recordDate, extractRecordDate + " " + replace);
|
|
|
+
|
|
|
+ if (StringUtil.isNotBlank(recordDate)) {
|
|
|
+ String extractRecordDate = CommonAnalysisUtil.extractDateHangzhou(recordDate);
|
|
|
+ if (StringUtil.isNotBlank(extractRecordDate)) {
|
|
|
+ String replace = recordDate.replace(extractRecordDate, "");
|
|
|
+ map.put(recordDate, extractRecordDate + " " + replace);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
String writeTime = map.get("记录时间");
|
|
|
- String extractWriteTime = CommonAnalysisUtil.extractDateHangzhou(writeTime);
|
|
|
- if (StringUtil.isNotBlank(extractWriteTime)) {
|
|
|
- String replace = writeTime.replace(extractWriteTime, "");
|
|
|
- map.put(writeTime, extractWriteTime + " " + replace);
|
|
|
+
|
|
|
+ if (StringUtil.isNotBlank(writeTime)) {
|
|
|
+ String extractWriteTime = CommonAnalysisUtil.extractDateHangzhou(writeTime);
|
|
|
+ if (StringUtil.isNotBlank(extractWriteTime)) {
|
|
|
+ String replace = writeTime.replace(extractWriteTime, "");
|
|
|
+ map.put(writeTime, extractWriteTime + " " + replace);
|
|
|
+ }
|
|
|
}
|
|
|
String admissionTime = map.get("入院时间");
|
|
|
- String extractAdmissionTime = CommonAnalysisUtil.extractDateHangzhou(admissionTime);
|
|
|
- if (StringUtil.isNotBlank(extractAdmissionTime)) {
|
|
|
- String replace = admissionTime.replace(extractAdmissionTime, "");
|
|
|
- map.put(admissionTime, extractAdmissionTime + " " + replace);
|
|
|
+ if (StringUtil.isNotBlank(admissionTime)) {
|
|
|
+ String extractAdmissionTime = CommonAnalysisUtil.extractDateHangzhou(admissionTime);
|
|
|
+ if (StringUtil.isNotBlank(extractAdmissionTime)) {
|
|
|
+ String replace = admissionTime.replace(extractAdmissionTime, "");
|
|
|
+ map.put(admissionTime, extractAdmissionTime + " " + replace);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|