fix：小程序改变查询数据库

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_DgController.java

@@ -3,10 +3,12 @@ package com.ruoyi.web.work.api;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.api.util.AppUtil;
 import com.ruoyi.web.work.service.IDgService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+@Api(tags = "就诊信息管理")
 @RestController
 @RequestMapping("/app/dg")
 public class Api_DgController {
@@ -14,14 +16,7 @@ public class Api_DgController {
     @Autowired
     private IDgService dgService;
 
-    @ApiOperation(value = "根据时间获取用户就医记录")
-    @GetMapping("/record")
-    public AjaxResult getMedicalRecord(@RequestParam("beginTime") String beginTime,
-                                       @RequestParam("endTime") String endTime){
-        return dgService.getMedicalRecord(beginTime,endTime, AppUtil.getUser().getOpenId());
-    }
-
-    @ApiOperation(value = "根据就诊卡号获取用户诊断信息")
+    @ApiOperation(value = "根据就诊卡号获取用户诊断信息(如主要诊断，次要诊断)")
     @GetMapping("/diagnosis/{card}")
     public AjaxResult getDgByCard(@PathVariable("card") String card){
         return dgService.getDgByCard(card);

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObrController.java

@@ -3,10 +3,12 @@ package com.ruoyi.web.work.api;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.mapper.ObrMapper;
 import com.ruoyi.web.work.service.IObrService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+@Api(tags = "科室申请管理")
 @RestController
 @RequestMapping("/app/obr")
 public class Api_ObrController {
@@ -14,10 +16,10 @@ public class Api_ObrController {
     @Autowired
     private IObrService obrService;
 
-    @ApiOperation(value = "根据就诊卡号获取检测项目及结果")
-    @GetMapping("/examine/{card}")
-    public AjaxResult getObrAndObxByCard(@PathVariable("card") String card){
-        return obrService.getObrAndObxByCard(card);
+    @ApiOperation(value = "根据就诊卡号获取科室申请")
+    @GetMapping("/department/{card}")
+    public AjaxResult getObrByCard(@PathVariable("card") String card) {
+        return obrService.getObrByCard(card);
     }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_ObxController.java

@@ -0,0 +1,34 @@
+package com.ruoyi.web.work.api;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.domain.Obx;
+import com.ruoyi.web.work.service.IObxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import net.bytebuddy.agent.builder.AgentBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "检测项目管理")
+@RestController
+@RequestMapping("/app/obx")
+public class Api_ObxController {
+
+    @Autowired
+    private IObxService obxService;
+
+    @ApiOperation(value = "根据就诊卡号获取检测项目列表")
+    @GetMapping("/examine/{card}")
+    public AjaxResult getObxByCard(@PathVariable("card") String card) {
+        List<Obx> obxList=obxService.getObxByCard(card);
+        return AjaxResult.success(obxList);
+    }
+
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_Pv1Controller.java

@@ -0,0 +1,34 @@
+package com.ruoyi.web.work.api;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.api.util.AppUtil;
+import com.ruoyi.web.work.domain.Pv1;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
+import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
+import com.ruoyi.web.work.service.IPv1Service;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "住院信息管理")
+@RestController
+@RequestMapping("/app/pv1")
+public class Api_Pv1Controller {
+
+    @Autowired
+    private IPv1Service ipv1Service;
+
+    @ApiOperation(value = "根据时间获取用户就医记录")
+    @GetMapping("/record")
+    public AjaxResult getMedicalRecord(@RequestParam("beginTime") String beginTime,
+                                       @RequestParam("endTime") String endTime){
+        List<Pv1MedicalRecord> pv1List=ipv1Service.getMedicalRecord(beginTime,endTime, AppUtil.getUser().getPatientId());
+        return AjaxResult.success(pv1List);
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/config/InterceptorConfig.java

@@ -27,6 +27,8 @@ public class InterceptorConfig implements WebMvcConfigurer {
         registration.excludePathPatterns("/app/department/**"); //排除
         registration.excludePathPatterns("/app/common/type/*"); //排除
         registration.excludePathPatterns("/app/common/introduction/*"); //排除
+
+
     }
 
     @Override

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ObrController.java

@@ -31,7 +31,7 @@ public class ObrController extends BaseController {
     private IObrService obrService;
 
     @ApiOperation(value = "获取科室申请列表")
-    @PreAuthorize("@ss.hasPermi('work:obr:list')")
+    //@PreAuthorize("@ss.hasPermi('work:obr:list')")
     @GetMapping("/list")
     public TableDataInfo list(Obr obr){
         startPage();
@@ -40,7 +40,7 @@ public class ObrController extends BaseController {
     }
 
     @ApiOperation(value = "根据Id获取科室申请列表")
-    @PreAuthorize("@ss.hasPermi('work:obr:query')")
+    //@PreAuthorize("@ss.hasPermi('work:obr:query')")
     @GetMapping(value = "/detail/{id}")
     public AjaxResult detail(@PathVariable("id") Long id){
         return AjaxResult.success(obrService.getById(id));

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv1Controller.java

@@ -1,13 +1,10 @@
 package com.ruoyi.web.work.controller;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.web.work.domain.Patient;
-import com.ruoyi.web.work.domain.PatientCard;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.ruoyi.web.work.domain.Pv1;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,12 +31,13 @@ public class Pv1Controller extends BaseController {
     @Autowired
     private IPv1Service pv1Service;
 
+    //@PreAuthorize("@ss.hasPermi('work:pv1:list')")
     @ApiOperation(value = "获取所有科室")
     @Anonymous
     @GetMapping("/department")
     public TableDataInfo getAllDepartment() {
         startPage();
-        List<PatientCard> list=pv1Service.getAllDepartment();
+        List<PatientCardDto> list=pv1Service.getAllDepartment();
         return getDataTable(list);
     }
 
@@ -50,7 +48,7 @@ public class Pv1Controller extends BaseController {
                                                             @RequestParam(value = "departmentName",required = false) String departmentName,
                                                           @RequestParam(value = "physician",required = false) String physician){
         startPage();
-        List<PatientCard> list=pv1Service.getPatientCardByNameOrDepartment(patientName,departmentName,physician);
+        List<PatientCardDto> list=pv1Service.getPatientCardByNameOrDepartment(patientName,departmentName,physician);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/PatientCard.java

@@ -1,138 +0,0 @@
-package com.ruoyi.web.work.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-public class PatientCard {
-
-    //科室
-    @ApiModelProperty(value = "科室")
-    private String department;
-
-    //主治医生姓名
-    @ApiModelProperty(value = "主治医生姓名")
-    private String physician;
-
-    //患者姓名
-    @ApiModelProperty(value = "患者姓名")
-    private String name;
-
-    //出院方式
-    @ApiModelProperty(value = "出院方式")
-    private String dischargeMethod;
-
-
-    //出院时间
-    @ApiModelProperty(value = "出院时间")
-    private String dischargeTime;
-
-    //就诊卡号
-    @ApiModelProperty(value = "就诊ID")
-    private String pvId;
-
-    @ApiModelProperty(value = "患者ID")
-    private String patientId;
-
-    @ApiModelProperty(value = "就诊卡号")
-    private String cardId;
-
-    //
-    ////病历号
-    //private String blh;
-    //
-    ////身份证号
-    //private String sfzh;
-    //
-    ////婴儿序号
-    //private String yexh;
-    //
-    ////出生时间
-    //private String birthDate;
-    //
-    //
-    ////性别
-    //private String sex;
-    //
-    ////患者地址
-    //private String address;
-    //
-    //
-    ////电话号码
-    //private String phone;
-    //
-    //
-    ////工作电话
-    //private String workPhone;
-    //
-    ////婚姻状况
-    //private String marital;
-    //
-    ////民族
-    //private String nation;
-    //
-    ////职业
-    //private String career;
-    //
-    ////国籍
-    //private String nationality;
-    //
-    ////患者类别
-    //private String patientCategory;
-    //
-    ////患者位置
-    //public String bed;
-    //
-    ////在院状态
-    //private String hospitalStatus;
-    //
-    ////入院次数
-    //private String hospitalizedNumber;
-    //
-    ////主管护士
-    //private String nurse_code;
-    //
-    ////就诊号码
-    //private String cardId;
-    //
-    ////在区状态
-    //
-    //
-    ////入院时间
-    //private String admissionTime;
-    //
-    ////危重级别
-    //private String level;
-    //
-    ////入区时间
-    //private String entryTime;
-    //
-    ////出区时间
-    //private String exitTime;
-    //
-    ////出区原因
-    //private String reasonArea;
-    //
-    //////近亲姓名
-    ////private String nkName;
-    //
-    ////近亲关系
-    //private String kinship;
-    //
-    ////近亲地址
-    //private String nkAddress;
-    //
-    ////联系电话
-    //private String nkPhone;
-    //
-    ////工作名称
-    //private String workName;
-    //
-    ////工作类别
-    //private String workCode;
-
-
-}
-

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/PatientCardDto.java

@@ -0,0 +1,42 @@
+package com.ruoyi.web.work.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PatientCardDto {
+
+
+    @ApiModelProperty(value = "科室")
+    private String department;
+
+
+    @ApiModelProperty(value = "主治医生姓名")
+    private String physician;
+
+    @ApiModelProperty(value = "患者姓名")
+    private String name;
+
+    @ApiModelProperty(value = "出院方式")
+    private String dischargeMethod;
+
+
+    @ApiModelProperty(value = "出院时间")
+    private String dischargeTime;
+
+
+    @ApiModelProperty(value = "就诊ID")
+    private String pvId;
+
+    @ApiModelProperty(value = "患者ID")
+    private String patientId;
+
+    @ApiModelProperty(value = "就诊卡号")
+    private String cardId;
+
+
+
+}
+

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/DgMedicalRecord.java → ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/Pv1MedicalRecord.java

@@ -4,10 +4,10 @@ import lombok.Data;
 
 //就诊记录
 @Data
-public class DgMedicalRecord {
+public class Pv1MedicalRecord {
 
-    //诊断病名称
-    private String diagnosticCode;
+    //科室
+    private String department;
 
     //诊断时间
     private String diagnosisTime;

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/DgMapper.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.work.mapper;
 import java.util.List;
 import com.ruoyi.web.work.domain.Dg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.dto.DgMedicalRecord;
+import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -15,8 +15,8 @@ public interface DgMapper extends BaseMapper<Dg> {
 
     List<Dg> getDgByCard(String card);
 
-    List<DgMedicalRecord> getMedicalRecord(@Param("beginTime") String beginTime,
-                                           @Param("endTime") String endTime,
-                                           @Param("patientId") String patientId);
+    List<Pv1MedicalRecord> getMedicalRecord(@Param("beginTime") String beginTime,
+                                            @Param("endTime") String endTime,
+                                            @Param("patientId") Long patientId);
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/PatientMapper.java

@@ -3,7 +3,7 @@ package com.ruoyi.web.work.mapper;
 import java.util.List;
 import com.ruoyi.web.work.domain.Patient;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.work.domain.PatientCard;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
 
 /**
  * @author lsw
@@ -12,9 +12,9 @@ import com.ruoyi.web.work.domain.PatientCard;
 public interface PatientMapper extends BaseMapper<Patient> {
     List<Patient> selectList(Patient patient);
 
-    List<PatientCard> getPatientCardByNameOrRoomOrEntity(String patientName, String departmentName, String entity);
+    List<PatientCardDto> getPatientCardByNameOrRoomOrEntity(String patientName, String departmentName, String entity);
 
-    List<PatientCard> getPatientByDepartment(String department);
+    List<PatientCardDto> getPatientByDepartment(String department);
 
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/Pv1Mapper.java

@@ -2,11 +2,11 @@ package com.ruoyi.web.work.mapper;
 
 import java.util.List;
 
-import com.ruoyi.web.work.domain.Dg;
-import com.ruoyi.web.work.domain.Patient;
-import com.ruoyi.web.work.domain.PatientCard;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.ruoyi.web.work.domain.Pv1;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -16,9 +16,9 @@ import org.apache.ibatis.annotations.Param;
 public interface Pv1Mapper extends BaseMapper<Pv1> {
     List<Pv1> selectList(Pv1 pv1);
 
-    List<PatientCard> getPatientCardByNameOrDepartment(@Param("patientName") String patientName,@Param("departmentName") String departmentName,@Param("physician") String physician);
-
-    List<PatientCard> getAllDepartment();
+    List<PatientCardDto> getPatientCardByNameOrDepartment(@Param("patientName") String patientName, @Param("departmentName") String departmentName, @Param("physician") String physician);
 
+    List<PatientCardDto> getAllDepartment();
 
+    List<Pv1MedicalRecord> getMedicalRecord(String beginTime, String endTime, Long patientId);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IDgService.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IDgService extends IService<Dg>{
     List<Dg> selectList(Dg dg);
 
-    AjaxResult getMedicalRecord(String beginTime, String endTime,String patientId);
+    AjaxResult getMedicalRecord(String beginTime, String endTime,Long patientId);
 
     AjaxResult getDgByCard(String card);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IObrService.java

@@ -12,8 +12,8 @@ import com.ruoyi.web.work.domain.Obx;
  * @date 2024-07-23
  */
 public interface IObrService extends IService<Obr>{
-    List<Obr> selectList(Obr obr);
 
+    List<Obr> selectList(Obr obr);
 
-    AjaxResult getObrAndObxByCard(String card);
+    AjaxResult getObrByCard(String card);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IObxService.java

@@ -12,4 +12,5 @@ public interface IObxService extends IService<Obx>{
     List<Obx> selectList(Obx obx);
 
 
+    List<Obx> getObxByCard(String card);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPatientService.java

@@ -3,7 +3,6 @@ package com.ruoyi.web.work.service;
 import java.util.List;
 import com.ruoyi.web.work.domain.Patient;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.work.domain.PatientCard;
 
 /**
  * @author lsw

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IPv1Service.java

@@ -1,11 +1,12 @@
 package com.ruoyi.web.work.service;
 
 import java.util.List;
-import java.util.Map;
 
-import com.ruoyi.web.work.domain.PatientCard;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.ruoyi.web.work.domain.Pv1;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
 
 /**
  * @author lsw
@@ -14,9 +15,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IPv1Service extends IService<Pv1>{
     List<Pv1> selectList(Pv1 pv1);
 
-    List<PatientCard> getPatientCardByNameOrDepartment(String patientName, String departmentName,String physician);
-
-    List<PatientCard> getAllDepartment();
+    List<PatientCardDto> getPatientCardByNameOrDepartment(String patientName, String departmentName, String physician);
 
+    List<PatientCardDto> getAllDepartment();
 
+    List<Pv1MedicalRecord> getMedicalRecord(String beginTime, String endTime, Long patientId);
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/DgServiceImpl.java

@@ -25,7 +25,7 @@ public class DgServiceImpl extends ServiceImpl<DgMapper, Dg> implements IDgServi
     }
 
     @Override
-    public AjaxResult getMedicalRecord(String beginTime, String endTime,String patientId) {
+    public AjaxResult getMedicalRecord(String beginTime, String endTime,Long patientId) {
         return AjaxResult.success(dgMapper.getMedicalRecord(beginTime,endTime,patientId));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ObrServiceImpl.java

@@ -25,11 +25,6 @@ public class ObrServiceImpl extends ServiceImpl<ObrMapper, Obr> implements IObrS
     @Autowired
     private ObrMapper obrMapper;
 
-    @Autowired
-    private Pv1Mapper pv1Mapper;
-
-    @Autowired
-    private ObxMapper obxMapper;
 
     @Override
     public List<Obr> selectList(Obr obr) {
@@ -37,12 +32,7 @@ public class ObrServiceImpl extends ServiceImpl<ObrMapper, Obr> implements IObrS
     }
 
     @Override
-    public AjaxResult getObrAndObxByCard(String card) {
-        Map<String,Object> map=new HashMap();
-        List<Obr> obr= obrMapper.getObrByCard(card);
-        List<Obx> obx=obxMapper.getObxByCard(card);
-        map.put("obr",obr);
-        map.put("obx",obx);
-        return AjaxResult.success(map);
+    public AjaxResult getObrByCard(String card) {
+        return AjaxResult.success(obrMapper.getObrByCard(card));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/ObxServiceImpl.java

@@ -28,5 +28,10 @@ public class ObxServiceImpl extends ServiceImpl<ObxMapper, Obx> implements IObxS
         return obxMapper.selectList(obx);
     }
 
+    @Override
+    public List<Obx> getObxByCard(String card) {
+        return obxMapper.getObxByCard(card);
+    }
+
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/PatientServiceImpl.java

@@ -1,9 +1,7 @@
 package com.ruoyi.web.work.service.impl;
 
-import java.util.Collections;
 import java.util.List;
 
-import com.ruoyi.web.work.domain.PatientCard;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.work.mapper.PatientMapper;

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/Pv1ServiceImpl.java

@@ -1,11 +1,12 @@
 package com.ruoyi.web.work.service.impl;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.*;
+import com.ruoyi.web.work.domain.dto.PatientCardDto;
+import com.ruoyi.web.work.domain.dto.Pv1MedicalRecord;
 import com.ruoyi.web.work.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,16 +29,20 @@ public class Pv1ServiceImpl extends ServiceImpl<Pv1Mapper, Pv1> implements IPv1S
     }
 
     @Override
-    public List<PatientCard> getPatientCardByNameOrDepartment(String patientName, String departmentName,String physician) {
+    public List<PatientCardDto> getPatientCardByNameOrDepartment(String patientName, String departmentName, String physician) {
           return pv1Mapper.getPatientCardByNameOrDepartment(patientName,departmentName,physician);
     }
 
 
     @Override
-    public List<PatientCard> getAllDepartment() {
+    public List<PatientCardDto> getAllDepartment() {
         return pv1Mapper.getAllDepartment();
     }
 
+    @Override
+    public List<Pv1MedicalRecord> getMedicalRecord(String beginTime, String endTime, Long patientId) {
+        return pv1Mapper.getMedicalRecord(beginTime,endTime,patientId);
+    }
 
 
 }

ruoyi-admin/src/main/resources/mapper/work/DgMapper.xml

@@ -20,11 +20,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from tb_dg where card_id=#{card}
     </select>
 
-    <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.dto.DgMedicalRecord">
+    <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.dto.Pv1MedicalRecord">
         SELECT tb_dg.diagnostic_code,tb_dg.create_time,tb_pv1.discharge_time,tb_pv1.card_id
         FROM tb_dg
                  JOIN tb_pv1 ON tb_dg.patient_id=tb_pv1.patient_id
-        WHERE tb_dg.patient_id=#{patientId} and  diagnosis_time BETWEEN #{beginTime} and #{endTime};
+        <where>
+            <if test="patientId !=null and patientId!=''">
+                and tb_dg.patient_id=#{patientId}
+            </if>
+            <if test="beginTime !=null and beginTime!='' and endTime!=null and endTime!=''">
+                and  diagnosis_time BETWEEN #{beginTime} and #{endTime};
+            </if>
+
+        </where>
+
     </select>
 
 

ruoyi-admin/src/main/resources/mapper/work/PatientMapper.xml

@@ -30,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="getPatientCardByNameOrRoomOrEntity" resultType="com.ruoyi.web.work.domain.PatientCard">
+    <select id="getPatientCardByNameOrRoomOrEntity" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
 
     </select>
 
 
 
-    <select id="getPatientByDepartment" resultType="com.ruoyi.web.work.domain.PatientCard">
+    <select id="getPatientByDepartment" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
         SELECT
             tb_pv1.department,
             tb_pv1.physician,

ruoyi-admin/src/main/resources/mapper/work/Pv1Mapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getPatientCardByNameOrDepartment" resultType="com.ruoyi.web.work.domain.PatientCard">
+    <select id="getPatientCardByNameOrDepartment" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
         SELECT
             tb_pv1.department,
             tb_pv1.physician,
@@ -58,9 +58,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getAllDepartment" resultType="com.ruoyi.web.work.domain.PatientCard">
+    <select id="getAllDepartment" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
         select department from tb_pv1 GROUP BY department
     </select>
 
 
+    <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.dto.Pv1MedicalRecord">
+        SELECT tb_pv1.department,tb_pv1.admission_time,tb_pv1.discharge_time,tb_pv1.card_id
+        FROM tb_pv1
+        where tb_pv1.patient_id=#{patientId}
+        <where>
+            <if test="beginTime !=null and beginTime!='' and endTime!=null and endTime!=''">
+                and  diagnosis_time BETWEEN #{beginTime} and #{endTime};
+            </if>
+        </where>
+    </select>
+
+
 </mapper>