|
@@ -407,7 +407,7 @@ public class VerifyCaseFrontSheet {
|
|
|
array.add(new CodeName("surgeryTable","同一天不能有相同的手术!"));
|
|
|
}
|
|
|
if (surgeryDateWrong(info.getSurgeryList(), info.getAdmissDate(), info.getDismissDate())) {
|
|
|
- array.add(new CodeName("surgeryTable","手术时间必须在入院时间和出院时间之间!"));
|
|
|
+ array.add(new CodeName("surgeryTable","手术时间必须在入院时间24小时之前和出院时间之间!"));
|
|
|
}
|
|
|
if ((StringUtil.notBlank(info.getBloodType()) && ("5".equals(info.getBloodType()) || "6".equals(info.getBloodType()))) &&
|
|
|
(StringUtil.notBlank(info.getRh()) && !"0".equals(info.getRh()) && !"3".equals(info.getRh()))) {
|
|
@@ -631,6 +631,8 @@ public class VerifyCaseFrontSheet {
|
|
|
if (null == outmissDate) {
|
|
|
return false;
|
|
|
}
|
|
|
+ long admstamp = admissDate.getTime() - (24 * 60 * 60 * 1000);
|
|
|
+ long disstamp = outmissDate.getTime();
|
|
|
for (CaseFrontsheetSurgery item : surgeries) {
|
|
|
if (StringUtil.isBlank(item.getCode())) {
|
|
|
continue;
|
|
@@ -638,9 +640,7 @@ public class VerifyCaseFrontSheet {
|
|
|
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;
|
|
|
}
|