|
@@ -368,7 +368,7 @@ public class VerifyCaseFrontSheet {
|
|
|
hasAnaesthesiaor = true;
|
|
|
}
|
|
|
}
|
|
|
- if (DecimalUtil.compare(info.getAnesthetizeFee(), "0") == 1) {
|
|
|
+ if (DecimalUtil.biggerThanZero(info.getAnesthetizeFee())) {
|
|
|
if (ListUtil.isBlank(info.getSurgeryList())) {
|
|
|
array.add(new CodeName("surgeryMain", "患者有麻醉费,手术列表不能为空!"));
|
|
|
} else {
|
|
@@ -395,10 +395,10 @@ public class VerifyCaseFrontSheet {
|
|
|
if (StringUtil.validValue(info.getAllergy()) && "2".equals(info.getAllergy()) && StringUtil.invalidValue(info.getAllergicMedicine())) {
|
|
|
array.add(new CodeName("allergicMedicine","患者有药物过敏时,过敏药物名称不能为空!"));
|
|
|
}
|
|
|
- if (StringUtil.validValue(info.getPathologicDiagFee()) && StringUtil.invalidValue(info.getBlh())) {
|
|
|
+ if (DecimalUtil.biggerThanZero(info.getPathologicDiagFee()) && StringUtil.invalidValue(info.getBlh())) {
|
|
|
array.add(new CodeName("blh","患者有病理诊断费,病理号不能为空!"));
|
|
|
}
|
|
|
- if (hasSurgeryFee(info.getSurgeryFee()) && StringUtil.isBlank(info.getSurgeryList().get(0).getName())) {
|
|
|
+ if (DecimalUtil.biggerThanZero(info.getSurgeryFee()) && StringUtil.isBlank(info.getSurgeryList().get(0).getName())) {
|
|
|
array.add(new CodeName("surgeryMain","患者有手术费,手术列表不能为空!"));
|
|
|
}
|
|
|
if (needHurtReason(info.getDisdiagList().get(0).getCode()) &&
|