病历详情其他模块展示

src/main/java/com/diagbot/dto/MedRecordOtherDTO.java

@@ -1,43 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author Wsy
- * @since 2022-03-09
- */
-@Data
-public class MedRecordOtherDTO implements Serializable {
-
-    /**
-     * 文书ID
-     */
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    private String behospitalCode;
-
-    /**
-     * 病历日期
-     */
-    private Date recDate;
-
-    /**
-     * 病历标题
-     */
-    private String recTitle;
-}

src/main/java/com/diagbot/facade/MedicalRecordOtherFacade.java

@@ -1,7 +1,10 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.*;
+import com.diagbot.entity.MedNurse;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
@@ -39,11 +42,10 @@ public class MedicalRecordOtherFacade extends MedicalRecordServiceImpl {
     Boolean encryptFlag;
 
     /**
-     *
      * @param medRecordOtherVO
      * @return
      */
-    public List<MedRecordOtherDTO> RecordOtherList(MedRecordOtherVO medRecordOtherVO) {
+    public IPage<MedicalRecord> pageFac(MedRecordOtherVO medRecordOtherVO) {
         QueryWrapper<MedicalRecord> medicalRecordQueryWrapper = new QueryWrapper<>();
         medicalRecordQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         medicalRecordQueryWrapper.eq("hospital_id", Long.valueOf(SysUserUtils.getCurrentHospitalID()));
@@ -63,9 +65,10 @@ public class MedicalRecordOtherFacade extends MedicalRecordServiceImpl {
         }
         medicalRecordQueryWrapper.orderByDesc("rec_date");
 
-        List<MedicalRecord> medicalRecordList = medicalRecordFacade.list(medicalRecordQueryWrapper);
-        List<MedRecordOtherDTO> medRecordOtherDTOList = BeanUtil.listCopyTo(medicalRecordList, MedRecordOtherDTO.class);
-        return medRecordOtherDTOList;
+        Page<MedicalRecord> pageCase = new Page<MedicalRecord>(medRecordOtherVO.getCurrent(), medRecordOtherVO.getSize());
+        IPage<MedicalRecord> medicalRecordIPage = medicalRecordFacade.getBaseMapper().selectPage(pageCase, medicalRecordQueryWrapper);
+
+        return medicalRecordIPage;
     }
 
     /**

src/main/java/com/diagbot/web/MedRecordOtherController.java

@@ -4,8 +4,8 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.MedRecordContentOtherDTO;
-import com.diagbot.dto.MedRecordOtherDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
 import com.diagbot.facade.MedicalRecordOtherFacade;
 import com.diagbot.vo.MedRecordContentOtherVO;
 import com.diagbot.vo.MedRecordOtherVO;
@@ -41,8 +41,9 @@ public class MedRecordOtherController {
                     "recDateEnd：创建结束时间")
     @PostMapping("/getMedRecordOtherPage")
     @SysLogger("getMedRecordOtherPage")
-    public RespDTO<IPage<MedRecordOtherDTO>> getMedRecordOtherPage(@RequestBody @Valid MedRecordOtherVO medRecordOtherVO) {
-        return RespDTO.onSuc(medicalRecordOtherFacade.RecordOtherList(medRecordOtherVO));
+    public RespDTO<IPage<MedicalRecord>> getMedRecordOtherPage(@RequestBody @Valid MedRecordOtherVO medRecordOtherVO) {
+        IPage<MedicalRecord> dataIPage = medicalRecordOtherFacade.pageFac(medRecordOtherVO);
+        return RespDTO.onSuc(dataIPage);
     }