fix：修改数据库表

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

@@ -1,33 +0,0 @@
-package com.ruoyi.web.work.api;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.web.work.api.config.BaseController;
-import com.ruoyi.web.work.api.util.AppUtil;
-import com.ruoyi.web.work.domain.Dg;
-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.*;
-
-import java.util.List;
-
-@Api(tags = "小程序就诊信息管理")
-@RestController
-@RequestMapping("/app/dg")
-public class Api_DgController extends BaseController {
-
-    @Autowired
-    private IDgService dgService;
-
-    @ApiOperation(value = "根据就诊卡号获取用户诊断信息(如主要诊断，次要诊断)")
-    @GetMapping("/diagnosis/{card}")
-    public TableDataInfo getDgByCard(@PathVariable("card") String card){
-        startPage();
-        List<Dg> dgList=dgService.getDgByCard(card);
-        return getDataTable(dgList);
-    }
-
-
-}

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

@@ -1,32 +0,0 @@
-package com.ruoyi.web.work.api;
-
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.web.work.api.config.BaseController;
-import com.ruoyi.web.work.domain.Obr;
-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.*;
-
-import java.util.List;
-
-@Api(tags = "小程序科室申请管理")
-@RestController
-@RequestMapping("/app/obr")
-public class Api_ObrController extends BaseController {
-
-    @Autowired
-    private IObrService obrService;
-
-    @ApiOperation(value = "根据就诊卡号获取科室申请")
-    @GetMapping("/department/{card}")
-    public TableDataInfo getObrByCard(@PathVariable("card") String card) {
-        startPage();
-        List<Obr> obrList = obrService.getObrByCard(card);
-        return getDataTable(obrList);
-    }
-
-}

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

@@ -1,8 +1,8 @@
 package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.ObrRequest;
-import com.ruoyi.web.work.service.ObrRequestService;
+import com.ruoyi.web.work.domain.Request;
+import com.ruoyi.web.work.service.IRequestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +20,7 @@ import java.util.List;
 public class Api_ObrRequestController {
 
     @Autowired
-    private ObrRequestService obrRequestService;
+    private IRequestService obrRequestService;
 
 
     /**
@@ -31,7 +31,7 @@ public class Api_ObrRequestController {
     @ApiOperation(value = "检测报告列表")
     @GetMapping("/{cardId}")
     public AjaxResult getObrRequestByCardId(@PathVariable String cardId){
-        List<ObrRequest> obrRequestList = obrRequestService.getObrRequestByCardId(cardId);
+        List<Request> obrRequestList = obrRequestService.getObrRequestByCardId(cardId);
         return AjaxResult.success(obrRequestList);
     }
 }

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

@@ -1,38 +0,0 @@
-package com.ruoyi.web.work.api;
-
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.web.work.api.config.BaseController;
-
-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 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 extends BaseController {
-
-    @Autowired
-    private IObxService obxService;
-
-    @ApiOperation(value = "根据就诊卡号获取检测项目列表")
-    @GetMapping("/examine/{card}")
-    public TableDataInfo getObxByCard(@PathVariable("card") String card) {
-        startPage();
-        List<Obx> obxList=obxService.getObxByCard(card);
-        return getDataTable(obxList);
-    }
-
-
-
-}

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

@@ -2,8 +2,8 @@ package com.ruoyi.web.work.api;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.ObxResult;
-import com.ruoyi.web.work.service.ObxResultService;
+import com.ruoyi.web.work.domain.Result;
+import com.ruoyi.web.work.service.IResultService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +21,7 @@ import java.util.List;
 public class Api_ObxResultController {
 
     @Autowired
-    private ObxResultService obxResultService;
+    private IResultService obxResultService;
 
 
     /**
@@ -32,7 +32,7 @@ public class Api_ObxResultController {
     @ApiOperation(value = "检测报告列表")
     @GetMapping("/{obrId}")
     public AjaxResult getObxResultByObrId(@PathVariable String obrId){
-        List<ObxResult> obxResults = obxResultService.getObxResultByObrId(obrId);
+        List<Result> obxResults = obxResultService.getObxResultByObrId(obrId);
         return AjaxResult.success(obxResults);
     }
 

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

@@ -1,36 +0,0 @@
-package com.ruoyi.web.work.api;
-
-
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.web.work.api.config.BaseController;
-import com.ruoyi.web.work.domain.Pv1;
-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 extends BaseController {
-
-    @Autowired
-    private IPv1Service ipv1Service;
-
-    @ApiOperation(value = "根据时间获取用户就医记录")
-    @GetMapping("/record")
-    public TableDataInfo getMedicalRecord(@RequestParam("beginTime") String beginTime,
-                                          @RequestParam("endTime") String endTime,
-                                          @RequestParam("patientId") String patientId){
-        startPage();
-        List<Pv1> pv1List=ipv1Service.getMedicalRecord(beginTime,endTime,Long.parseLong(patientId));
-        return getDataTable(pv1List);
-    }
-
-
-}

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

@@ -19,5 +19,5 @@ public interface VisitMapper extends BaseMapper<Visit> {
 
     List<PatientCardDto> getAllDepartment();
 
-    List<Visit> getMedicalRecord(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("patientId") Long patientId);
+    List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.service;
 import java.util.List;
 import com.ruoyi.web.work.domain.DeptInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.work.domain.Diagnosis;
 
 /**
  * @author zeng
@@ -10,5 +11,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDeptInfoService extends IService<DeptInfo>{
     List<DeptInfo> selectList(DeptInfo deptInfo);
-
 }

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

@@ -13,5 +13,9 @@ import com.ruoyi.web.work.domain.Request;
  */
 public interface IDiagnosisService extends IService<Diagnosis>{
     List<Diagnosis> selectList(Diagnosis diagnosis);
+    //根据就诊ID获取诊断详情
+    List<Diagnosis> getDiagnosisInfoByVisitId(String visitId);
+
+
 
 }

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

@@ -17,4 +17,7 @@ public interface IRequestService extends IService<Request>{
     List<Request> getRequestByCard(String card);
 
     List<Request> getAllRequestByPatId(Long patId);
+
+    //根据就诊卡号查询患者报告
+    List<Request> getObrRequestByCardId(String cardId);
 }

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

@@ -17,4 +17,7 @@ public interface IResultService extends IService<Result>{
     List<Result> getResultByCard(String card);
 
     List<Result> getAllResultByPatId(Long patId);
+
+    //根据检测报告ID获取报告结果
+    List<Result> getObxResultByObrId(String obrId);
 }

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

@@ -1,7 +1,9 @@
 package com.ruoyi.web.work.service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
+import com.ruoyi.web.work.domain.FollowRecord;
 import com.ruoyi.web.work.domain.Visit;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,5 +19,8 @@ public interface IVisitService extends IService<Visit>{
 
     List<PatientCardDto> getAllDepartment();
 
-    List<Visit> getMedicalRecord(String beginTime, String endTime, Long patientId);
+    List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
+
+    //根据就诊卡号获取就诊记录列表
+    List<Visit> getVisitByCardId(String cardId, LocalDateTime startTime, LocalDateTime endTime);
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.Diagnosis;
 import com.ruoyi.web.work.service.IDiagnosisService;
@@ -25,5 +26,17 @@ public class DiagnosisServiceImpl extends ServiceImpl<DiagnosisMapper, Diagnosis
         return diagnosisMapper.selectList(diagnosis);
     }
 
+    /**
+     * 根据就诊ID获取诊断详情
+     * @param visitId
+     * @return
+     */
+    @Override
+    public List<Diagnosis> getDiagnosisInfoByVisitId(String visitId) {
+        LambdaQueryWrapper<Diagnosis> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Diagnosis::getVisitId,visitId);
+        return baseMapper.selectList(wrapper);
+    }
+
 
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.service.impl;
 import java.util.Collections;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.work.mapper.RequestMapper;
