Merge remote-tracking branch 'upstream/master'

src/main/java/thyyxxk/webserver/service/examinations/BookableManageService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.dao.his.examinations.InspectionsDao;
 import thyyxxk.webserver.entity.ResultVo;
@@ -46,6 +47,9 @@ public class BookableManageService {
     }
 
     public ResultVo<Integer> updateWxBookableFlag(ExamItem param) {
+        if (StringUtil.isBlank(param.getBookTip())) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "预约提示不能为空。");
+        }
         dao.updateWxBookableFlag(param);
         log.info("操作员：{}，编辑检验检查预约信息：{}", TokenUtil.getInstance().getTokenUserId(), param);
         return ResultVoUtil.success();

src/main/java/thyyxxk/webserver/service/outpatient/interactive/complaints/ComplaintsService.java

@@ -66,6 +66,6 @@ public class ComplaintsService {
             dao.updateResponse(complaint);
             return ResultVoUtil.success("回复成功。");
         }
-        return ResultVoUtil.fail(ExceptionEnum.NETWORK_ERROR);
+        return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, result);
     }
 }