fix

src/main/java/com/yunzhi/demo/controller/TaMedicalLogController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -81,14 +82,38 @@ public class TaMedicalLogController extends BaseController {
     @RequestMapping(value="/admin/medicalLog",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean medicalLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("学校ID") @RequestParam(value ="schoolId", required = false) String schoolId,
+                                       @ApiParam("专业ID") @RequestParam(value ="specialtyId", required = false) String specialtyId,
+                                       @ApiParam("学号") @RequestParam(value ="studentId", required = false) String studentId) throws Exception{
 
-        IPage<TaMedicalLog> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaMedicalLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_date");
-
-        IPage<TaMedicalLog> result = iTaMedicalLogService.page(pg, queryWrapper);
-        return ResponseBean.success(result);
+		    IPage<TaMedicalLog> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaMedicalLog> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+
+//            IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
+//                    .gt("status", Constants.STATUS_DELETED)
+//                    .eq(!StringUtils.isEmpty(schoolId), "school_id", schoolId)
+//                    .eq(!StringUtils.isEmpty(specialtyId), "specialty_id", specialtyId)
+//                    .like(!StringUtils.isEmpty(studentId), "student_id", "%"+studentId+"%");
+
+//        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+//        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
+//                .gt("student_id", "")
+//                .gt("status", Constants.STATUS_DELETED)
+//                .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
+//                .eq(!StringUtils.isEmpty(schoolId), "school_id", schoolId)
+//                .eq(!StringUtils.isEmpty(specialtyId), "specialty_id", specialtyId)
+//                .like(!StringUtils.isEmpty(phone), "phone", "%"+phone+"%")
+//                .like(!StringUtils.isEmpty(studentId), "student_id", "%"+studentId+"%")
+//                .orderByDesc("create_date");
+//
+        IPage<TaMedicalLog> result = iTaMedicalLogService.getMedicalLogPagedBy(pg, schoolId, specialtyId, studentId);
+//        return ResponseBean.success(result);
+
+//            IPage<TaMedicalLog> result = iTaMedicalLogService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
     }
 
     /**

src/main/java/com/yunzhi/demo/controller/TdSpecialtyController.java

@@ -82,7 +82,7 @@ public class TdSpecialtyController extends BaseController {
 
         IPage<TdSpecialty> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<TdSpecialty>()
-                .eq(!StringUtils.isEmpty(schoolId),"schoolId", schoolId)
+                .eq(!StringUtils.isEmpty(schoolId),"school_id", schoolId)
                 .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
                 .eq("status", Constants.STATUS_NORMAL)
                 .orderByAsc("sort_no")

src/main/java/com/yunzhi/demo/entity/TaMedicalLog.java

@@ -1,6 +1,7 @@
 package com.yunzhi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -50,4 +51,38 @@ public class TaMedicalLog implements Serializable {
 
     @ApiModelProperty(value = "医生ID")
     private String doctorId;
+
+    @ApiModelProperty(value = "姓名")
+    @TableField(exist = false)
+    private String name;
+
+    @ApiModelProperty(value = "性别")
+    @TableField(exist = false)
+    private String sex;
+
+    @ApiModelProperty(value = "学校ID")
+    @TableField(exist = false)
+    private String schoolId;
+
+    @ApiModelProperty(value = "学校名称")
+    @TableField(exist = false)
+    private String schoolName;
+
+    @ApiModelProperty(value = "专业ID")
+    @TableField(exist = false)
+    private String specialtyId;
+
+    @ApiModelProperty(value = "专业名称")
+    @TableField(exist = false)
+    private String specialtyName;
+
+    @ApiModelProperty(value = "医生")
+    @TableField(exist = false)
+    private String doctorName;
+
+    @ApiModelProperty(value = "学号")
+    @TableField(exist = false)
+    private String studentId;
+
+
 }

src/main/java/com/yunzhi/demo/mapper/TaMedicalLogMapper.java

@@ -1,8 +1,11 @@
 package com.yunzhi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaMedicalLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.demo.entity.TaPerson;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMedicalLogMapper extends BaseMapper<TaMedicalLog> {
 
+    IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg,
+                                          @Param("schoolId") String schoolId,
+                                          @Param("specialtyId") String specialtyId,
+                                          @Param("studentId") String studentId);
 }

src/main/java/com/yunzhi/demo/service/ITaMedicalLogService.java

@@ -1,7 +1,9 @@
 package com.yunzhi.demo.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaMedicalLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.entity.TaPerson;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMedicalLogService extends IService<TaMedicalLog> {
 
+    IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentId);
 }

src/main/java/com/yunzhi/demo/service/impl/TaMedicalLogServiceImpl.java

@@ -1,9 +1,13 @@
 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaMedicalLog;
+import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.mapper.TaMedicalLogMapper;
+import com.yunzhi.demo.mapper.TaPersonMapper;
 import com.yunzhi.demo.service.ITaMedicalLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMedicalLogServiceImpl extends ServiceImpl<TaMedicalLogMapper, TaMedicalLog> implements ITaMedicalLogService {
 
-}
+    @Autowired
+    TaMedicalLogMapper taMedicalLogMapper;
+
+    @Override
+    public IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentId) {
+        return taMedicalLogMapper.getMedicalLogPagedBy(pg, schoolId, specialtyId, studentId);
+    }
+}

src/main/resources/mapper/TaMedicalLogMapper.xml

@@ -2,4 +2,52 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaMedicalLogMapper">
 
+<!--    SELECT-->
+<!--    a.*,-->
+<!--    b.`name`,-->
+<!--    b.sex,-->
+<!--    b.school_id,-->
+<!--    b.student_id,-->
+<!--    c.`name` as school_name,-->
+<!--    d.`name` as specialty_name,-->
+<!--    e.user_name as doctor_name-->
+<!--    FROM-->
+<!--    ta_medical_log a-->
+<!--    LEFT JOIN ta_person b on a.person_id = b.person_id-->
+<!--    LEFT JOIN td_school c on b.school_id = c.school_id-->
+<!--    LEFT JOIN td_specialty d on b.specialty_id = d.specialty_id-->
+<!--    LEFT JOIN sys_user e on a.doctor_id = e.user_id-->
+<!--    WHERE-->
+
+    <select id="getMedicalLogPagedBy" resultType="com.yunzhi.demo.entity.TaMedicalLog">
+        SELECT
+        a.*,
+        b.`name`,
+        b.sex,
+        b.school_id,
+        b.specialty_id,
+        b.student_id,
+        c.`name` as school_name,
+        d.`name` as specialty_name,
+        e.user_name as doctor_name
+        FROM
+        ta_medical_log a
+        LEFT JOIN ta_person b on a.person_id = b.person_id
+        LEFT JOIN td_school c on b.school_id = c.school_id
+        LEFT JOIN td_specialty d on b.specialty_id = d.specialty_id
+        LEFT JOIN sys_user e on a.doctor_id = e.user_id
+        WHERE
+        a.`status` > - 1
+        <if test="studentId != null and studentId != ''">
+            AND b.student_id LIKE CONCAT( '%', #{studentId}, '%' )
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+            AND b.school_id = #{schoolId}
+        </if>
+        <if test="specialtyId != null and specialtyId != ''">
+            AND b.specialty_id = #{specialtyId}
+        </if>
+        ORDER BY
+        a.create_date DESC
+    </select>
 </mapper>