From 7c6bf997d7a3f74763ad69b8e2b0f494f7dc6291 Mon Sep 17 00:00:00 2001
From: cfl <chaifulai@163.com>
Date: Wed, 15 Nov 2023 17:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HospitalCheckItemConfController.java           | 46 +++++++++++++++-------
 1 file changed, 32 insertions(+), 14 deletions(-)

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;
         }
 
     }
-- 
1.8.3.1