From b73e1fb7fec38cde02aa4b2a56825617bfca23ed Mon Sep 17 00:00:00 2001
From: chenfei <18955928961@163.com>
Date: Wed, 17 Aug 2022 17:07:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=8A=E6=96=AD=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/api/AppController.java  | 12 +++++++++---
 .../main/resources/mapper/system/TRecordMapper.xml   | 11 +++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

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<String,Object> data = new HashMap<>();
+        data.put("result",tRecordService.selectById(id));
+        TImage tImage = new TImage();
+        tImage.setThirdId(id);
+        List<TImage> 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"
             <if test="hospitalId != null "> and tr.hospital_id = #{hospitalId}</if>
             <if test="status != null  and status != ''"> and tr.status = #{status}</if>
             <if test="doctorName != null  and doctorName != ''"> and td.name like concat('%', #{doctorName}, '%')</if>
-            <if test="age !=null">
+            <if test="age !=null and age != ''">
             and tp.age between
                 <foreach item="item" collection="age.split('-')" separator="and">
                     #{item}
                 </foreach>
             </if>
-            <if test="sex !=null">and tp.sex = #{sex} </if>
-            <if test="identifier !=null">and tp.identifier like concat('%', #{identifier}, '%')</if>
+            <if test="sex !=null and sex !=''">and tp.sex = #{sex} </if>
+            <if test="identifier !=null and identifier != null">and tp.identifier like concat('%', #{identifier}, '%')</if>
             <if test="delFlag == null">
                 and td.del_flag = '0' and tp.del_flag = '0'
             </if>
-            <if test="createTime != null and createTime !=''">
+            <if test="createTime != null and createTime !='' and createTime != 'all'">
                and  DATE_FORMAT(tp.create_time,'%Y-%m') = #{createTime}
             </if>
+            <if test="createTime == null or createTime ==''">
+                and  to_days(tr.create_time) = to_days(now())
+            </if>
             <if test="startTime != null  and startTime != '' and endTime == null "> and tr.create_time &gt;= #{startTime}</if>
             <if test="startTime == null  and endTime != '' and endTime != null "> and tr.create_time &lt;= #{endTime}</if>
             <if test="startTime != null  and endTime != null "> and tr.create_time between #{startTime} and #{endTime}</if>