From 09e7735f40ec5eb72f000cbce375178125764e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9B=E6=89=8D?= Date: Wed, 26 Jun 2024 10:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E6=8E=92=E7=8F=AD=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ynxbd/common/action/RegisterAction.java | 9 ++++++++ .../ynxbd/common/dao/his/HisRegisterDao.java | 22 +++++++++++++++++++ .../com/ynxbd/common/helper/his/HisEnum.java | 3 +++ 3 files changed, 34 insertions(+) diff --git a/src/main/java/com/ynxbd/common/action/RegisterAction.java b/src/main/java/com/ynxbd/common/action/RegisterAction.java index ea296e5..69237e8 100644 --- a/src/main/java/com/ynxbd/common/action/RegisterAction.java +++ b/src/main/java/com/ynxbd/common/action/RegisterAction.java @@ -283,6 +283,15 @@ public class RegisterAction extends BaseAction { return Result.success(dataList); } + @Action("getDoctorSchedule") + public Result getDoctorSchedule(String begDate, String endDate,String doctCode) { + log.info("[医生排班信息] begDate={}, endDate={}, doctCode={}", begDate, endDate,doctCode); + if (doctCode == null || begDate == null || endDate == null) { + return Result.error(ResultEnum.PARAM_IS_DEFECT); + } + return Result.success(new HisRegisterDao().getDoctorSchedule(begDate, endDate, doctCode)); + } + // /** // * [预约挂号]获取指定科室医生信息 diff --git a/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java b/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java index 5a828bf..1c2c82c 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.ynxbd.common.bean.Dept; import com.ynxbd.common.bean.Doctor; import com.ynxbd.common.bean.enums.MerchantEnum; +import com.ynxbd.common.bean.his.HisTreat; import com.ynxbd.common.bean.pay.Register; import com.ynxbd.common.dao.RegisterDao; import com.ynxbd.common.helper.common.*; @@ -949,4 +950,25 @@ public class HisRegisterDao { return HisHelper.getJsonResult(HisEnum.AP_Occupy_Source_New, params,merchantEnum); } + /** + * 获取某个医生排班表 + * @param begDate 开始时间 + * @param endDate 结束时间 + * @param doctCode 医生编码 + * @return 排班信息 + */ + + public JSONArray getDoctorSchedule(String begDate, String endDate,String doctCode) { + + JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.AP_Doctor_Schedule, params -> { + params.put("BegDate", begDate); + params.put("EndDate", endDate); + params.put("DoctCode", doctCode); + }); + if(jsonResult.success()){ + return jsonResult.getJsonArray("Items","Item"); + } + return null; + } + } diff --git a/src/main/java/com/ynxbd/common/helper/his/HisEnum.java b/src/main/java/com/ynxbd/common/helper/his/HisEnum.java index 854e192..7b6ad7a 100644 --- a/src/main/java/com/ynxbd/common/helper/his/HisEnum.java +++ b/src/main/java/com/ynxbd/common/helper/his/HisEnum.java @@ -48,6 +48,9 @@ public enum HisEnum { AP_Refund_Register("[今日挂号]取消预约", "4007", "AP_Refund_Register", true), + //排班记录 + AP_Doctor_Schedule("[排班]医生排班表","8003","UniversalInterface",true), + // 支付[自定义]------------------ Create_Self_Help("[处方]生成自助申请单", "10001", "UniversalInterface", true), Query_Self_Help("[处方]查询自助申请单信息", "10002", "UniversalInterface", true),