@@ -34,4 +35,13 @@ public class RequestServiceImpl extends ServiceImpl<RequestMapper, Request> impl
     public List<Request> getAllRequestByPatId(Long patId) {
         return requestMapper.getAllRequestByPatId(patId);
     }
+
+
+    @Override
+    public List<Request> getObrRequestByCardId(String cardId) {
+        LambdaQueryWrapper<Request> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Request::getCardId,cardId);
+        return baseMapper.selectList(wrapper);
+    }
+
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.work.service.impl;
 import java.util.Collections;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.web.work.domain.Request;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,5 +36,13 @@ public class ResultServiceImpl extends ServiceImpl<ResultMapper, Result> impleme
         return resultMapper.getAllResultByPatId(patId);
     }
 
+    @Override
+    public List<Result> getObxResultByObrId(String obrId) {
+        LambdaQueryWrapper<Result> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Result::getObrId,obrId);
+        return baseMapper.selectList(wrapper);
+    }
+
+
 
 }

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

@@ -1,8 +1,11 @@
 package com.ruoyi.web.work.service.impl;
 
 
+import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.web.work.domain.*;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.ruoyi.web.work.mapper.*;
@@ -38,8 +41,18 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
     }
 
     @Override
-    public List<Visit> getMedicalRecord(String beginTime, String endTime, Long patientId) {
-        return visitMapper.getMedicalRecord(beginTime, endTime, patientId);
+    public List<Visit> getVisitByTime(String beginTime, String endTime, Long patId) {
+        return visitMapper.getVisitByTime(beginTime,endTime,patId);
+    }
+
+    @Override
+    public List<Visit> getVisitByCardId(String cardId, LocalDateTime startTime, LocalDateTime endTime) {
+        LambdaQueryWrapper<Visit> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Visit::getCardId,cardId);
+        if (startTime != null && endTime != null){
+            wrapper.between(Visit::getAdmissionTime,startTime,endTime);
+        }
+        return baseMapper.selectList(wrapper);
     }
 
 

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

@@ -65,17 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getMedicalRecord" resultType="com.ruoyi.web.work.domain.Visit">
+    <select id="getVisitByTime" resultType="com.ruoyi.web.work.domain.Visit">
         SELECT *
-        FROM tb_visit
+        FROM tb_visit tb_visit.pat_id=#{patId}
         <where>
-            <if test="patientId != '' and patientId != null"></if>
-                and tb_visit.pat_id=#{patientId}
             <if test="beginTime !=null and beginTime != '' and endTime != null and endTime != ''">
                 and  tb_visit.admission_time BETWEEN #{beginTime} AND #{endTime}
             </if>
         </where>
-
     </select>