|
@@ -208,6 +208,9 @@ public class RescueTran extends TargetTran {
|
|
|
retMap.put("抢救开始日期时间",startHmsTime);
|
|
|
if(strDate.size()>1 && ! strDate.get(0).equals(strDate.get(strDate.size()-1))){
|
|
|
String endHmsTime = transHmTime(strDate.get(strDate.size() - 1));
|
|
|
+ if(!endHmsTime.contains(" ")){
|
|
|
+ endHmsTime = endHmsTime.replace("日", "日 ");
|
|
|
+ }
|
|
|
retMap.put("抢救结束日期时间",endHmsTime);
|
|
|
}
|
|
|
}
|
|
@@ -346,7 +349,7 @@ public class RescueTran extends TargetTran {
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
- time = time.replace(":", ":").replace("::", ":").replace("于", "");
|
|
|
+ time = time.replace(".", "-").replace(":", ":").replace("::", ":").replace("于", "").replace("时 ", "时");
|
|
|
if(time.contains(":")){
|
|
|
time = time.replace("时", "").replace("分", "");
|
|
|
}
|
|
@@ -363,6 +366,11 @@ public class RescueTran extends TargetTran {
|
|
|
String filterTime = transDate(extractDate(time));
|
|
|
return filterTime+" "+hmsDate;
|
|
|
}
|
|
|
+ if(time.contains("-") && time.contains(":")){
|
|
|
+ String hmsDate = time.substring(time.lastIndexOf(extractDate(time))+extractDate(time).length()).trim();
|
|
|
+ String filterTime = transDate(extractDate(time));
|
|
|
+ return filterTime+" "+hmsDate.replace(":","时")+"分";
|
|
|
+ }
|
|
|
return time;
|
|
|
}
|
|
|
/**
|