|
@@ -53,7 +53,7 @@ public class JieShouHuiZhenService {
|
|
|
* @return 返回没有会诊的信息
|
|
|
*/
|
|
|
public ResultVo<List<JieShouHuiZhenPojo>> getHuiZhenData(String startTime, String endTime, boolean history) {
|
|
|
- log.info("数据:{}", history);
|
|
|
+
|
|
|
UserInfo userInfo = redisLikeService.getUserInfoByToken();
|
|
|
List<String> deptList = publicServer.getKeShiLieBiaoList(userInfo.getDeptCode());
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
@@ -64,12 +64,13 @@ public class JieShouHuiZhenService {
|
|
|
qw.eq("status_flag", "1");
|
|
|
}
|
|
|
if (StringUtil.notBlank(startTime)) {
|
|
|
- qw.ge("req_date", startTime)
|
|
|
+ qw.gt("req_date", startTime)
|
|
|
.le("req_date", endTime);
|
|
|
}
|
|
|
if (ListUtil.notBlank(deptList) && !history) {
|
|
|
qw.and(q -> q.in("req_dept1", deptList).or().in("req_dept2", deptList));
|
|
|
}
|
|
|
+
|
|
|
return ResultVoUtil.success(dao.getHuiZhenData(qw));
|
|
|
}
|
|
|
|