医嘱修改申请优化，添加搜索和分页的功能

src/main/java/thyyxxk/webserver/controller/datamodify/YzActOrderModifyController.java

@@ -8,6 +8,7 @@ import thyyxxk.webserver.entity.datamodify.YzActOrder;
 import thyyxxk.webserver.service.datamodify.YzActOrderModifyService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author 肖蟾
@@ -36,8 +37,12 @@ public class YzActOrderModifyController {
     }
 
     @GetMapping("/chaKanZhuangTai")
-    public ResultVo<List<TYzActOrderModify>> chaKanZhuangTai(@RequestParam("code") String code) {
-        return server.chaKanZhuangTai(code);
+    public ResultVo<Map<String, Object>> chaKanZhuangTai(@RequestParam("code") String code,
+                                                         @RequestParam("actOrderNo") String actOrderNo,
+                                                         @RequestParam("inpatientNo") String inpatientNo,
+                                                         @RequestParam("currentPage") long currentPage,
+                                                         @RequestParam("pageSize") long pageSize) {
+        return server.chaKanZhuangTai(code, actOrderNo, inpatientNo, currentPage, pageSize);
     }
 
     @PostMapping("/danGeShenQing")

src/main/java/thyyxxk/webserver/dao/his/datamodify/YzActOrderDao.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.dao.his.datamodify;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
@@ -82,13 +83,27 @@ public interface YzActOrderDao extends BaseMapper<YzActOrder> {
     /**
      * 根据人员的 code 来查询医嘱申请信息
      *
-     * @param code 编码
-     * @return 返回多个
+     * @param page        分页条件
+     * @param code        操作人的code
+     * @param actOrderNo  医嘱号
+     * @param inpatientNo 住院号
+     * @return 返回分页的数据
      */
-    @Select("select act_order_no,audit_flag,audit_remark,propose_remark," +
+    @Select("<script>" +
+            "select act_order_no,audit_flag,audit_remark,propose_remark,inpatient_no," +
             "audit_staff=(select name from a_employee_mi where code=audit_staff),audit_time from t_yz_act_order_modify  " +
-            "where proposer = #{code} order by id")
-    List<TYzActOrderModify> queryZhuangTai(String code);
+            "where proposer = #{code}" +
+            "<if test=\"actOrderNo != null and actOrderNo !=''\">" +
+            "and act_order_no = #{actOrderNo}" +
+            "</if>" +
+            "<if test=\"inpatientNo !=null and inpatientNo != '' \">" +
+            "and inpatient_no = #{inpatientNo}" +
+            "</if>" +
+            "</script>")
+    List<TYzActOrderModify> queryZhuangTai(IPage<TYzActOrderModify> page,
+                                           @Param("code") String code,
+                                           @Param("actOrderNo") String actOrderNo,
+                                           @Param("inpatientNo") String inpatientNo);
 
     /**
      * 查询出有医嘱修改审核权限的人的 code 用这个来发送通知

src/main/java/thyyxxk/webserver/service/datamodify/YzActOrderModifyService.java

@@ -3,10 +3,13 @@ package thyyxxk.webserver.service.datamodify;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
+import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.dao.his.datamodify.YzActOrderDao;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
@@ -17,7 +20,9 @@ import thyyxxk.webserver.utils.TokenUtil;
 import thyyxxk.webserver.websocket.WebSocketServer;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -95,9 +100,17 @@ public class YzActOrderModifyService {
      * @param code 编码
      * @return 返回这个人 申请修改的医嘱
      */
-    public ResultVo<List<TYzActOrderModify>> chaKanZhuangTai(String code) {
-        log.info("根据人员的code查询医嘱修改申请：{}", code);
-        return ResultVoUtil.success(dao.queryZhuangTai(code));
+    public ResultVo<Map<String, Object>> chaKanZhuangTai(String code, String actOrderNo, String inpatientNo, long currentPage, long pageSize) {
+        log.info("根据人员的code查询医嘱修改申请：{}，住院号：{}，医嘱号：{}", code, inpatientNo, actOrderNo);
+        IPage<TYzActOrderModify> page = new Page<>(currentPage, pageSize);
+        List<TYzActOrderModify> list = dao.queryZhuangTai(page, code, actOrderNo, inpatientNo);
+        if (page.getTotal() > 0 || list.size() > 0) {
+            Map<String, Object> map = new HashMap<>(Capacity.TWO);
+            map.put("total", page.getTotal());
+            map.put("data", list);
+            return ResultVoUtil.success(map);
+        }
+        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }
 
     /**

src/main/java/thyyxxk/webserver/service/yibao/TransferInOfExpensesService.java

@@ -87,8 +87,6 @@ public class TransferInOfExpensesService {
     public ResultVo<Map<String, Object>> getZyJiMenZhenZhuangRuFeiYong(String inpatientNo, String chargeCodeMX, long currentPage, long pageSize) {
         log.info("查看患者是通过门急诊转入的费用项目 --> 住院号：{}，收费编码：{}，当前页：{}，页数：{}", inpatientNo, chargeCodeMX, currentPage, pageSize);
         IPage<ZyDetailCharge> page = new Page<>(currentPage, pageSize);
-
-
         List<ZyDetailCharge> list = dao.getZyJiMenZhenZhuangRuFeiYong(page, inpatientNo, chargeCodeMX);
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
         if (page.getTotal() > 0 || list.size() > 0) {