检查报告就诊记录详情

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

@@ -6,7 +6,6 @@ import com.ruoyi.web.work.service.IRequestService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -31,7 +30,7 @@ public class Api_ObrRequestController {
     @ApiOperation(value = "检测报告列表")
     @GetMapping("/{cardId}")
     public AjaxResult getObrRequestByCardId(@PathVariable String cardId){
-        List<Request> obrRequestList = obrRequestService.getObrRequestByCardId(cardId);
+        List<Request> obrRequestList = obrRequestService.getRequestByCard(cardId);
         return AjaxResult.success(obrRequestList);
     }
 }

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

@@ -30,8 +30,8 @@ public class Api_VisitController {
      */
     @ApiOperation(value = "就诊记录列表")
     @GetMapping("/{cardId}")
-    public AjaxResult getVisitByCardId(@PathVariable String cardId,@RequestParam(value = "startTime",required = false) LocalDateTime startTime,
-                                       @RequestParam(value = "endTime",required = false) LocalDateTime endTime){
+    public AjaxResult getVisitByCardId(@PathVariable String cardId,@RequestParam(value = "startTime",required = false) String startTime,
+                                       @RequestParam(value = "endTime",required = false) String endTime){
         List<Visit> visitList = service.getVisitByCardId(cardId,startTime,endTime);
         return AjaxResult.success(visitList);
     }

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

@@ -7,4 +7,6 @@ import java.util.List;
 
 public interface DiagnosisMapper extends BaseMapper<Diagnosis> {
     List<Diagnosis> selectList(Diagnosis diagnosis);
+
+    List<Diagnosis> selectDiagnosisInfosByVisitId(String visitId);
 }

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

@@ -16,4 +16,6 @@ public interface ResultMapper extends BaseMapper<Result> {
     List<Result> getResultByCard(String card);
 
     List<Result> getAllResultByPatId(Long patId);
+
+    List<Result> selectResultByObrId(String obrId);
 }

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

@@ -20,4 +20,6 @@ public interface VisitMapper extends BaseMapper<Visit> {
     List<PatientCardDto> getAllDepartment();
 
     List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
+
+    List<Visit> selectVisitsByCardId(String cardId);
 }

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

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

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

@@ -22,5 +22,5 @@ public interface IVisitService extends IService<Visit>{
     List<Visit> getVisitByTime(String beginTime, String endTime, Long patId);
 
     //根据就诊卡号获取就诊记录列表
-    List<Visit> getVisitByCardId(String cardId, LocalDateTime startTime, LocalDateTime endTime);
+    List<Visit> getVisitByCardId(String cardId, String startTime, String endTime);
 }

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

@@ -33,9 +33,8 @@ public class DiagnosisServiceImpl extends ServiceImpl<DiagnosisMapper, Diagnosis
      */
     @Override
     public List<Diagnosis> getDiagnosisInfoByVisitId(String visitId) {
-        LambdaQueryWrapper<Diagnosis> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Diagnosis::getVisitId,visitId);
-        return baseMapper.selectList(wrapper);
+
+        return diagnosisMapper.selectDiagnosisInfosByVisitId(visitId);
     }
 
 

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

@@ -37,11 +37,11 @@ public class RequestServiceImpl extends ServiceImpl<RequestMapper, Request> impl
     }
 
 
-    @Override
-    public List<Request> getObrRequestByCardId(String cardId) {
-        LambdaQueryWrapper<Request> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Request::getCardId,cardId);
-        return baseMapper.selectList(wrapper);
-    }
+//    @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

@@ -38,9 +38,7 @@ public class ResultServiceImpl extends ServiceImpl<ResultMapper, Result> impleme
 
     @Override
     public List<Result> getObxResultByObrId(String obrId) {
-        LambdaQueryWrapper<Result> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Result::getObrId,obrId);
-        return baseMapper.selectList(wrapper);
+        return resultMapper.selectResultByObrId(obrId);
     }
 
 

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

@@ -46,13 +46,8 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
     }
 
     @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);
+    public List<Visit> getVisitByCardId(String cardId, String startTime, String endTime) {
+        return baseMapper.selectVisitsByCardId(cardId);
     }
 
 

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

@@ -44,5 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where tb_diagnosis.visit_id in (SELECT tb_visit.id from tb_visit WHERE tb_visit.card_id=#{cardId})
     </select>
 
+    <select id="selectDiagnosisInfosByVisitId" resultType="com.ruoyi.web.work.domain.Diagnosis">
+        SELECT * from tb_diagnosis
+        where visit_id = #{visitId}
+    </select>
 
 </mapper>

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

@@ -39,4 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectResultByObrId" resultType="com.ruoyi.web.work.domain.Result">
+        SELECT * FROM tb_obx_result
+        WHERE obr_id = #{obrId}
+    </select>
+
+
 </mapper>

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

@@ -75,5 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectVisitsByCardId" resultType="com.ruoyi.web.work.domain.Visit">
+        select * from tb_visit where card_id=#{cardId}
+    </select>
+
 
 </mapper>