|
@@ -416,17 +416,17 @@ public class ColumnResultManagementFacade {
|
|
|
//非空校验规则今天有修改
|
|
|
if (ListUtil.isNotEmpty(nonnullInfoList) && ListUtil.isNotEmpty(behospitalCodeList)) {
|
|
|
//调用校验非空规则方法
|
|
|
- checkNonnull(nonnullInfos, behospitalCodeList, hospitalId, principleId, recColumnTable);
|
|
|
+ checkNonnull(nonnullInfoList, behospitalCodeList, hospitalId, principleId, recColumnTable);
|
|
|
}
|
|
|
//正则校验规则今天有修改
|
|
|
if (ListUtil.isNotEmpty(regularList) && ListUtil.isNotEmpty(behospitalCodeList)) {
|
|
|
//调用校验正则规则
|
|
|
- checkRegular(regularMappings, behospitalCodeList, hospitalId, principleId, recColumnTable);
|
|
|
+ checkRegular(regularList, behospitalCodeList, hospitalId, principleId, recColumnTable);
|
|
|
}
|
|
|
//标准值校验规则今天有修改
|
|
|
if (ListUtil.isNotEmpty(standardvalueList) && ListUtil.isNotEmpty(behospitalCodeList)) {
|
|
|
//调用校验正则规则
|
|
|
- checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId, principleId, recColumnTable);
|
|
|
+ checkStandardvalue(standardvalueList, behospitalCodeList, hospitalId, principleId, recColumnTable);
|
|
|
}
|
|
|
}
|
|
|
|