|
@@ -31,11 +31,20 @@ public class FIRC0093 extends QCCatalogue {
|
|
|
Map<String, String> beHospitalizedDocStructureMap = beHospitalizedDoc.getStructureMap();
|
|
|
if (courseRecordDocStructureMap != null && beHospitalizedDocStructureMap != null) {
|
|
|
String couDate = courseRecordDocStructureMap.get("病历日期");
|
|
|
+ String couBeDate = courseRecordDocStructureMap.get("入院日期");
|
|
|
String beDate = beHospitalizedDocStructureMap.get("入院日期");
|
|
|
- if (StringUtils.isNotEmpty(couDate) && StringUtils.isNotEmpty(beDate)) {
|
|
|
- Date date_in = StringUtil.parseDateTime(beDate);
|
|
|
+ if (StringUtils.isNotEmpty(couDate)) {
|
|
|
Date date_out = StringUtil.parseDateTime(couDate);
|
|
|
- if (date_in == null || date_out == null) {
|
|
|
+ Date date_in = null;
|
|
|
+ if (date_out == null) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(couBeDate)) {
|
|
|
+ date_in = StringUtil.parseDateTime(couBeDate);
|
|
|
+ } else if (StringUtils.isNotEmpty(beDate)) {
|
|
|
+ date_in = StringUtil.parseDateTime(beDate);
|
|
|
+ }
|
|
|
+ if (date_in == null) {
|
|
|
return;
|
|
|
}
|
|
|
boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
|