|
@@ -261,12 +261,15 @@ public class TcmSheetVerifyService {
|
|
|
array.add(new CodeName("birthDate","出生时间不能晚于入院时间!"));
|
|
|
}
|
|
|
|
|
|
- Calendar dis = Calendar.getInstance();
|
|
|
- dis.set(Calendar.YEAR, info.getDismissYear());
|
|
|
- dis.set(Calendar.MONTH, info.getDismissMonth());
|
|
|
- dis.set(Calendar.DAY_OF_MONTH, info.getDismissDay());
|
|
|
- if (adm.after(dis)) {
|
|
|
- array.add(new CodeName("dismissDate","出院时间不能早于入院时间!"));
|
|
|
+ Calendar dis = null;
|
|
|
+ if (null != info.getDismissYear() && null != info.getDismissMonth() && null != info.getDismissDay()) {
|
|
|
+ dis = Calendar.getInstance();
|
|
|
+ dis.set(Calendar.YEAR, info.getDismissYear());
|
|
|
+ dis.set(Calendar.MONTH, info.getDismissMonth());
|
|
|
+ dis.set(Calendar.DAY_OF_MONTH, info.getDismissDay());
|
|
|
+ if (adm.after(dis)) {
|
|
|
+ array.add(new CodeName("dismissDate","出院时间不能早于入院时间!"));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (null != info.getNbAge() && info.getNbAge() <= 28) {
|
|
@@ -284,14 +287,15 @@ public class TcmSheetVerifyService {
|
|
|
array.add(new CodeName("newBornAdmissWeight","请填写合理的新生儿入院体重(不得少于1000g)!"));
|
|
|
}
|
|
|
}
|
|
|
- return connectedVerify(array, info, adm.getTime(), dis.getTime());
|
|
|
+ return connectedVerify(array, info, adm, dis);
|
|
|
}
|
|
|
|
|
|
- private List<CodeName> connectedVerify(List<CodeName> array, TcmFrontSheetMain info, Date adm, Date dis) {
|
|
|
+ private List<CodeName> connectedVerify(List<CodeName> array, TcmFrontSheetMain info,
|
|
|
+ Calendar adm, Calendar dis) {
|
|
|
boolean hasAnaesthesia = false;
|
|
|
boolean hasAnaesthesiaor = false;
|
|
|
for (TcmFrontSheetSurgery surgery : info.getSurgeryList()) {
|
|
|
- checkSurgery(array, surgery, adm, dis);
|
|
|
+ checkSurgery(array, surgery);
|
|
|
if (StringUtil.notBlank(surgery.getAnaesthesia())) {
|
|
|
hasAnaesthesia = true;
|
|
|
}
|
|
@@ -337,7 +341,7 @@ public class TcmSheetVerifyService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- private void checkSurgery(List<CodeName> array, TcmFrontSheetSurgery surgery, Date adm, Date dis) {
|
|
|
+ private void checkSurgery(List<CodeName> array, TcmFrontSheetSurgery surgery) {
|
|
|
if (StringUtil.isBlank(surgery.getName())) {
|
|
|
return;
|
|
|
}
|
|
@@ -382,7 +386,7 @@ public class TcmSheetVerifyService {
|
|
|
return StringUtil.notBlank(zipCode) && zipCode.length() != 6;
|
|
|
}
|
|
|
|
|
|
- private boolean surgeryDateWrong(List<TcmFrontSheetSurgery> surgeries, Date adm, Date dis) {
|
|
|
+ private boolean surgeryDateWrong(List<TcmFrontSheetSurgery> surgeries, Calendar adm, Calendar dis) {
|
|
|
if (null == adm || null == dis) {
|
|
|
return false;
|
|
|
}
|
|
@@ -390,7 +394,7 @@ public class TcmSheetVerifyService {
|
|
|
if (StringUtil.notBlank(item.getCode()) && null == item.getDate()) {
|
|
|
return true;
|
|
|
}
|
|
|
- if (item.getDate().before(adm) || item.getDate().after(dis)) {
|
|
|
+ if (item.getDate().before(adm.getTime()) || item.getDate().after(dis.getTime())) {
|
|
|
return true;
|
|
|
}
|
|
|
}
|