|
@@ -446,11 +446,16 @@ public class VerifyCaseFrontSheet {
|
|
|
|
|
|
private boolean surgeryDateWrong(List<CaseFrontsheetSurgery> surgeries, Date admissDate, Date outmissDate) {
|
|
|
for (CaseFrontsheetSurgery item : surgeries) {
|
|
|
- if (null == item.getDate()) {
|
|
|
- return false;
|
|
|
+ if (StringUtil.isBlank(item.getCode())) {
|
|
|
+ continue;
|
|
|
}
|
|
|
- if (DateUtil.daysBetween(item.getDate(), admissDate) < 0 ||
|
|
|
- DateUtil.daysBetween(item.getDate(), outmissDate) > 0) {
|
|
|
+ if (StringUtil.notBlank(item.getCode()) && null == item.getDate()) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ long admstamp = admissDate.getTime();
|
|
|
+ long srgstamp = item.getDate().getTime();
|
|
|
+ long disstamp = outmissDate.getTime();
|
|
|
+ if (admstamp > srgstamp || srgstamp > disstamp) {
|
|
|
return true;
|
|
|
}
|
|
|
}
|