|
@@ -36,13 +36,15 @@ public class OPE0647 extends QCCatalogue {
|
|
|
continue;
|
|
|
}
|
|
|
Map<String, String> operationRecordStructureMap = operationRecordDoc.getStructureMap();
|
|
|
- String operationEndDateStr = operationRecordStructureMap.get("手术结束时间");
|
|
|
+ String operationDateStr = operationRecordStructureMap.get("手术日期");
|
|
|
+ String endDateStr = operationRecordStructureMap.get("结束时间");
|
|
|
String operationRecordDateStr = operationRecordStructureMap.get("病历日期");
|
|
|
- if (CatalogueUtil.isEmpty(operationEndDateStr) || CatalogueUtil.isEmpty(operationRecordDateStr)) {
|
|
|
+ if (CatalogueUtil.isEmpty(operationDateStr) || CatalogueUtil.isEmpty(endDateStr) || CatalogueUtil.isEmpty(operationRecordDateStr)) {
|
|
|
continue;
|
|
|
}
|
|
|
+ String operationEndDateStr = operationDateStr + " " + endDateStr;
|
|
|
Date operationEndDate = StringUtil.parseDateTime(operationEndDateStr);
|
|
|
- Date operationRecordDate = StringUtil.parseDateTime(operationRecordDateStr);
|
|
|
+ Date operationRecordDate = StringUtil.parseDateTime(operationRecordDateStr.replace("/", "-"));
|
|
|
if (operationEndDate == null || operationRecordDate == null) {
|
|
|
continue;
|
|
|
}
|