Jelajahi Sumber

fix 删除掉多余的自定义分时排班方法

DYH2020 2 tahun lalu
induk
melakukan
25487a01c6

+ 0 - 57
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java

@@ -131,63 +131,6 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
         return dataList;
     }
 
-
-    @Override
-    public List<QueryDoctorScheduleListResponseData> getDoctorScheduleList(QueryDoctorScheduleListRequest request) throws Exception {
-        int hospitalId = Checker.getIntegerValue(request.getHospitalId());
-        String deptCode = Checker.getStringValue(request.getDeptCode());
-        String doctorCode = Checker.getStringValue(request.getDoctorCode());
-        String serviceDate = Checker.getStringValue(request.getServiceDate());
-        Integer period = Checker.getIntegerValue(request.getPeriod());
-        if (StringHelper.isNullOrWhiteSpace(deptCode)) {
-            throw new AppMessageException("科室不存在");
-        }
-        if (StringHelper.isNullOrWhiteSpace(doctorCode)) {
-            throw new AppMessageException("医生不存在");
-        }
-
-        List<QueryDoctorScheduleListResponseData> dataList = new LinkedList<>();
-
-        if (!StringHelper.isNullOrWhiteSpace(serviceDate)) {
-            Date date = DateUtil.parseDate(serviceDate, "yyyy-MM-dd");
-            if (date == null) {
-                throw new AppMessageException("invalid serviceDate");
-            }
-            //查询医生某一天的排班分时信息
-            if (period == null) {
-                throw new AppMessageException("请选择时段");
-            }
-            if (DatePeriodEnum.valueOf(period) == null) {
-                throw new AppMessageException("时段不存在");
-            }
-
-            String strDate = DateUtil.formatDate(date, "yyyy-MM-dd");
-            QueryDoctorScheduleListResponseData map = getScheduleTimeInfoResponse(deptCode, doctorCode, strDate, period, hospitalId);
-
-            if (map != null) {
-                dataList.add(map);
-            }
-        } else {
-            //取医生8天排班的分时信息
-            int[] periods = {DatePeriodEnum.MORNING.getValue(), DatePeriodEnum.AFTERNOON.getValue()};
-            Calendar calendar = Calendar.getInstance();
-
-            for (int offset = 0; offset < 8; offset++) {
-                calendar.add(Calendar.DATE, 1);
-                String strDate = DateUtil.formatDate(calendar.getTime(), "yyyy-MM-dd");
-
-                for (int p : periods) {
-                    QueryDoctorScheduleListResponseData map = getScheduleTimeInfoResponse(deptCode, doctorCode, strDate, p, hospitalId);
-
-                    if (map != null) {
-                        dataList.add(map);
-                    }
-                }
-            }
-        }
-        return dataList;
-    }
-
     @Override
     public PageVO<QueryDepDoctorListResponseData> queryDepDoctorList(QueryDepDoctorListRequest request) throws Exception {
         int hospitalId = BizUtil.getCurrentHospitalId();

+ 1 - 1
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/web/controller/RegisterController.java

@@ -41,7 +41,7 @@ public class RegisterController {
      */
     @RequestMapping({"/doctorSchedule"})
     public @ResponseBody
-    ResponseVO<List<QueryDoctorScheduleListResponseData>> getDoctorScheduleList(@RequestBody QueryDoctorScheduleListRequest request) {
+    ResponseVO<List<QueryDoctorScheduleListResponseData>> getDoctorScheduleList(QueryDoctorScheduleListRequest request) {
         try {
             int hospitalId = Checker.getIntegerValue(request.getHospitalId());
             String deptCode = Checker.getStringValue(request.getDeptCode());

+ 0 - 18
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/PlanController.java

@@ -81,24 +81,6 @@ public class PlanController {
     }
 
     /**
-     * 医生分时排班信息查询 (todo: 这个接口是后面添加的,是自定义的,通过代理过不来)
-     *
-     * @param request
-     * @return
-     */
-    @PostMapping("isvRequest.order.doctorScheduleList")
-    public ResponseVO<List<QueryDoctorScheduleListResponseData>> getDoctorScheduleList(QueryDoctorScheduleListRequest request) {
-        try {
-            return ResponseVO.success(isvRegisterService.getDoctorScheduleList(request));
-        } catch (AppMessageException e) {
-            return ResponseVO.fail(Code.RESP_CODE_PARAM_ERROR, e.getMessage());
-        } catch (Exception e) {
-            log.error("PlanController#getDoctorScheduleList(request = {}):\n {}", request, e.getMessage(), e);
-            return ResponseVO.fail(Code.RESP_CODE_APP_EXCEPTION, e.getMessage());
-        }
-    }
-
-    /**
      * 医生号源查询
      *
      * @param request

+ 0 - 7
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/service/IsvRegisterService.java

@@ -38,13 +38,6 @@ public interface IsvRegisterService {
      **/
     PageVO<QueryDepDoctorListResponseData> queryDepDoctorList(QueryDepDoctorListRequest request) throws Exception;
 
-    /**
-     * 得到医生分时排班信息
-     *
-     * @param request
-     * @return 查询结果
-     **/
-    List<QueryDoctorScheduleListResponseData> getDoctorScheduleList(QueryDoctorScheduleListRequest request) throws Exception;
 
     /**
      * 医生号源查询