|
@@ -361,7 +361,7 @@ public class ColumnVerifyManagementFacade {
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(columnInfoAdd)) {
|
|
|
addColumnVerifyVO.setHospitalId(updateColumnVerifyVO.getHospitalId());
|
|
|
- addColumnVerifyVO.setColumnList(updateColumnVerifyVO.getColumnList());
|
|
|
+ addColumnVerifyVO.setColumnList(columnInfoAdd);
|
|
|
addColumnVerifyVO.setIsRequired(updateColumnVerifyVO.getIsRequired());
|
|
|
addColumnVerifyVO.setRegularId(updateColumnVerifyVO.getRegularId());
|
|
|
addColumnVerifyVO.setRegularName(updateColumnVerifyVO.getRegularName());
|
|
@@ -402,6 +402,8 @@ public class ColumnVerifyManagementFacade {
|
|
|
.eq("type", ColumnVerifyTypeEnum.REGULAR_TYPE.getKey())
|
|
|
.eq("verify_id", mappingId)
|
|
|
.set("verify_val", updateColumnVerifyVO.getRegularName())
|
|
|
+ .set("description", updateColumnVerifyVO.getDescription())
|
|
|
+ .set("gmt_modified", new Date())
|
|
|
);
|
|
|
} else {
|
|
|
//未关联正则走新增
|
|
@@ -450,6 +452,8 @@ public class ColumnVerifyManagementFacade {
|
|
|
.eq("type", ColumnVerifyTypeEnum.NONNULL_TYPE.getKey())
|
|
|
.eq("verify_id", mappingId)
|
|
|
.set("verify_val", updateColumnVerifyVO.getIsRequired())
|
|
|
+ .set("description", updateColumnVerifyVO.getDescription())
|
|
|
+ .set("gmt_modified", new Date())
|
|
|
);
|
|
|
} else {
|
|
|
NonnullInfo nonnullInfo = new NonnullInfo();
|