diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java index c8e47b1..16e8612 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java @@ -265,7 +265,13 @@ public class AppController extends BaseController @GetMapping("/record/info/{id}") public AjaxResult patientsWithDiagnosisOfRecordInformationDetails(@PathVariable("id") Long id) { - return AjaxResult.success(tRecordService.selectById(id)); + Map data = new HashMap<>(); + data.put("result",tRecordService.selectById(id)); + TImage tImage = new TImage(); + tImage.setThirdId(id); + List images = imageService.selectTImageList(tImage); + data.put("image", images); + return AjaxResult.success(data); } /** @@ -278,7 +284,7 @@ public class AppController extends BaseController @GetMapping("/record/diagnosedList") public TableDataInfo patientsDiagnosedList(TRecordResultReq recordResultReq) { - recordResultReq.setStatus("1"); +// recordResultReq.setStatus("1"); startPage(); return getDataTable(tRecordService.selectTRecordListWithoutResult(recordResultReq)); } @@ -293,7 +299,7 @@ public class AppController extends BaseController @GetMapping("/record/waitingList") public TableDataInfo patientsWaitingList(TRecordResultReq recordResultReq) { - recordResultReq.setStatus("0"); +// recordResultReq.setStatus("0"); startPage(); return getDataTable(tRecordService.selectTRecordListWithoutResult(recordResultReq)); } diff --git a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml index b6a37c6..112311c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml @@ -199,20 +199,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tr.hospital_id = #{hospitalId} and tr.status = #{status} and td.name like concat('%', #{doctorName}, '%') - + and tp.age between #{item} - and tp.sex = #{sex} - and tp.identifier like concat('%', #{identifier}, '%') + and tp.sex = #{sex} + and tp.identifier like concat('%', #{identifier}, '%') and td.del_flag = '0' and tp.del_flag = '0' - + and DATE_FORMAT(tp.create_time,'%Y-%m') = #{createTime} + + and to_days(tr.create_time) = to_days(now()) + and tr.create_time >= #{startTime} and tr.create_time <= #{endTime} and tr.create_time between #{startTime} and #{endTime}