会诊可以查询历史记录了

src/main/java/thyyxxk/webserver/controller/casefrontsheet/JieShouHuiZhenController.java

@@ -8,6 +8,8 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.casefrontsheet.JieShouHuiZhenPojo;
 import thyyxxk.webserver.service.casefrontsheet.JieShouHuiZhenService;
 
+import java.util.List;
+
 /**
  * <p>
  * 描述： 接受会诊申请
@@ -27,12 +29,10 @@ public class JieShouHuiZhenController {
     }
 
     @GetMapping("/getHuiZhenData")
-    public ResultVo<Page<JieShouHuiZhenPojo>> getHuiZhenData(@RequestParam("deptCode") String deptCode,
-                                                             @RequestParam("currentPage") long currentPgae,
-                                                             @RequestParam("pageSize") long pageSize,
-                                                             @RequestParam("startTime") String startTime,
-                                                             @RequestParam("endTime") String endTime) {
-        return service.getHuiZhenData(deptCode, currentPgae, pageSize, startTime, endTime);
+    public ResultVo<List<JieShouHuiZhenPojo>> getHuiZhenData(@RequestParam("startTime") String startTime,
+                                                             @RequestParam("endTime") String endTime,
+                                                             @RequestParam("history") Boolean history) {
+        return service.getHuiZhenData(startTime, endTime, history);
     }
 
 

src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/JieShouHuiZhenDao.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Update;
 import thyyxxk.webserver.entity.casefrontsheet.JieShouHuiZhenPojo;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -29,8 +30,7 @@ public interface JieShouHuiZhenDao {
             " inner join zy_actpatient b with(nolock) on " +
             "    (b.inpatient_no = a.inpatient_no)" +
             " ${ew.customSqlSegment} ")
-    Page<JieShouHuiZhenPojo> getHuiZhenData(Page<JieShouHuiZhenPojo> page,
-                                            @Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
+    List<JieShouHuiZhenPojo> getHuiZhenData(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
 
     /**

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/HuiZhenShenQingDao.java

@@ -97,6 +97,7 @@ public interface HuiZhenShenQingDao {
             "<if test=\" actOrderNo != null \">" +
             "and act_order_no = #{actOrderNo} " +
             "</if>" +
+            " order by req_times " +
             "</script>")
     List<YshHzRecord> chaKanHuiZhenShenQing(@Param("inpatientNo") String inpatientNo,
                                             @Param("admissTimes") int admissTimes,

src/main/java/thyyxxk/webserver/service/casefrontsheet/JieShouHuiZhenService.java

@@ -48,25 +48,29 @@ public class JieShouHuiZhenService {
     }
 
     /**
-     * @param deptCode    科室code
-     * @param currentPage 当前页
-     * @param pageSize    页大小
-     * @param startTime   开始时间
-     * @param endTime     接受时间
+     * @param startTime 开始时间
+     * @param endTime   接受时间
      * @return 返回没有会诊的信息
      */
-    public ResultVo<Page<JieShouHuiZhenPojo>> getHuiZhenData(String deptCode, long currentPage, long pageSize, String startTime, String endTime) {
-        List<String> deptList = publicServer.getKeShiLieBiaoList(deptCode);
+    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<>();
-        qw.eq("status_flag", "1")
-                .ge("req_date", startTime)
-                .le("req_date", endTime);
-        if (ListUtil.notBlank(deptList)) {
-            qw.and(QueryWrapper -> QueryWrapper.in("req_dept1", deptList).or().in("req_dept2", deptList));
+
+        if (history) {
+            qw.eq("input_id", userInfo.getCode());
+        } else {
+            qw.eq("status_flag", "1");
+        }
+        if (StringUtil.notBlank(startTime)) {
+            qw.ge("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));
         }
-        Page<JieShouHuiZhenPojo> page = new Page<>(currentPage, pageSize);
-        dao.getHuiZhenData(page, qw);
-        return ResultVoUtil.success(page);
+        return ResultVoUtil.success(dao.getHuiZhenData(qw));
     }
 
     /**