Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
B
byh-family-doctor
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
包
包
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
杨凯
byh-family-doctor
Commits
13197dfa
提交
13197dfa
authored
3月 22, 2024
作者:
杨凯
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat:家庭医生初始化
上级
dbe48757
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
114 行增加
和
2 行删除
+114
-2
SearchDoctorDayScheduleReqDTO.java
...mily/doctor/common/dto/SearchDoctorDayScheduleReqDTO.java
+34
-0
DoctorScheduleInfoResVo.java
...ihui/family/doctor/common/vo/DoctorScheduleInfoResVo.java
+20
-0
DoctorController.java
...hui/family/doctor/server/controller/DoctorController.java
+7
-0
DoctorService.java
...ebaiyihui/family/doctor/server/service/DoctorService.java
+4
-0
DoctorServiceImpl.java
.../family/doctor/server/service/impl/DoctorServiceImpl.java
+49
-2
没有找到文件。
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/SearchDoctorDayScheduleReqDTO.java
0 → 100644
浏览文件 @
13197dfa
package
com
.
ebaiyihui
.
family
.
doctor
.
common
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
/**
* @ClassName: SearchDoctorDayScheduleReqDTO
* @Author:yanliang
* @Date:2024/3/22 14:25
* @Description
*/
@Data
public
class
SearchDoctorDayScheduleReqDTO
{
private
Long
hospitalId
;
private
String
doctorName
;
private
Integer
servType
;
@ApiModelProperty
(
"选择的日期"
)
@NotBlank
(
message
=
"选择的日期不能为空"
)
private
String
scheduleTime
;
private
Integer
pageNum
;
private
Integer
pageSize
;
private
Integer
week
;
}
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/vo/DoctorScheduleInfoResVo.java
0 → 100644
浏览文件 @
13197dfa
package
com
.
ebaiyihui
.
family
.
doctor
.
common
.
vo
;
import
lombok.Data
;
import
java.util.List
;
/**
* @ClassName: DoctorScheduleInfoResVo
* @Author:yanliang
* @Date:2024/3/22 14:27
* @Description
*/
@Data
public
class
DoctorScheduleInfoResVo
{
List
<
ScheduleInfoVo
>
scheduleInfos
;
private
String
scheduleTime
;
}
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/controller/DoctorController.java
浏览文件 @
13197dfa
...
@@ -2,8 +2,10 @@ package com.ebaiyihui.family.doctor.server.controller;
...
@@ -2,8 +2,10 @@ package com.ebaiyihui.family.doctor.server.controller;
import
com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO
;
import
com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO
;
import
com.ebaiyihui.family.doctor.common.dto.SearchDoctorDayScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListForScheduleResVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListForScheduleResVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorScheduleInfoResVo
;
import
com.ebaiyihui.family.doctor.server.service.DoctorService
;
import
com.ebaiyihui.family.doctor.server.service.DoctorService
;
import
com.ebaiyihui.framework.page.PageResult
;
import
com.ebaiyihui.framework.page.PageResult
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
com.ebaiyihui.framework.response.BaseResponse
;
...
@@ -55,8 +57,13 @@ public class DoctorController {
...
@@ -55,8 +57,13 @@ public class DoctorController {
public
BaseResponse
<
List
<
DoctorListForScheduleResVo
>>
getDoctorListForSchedule
(
@RequestBody
DoctorListForScheduleReqDTO
req
)
{
public
BaseResponse
<
List
<
DoctorListForScheduleResVo
>>
getDoctorListForSchedule
(
@RequestBody
DoctorListForScheduleReqDTO
req
)
{
return
doctorService
.
getDoctorListForSchedule
(
req
);
return
doctorService
.
getDoctorListForSchedule
(
req
);
}
@ApiOperation
(
value
=
"管理端搜索医生某天的排班"
)
@RequestMapping
(
value
=
"/searchDoctorDaySchedule"
,
method
=
RequestMethod
.
POST
)
public
BaseResponse
<
DoctorScheduleInfoResVo
>
searchDoctorDaySchedule
(
@RequestBody
SearchDoctorDayScheduleReqDTO
reqDTO
)
{
return
doctorService
.
searchDoctorDaySchedule
(
reqDTO
);
}
}
}
}
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/DoctorService.java
浏览文件 @
13197dfa
...
@@ -2,8 +2,10 @@ package com.ebaiyihui.family.doctor.server.service;
...
@@ -2,8 +2,10 @@ package com.ebaiyihui.family.doctor.server.service;
import
com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO
;
import
com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO
;
import
com.ebaiyihui.family.doctor.common.dto.SearchDoctorDayScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListForScheduleResVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListForScheduleResVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListVo
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorScheduleInfoResVo
;
import
com.ebaiyihui.framework.page.PageResult
;
import
com.ebaiyihui.framework.page.PageResult
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
com.ebaiyihui.framework.response.BaseResponse
;
...
@@ -21,4 +23,6 @@ public interface DoctorService {
...
@@ -21,4 +23,6 @@ public interface DoctorService {
BaseResponse
<
PageResult
<
DoctorListVo
>>
getSignedDoctorList
(
QueryDoctorsDTO
reqVo
);
BaseResponse
<
PageResult
<
DoctorListVo
>>
getSignedDoctorList
(
QueryDoctorsDTO
reqVo
);
BaseResponse
<
List
<
DoctorListForScheduleResVo
>>
getDoctorListForSchedule
(
DoctorListForScheduleReqDTO
req
);
BaseResponse
<
List
<
DoctorListForScheduleResVo
>>
getDoctorListForSchedule
(
DoctorListForScheduleReqDTO
req
);
BaseResponse
<
DoctorScheduleInfoResVo
>
searchDoctorDaySchedule
(
SearchDoctorDayScheduleReqDTO
reqDTO
);
}
}
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/DoctorServiceImpl.java
浏览文件 @
13197dfa
...
@@ -9,8 +9,9 @@ import com.doctor.basedata.api.vo.DoctorBasicRespVO;
...
@@ -9,8 +9,9 @@ import com.doctor.basedata.api.vo.DoctorBasicRespVO;
import
com.doctor.basedata.api.vo.ServiceCheckReqVo
;
import
com.doctor.basedata.api.vo.ServiceCheckReqVo
;
import
com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO
;
import
com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListForScheduleResVo
;
import
com.ebaiyihui.family.doctor.common.dto.ScheduleForWeekReqDTO
;
import
com.ebaiyihui.family.doctor.common.vo.DoctorListVo
;
import
com.ebaiyihui.family.doctor.common.dto.SearchDoctorDayScheduleReqDTO
;
import
com.ebaiyihui.family.doctor.common.vo.*
;
import
com.ebaiyihui.family.doctor.server.common.constants.ImConstants
;
import
com.ebaiyihui.family.doctor.server.common.constants.ImConstants
;
import
com.ebaiyihui.family.doctor.server.common.enums.SignStatus
;
import
com.ebaiyihui.family.doctor.server.common.enums.SignStatus
;
import
com.ebaiyihui.family.doctor.server.entity.PatientSignEntity
;
import
com.ebaiyihui.family.doctor.server.entity.PatientSignEntity
;
...
@@ -20,6 +21,7 @@ import com.ebaiyihui.family.doctor.server.feign.DoctorWorkingServiceClient;
...
@@ -20,6 +21,7 @@ import com.ebaiyihui.family.doctor.server.feign.DoctorWorkingServiceClient;
import
com.ebaiyihui.family.doctor.server.mapper.PatientSignMapper
;
import
com.ebaiyihui.family.doctor.server.mapper.PatientSignMapper
;
import
com.ebaiyihui.family.doctor.server.mapper.ServiceConfigMapper
;
import
com.ebaiyihui.family.doctor.server.mapper.ServiceConfigMapper
;
import
com.ebaiyihui.family.doctor.server.service.DoctorService
;
import
com.ebaiyihui.family.doctor.server.service.DoctorService
;
import
com.ebaiyihui.family.doctor.server.service.ScheduleRecordService
;
import
com.ebaiyihui.framework.page.PageResult
;
import
com.ebaiyihui.framework.page.PageResult
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
com.ebaiyihui.framework.response.BaseResponse
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -52,6 +54,9 @@ public class DoctorServiceImpl implements DoctorService {
...
@@ -52,6 +54,9 @@ public class DoctorServiceImpl implements DoctorService {
@Autowired
@Autowired
private
ServiceConfigMapper
serviceConfigMapper
;
private
ServiceConfigMapper
serviceConfigMapper
;
@Autowired
private
ScheduleRecordService
scheduleRecordService
;
@Autowired
@Autowired
private
DoctorWorkingServiceClient
doctorWorkingServiceClient
;
private
DoctorWorkingServiceClient
doctorWorkingServiceClient
;
...
@@ -217,6 +222,48 @@ public class DoctorServiceImpl implements DoctorService {
...
@@ -217,6 +222,48 @@ public class DoctorServiceImpl implements DoctorService {
return
BaseResponse
.
success
(
listForScheduleVos
);
return
BaseResponse
.
success
(
listForScheduleVos
);
}
}
@Override
public
BaseResponse
<
DoctorScheduleInfoResVo
>
searchDoctorDaySchedule
(
SearchDoctorDayScheduleReqDTO
reqDTO
)
{
DoctorScheduleInfoResVo
doctorScheduleInfoResVo
=
new
DoctorScheduleInfoResVo
();
doctorScheduleInfoResVo
.
setScheduleTime
(
reqDTO
.
getScheduleTime
());
ScheduleForWeekReqDTO
scheduleForWeek
=
new
ScheduleForWeekReqDTO
();
scheduleForWeek
.
setHospitalId
(
reqDTO
.
getHospitalId
());
scheduleForWeek
.
setServType
(
reqDTO
.
getServType
());
scheduleForWeek
.
setWeek
(
reqDTO
.
getWeek
());
if
(
StringUtils
.
isNotEmpty
(
reqDTO
.
getDoctorName
()))
{
scheduleForWeek
.
setDoctorName
(
reqDTO
.
getDoctorName
());
}
BaseResponse
<
List
<
ScheduleForWeekResVo
>>
pageResultBaseResponse
=
scheduleRecordService
.
scheduleForWeekNew
(
scheduleForWeek
);
if
(!
pageResultBaseResponse
.
isSuccess
())
{
return
BaseResponse
.
error
(
"单周排班调用失败"
);
}
List
<
ScheduleForWeekResVo
>
content
=
pageResultBaseResponse
.
getData
();
if
(
CollectionUtils
.
isEmpty
(
content
))
{
return
BaseResponse
.
success
();
}
content
=
content
.
stream
().
filter
(
scheduleForWeekNew
->
{
if
(
scheduleForWeekNew
.
getScheduleTime
().
compareTo
(
reqDTO
.
getScheduleTime
())
==
0
)
{
return
true
;
}
return
false
;
}).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isEmpty
(
content
))
{
return
BaseResponse
.
success
();
}
log
.
info
(
"过滤出当前选择日期的content只有一条{}"
,
content
.
toString
());
List
<
ScheduleInfoVo
>
scheduleInfos
=
new
ArrayList
<>();
content
.
get
(
0
).
getScheduleInfos
().
stream
().
forEach
(
schedule
->
{
scheduleInfos
.
add
(
schedule
);
});
doctorScheduleInfoResVo
.
setScheduleInfos
(
scheduleInfos
);
return
BaseResponse
.
success
(
doctorScheduleInfoResVo
);
}
// private void redisHistory(QueryFamousDotDTO reqVo) {
// private void redisHistory(QueryFamousDotDTO reqVo) {
//
//
// //把搜索的数据存在map中
// //把搜索的数据存在map中
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论