diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HospitalCheckItemConfController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HospitalCheckItemConfController.java index 41d2a03..f675fa3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HospitalCheckItemConfController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HospitalCheckItemConfController.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.result.FrontEndResult; @@ -106,19 +107,26 @@ public class HospitalCheckItemConfController extends BaseController { } @RequestMapping(method = RequestMethod.POST, value = "/add") + @ResponseBody @TokenRequired - public void addHospitalCheckItemConf(@RequestBody HospitalCheckItemConf checkItemConf, HttpServletResponse response){ + public BaseResponse addHospitalCheckItemConf(@RequestBody HospitalCheckItemConf checkItemConf){ + + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setErrorcode(0); + baseResponse.setErrormsg("成功"); if(checkItemConf.getHospitalId()== null || checkItemConf.getStartWeek() == null|| checkItemConf.getEndWeek() == null){ - ResultUtils.buildParameterErrorResultAndWrite(response, "请填写必须项!"); - return; + baseResponse.setErrorcode(1); + baseResponse.setErrormsg("请填写必须项!"); + return baseResponse; } if(checkItemConf.getStartWeek() > checkItemConf.getEndWeek()){ - ResultUtils.buildParameterErrorResultAndWrite(response, "起始周不能大于结束周!"); - return; + baseResponse.setErrorcode(1); + baseResponse.setErrormsg("起始周不能大于结束周!"); + return baseResponse; } HospitalCheckItemConfQuery query = new HospitalCheckItemConfQuery(); query.setHospitalId(checkItemConf.getHospitalId()); @@ -140,24 +148,32 @@ public class HospitalCheckItemConfController extends BaseController { checkItemConf.setCreateTime(new Date()); checkItemConf.setUpdateTime(new Date()); hospitalCheckItemConfService.addHospitalCheckItemConf(checkItemConf); - ResultUtils.buildSuccessResultAndWrite(response); + return baseResponse; }else{ - ResultUtils.buildParameterErrorResultAndWrite(response, "此范围孕周与已有数据有重合,请确认!"); + baseResponse.setErrorcode(1); + baseResponse.setErrormsg("此范围孕周与已有数据有重合,请确认!"); + return baseResponse; } } @RequestMapping(method = RequestMethod.POST, value = "/update") + @ResponseBody @TokenRequired - public void updateHospitalCheckItemConf(@RequestBody HospitalCheckItemConf checkItemConf, HttpServletResponse response){ + public BaseResponse updateHospitalCheckItemConf(@RequestBody HospitalCheckItemConf checkItemConf){ + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setErrorcode(0); + baseResponse.setErrormsg("成功"); if (null == checkItemConf.getId()) { - ResultUtils.buildParameterErrorResultAndWrite(response, "请选择要修改的数据"); - return; + baseResponse.setErrorcode(0); + baseResponse.setErrormsg("请选择要修改的数据"); + return baseResponse; } if (checkItemConf.getStartWeek() > checkItemConf.getEndWeek()) { - ResultUtils.buildParameterErrorResultAndWrite(response, "起始周不能大于结束周!"); - return; + baseResponse.setErrorcode(0); + baseResponse.setErrormsg("起始周不能大于结束周!"); + return baseResponse; } HospitalCheckItemConfQuery query = new HospitalCheckItemConfQuery(); @@ -180,9 +196,11 @@ public class HospitalCheckItemConfController extends BaseController { checkItemConf.setYn(YnEnums.YES.getId()); checkItemConf.setUpdateTime(new Date()); hospitalCheckItemConfService.updateHospitalCheckItemConf(checkItemConf); - ResultUtils.buildSuccessResultAndWrite(response); + return baseResponse; }else{ - ResultUtils.buildParameterErrorResultAndWrite(response, "此范围孕周与已有数据有重合,请确认!"); + baseResponse.setErrorcode(0); + baseResponse.setErrormsg("此范围孕周与已有数据有重合,请确认!"); + return baseResponse; } }