feata

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

@@ -134,7 +134,12 @@ public class TaMedicalLogController extends BaseController {
     @ApiOperation(value="就诊详情", notes = "就诊详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taMedicalLogGet(@ApiParam(value = "客户端", allowableValues = "admin,ma") @PathVariable String client,
                                         @ApiParam("就诊ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaMedicalLogService.getById(id));
+        TaMedicalLog medicalLog = iTaMedicalLogService.getProfileBy(id);
+        if (null == medicalLog) {
+            throw new Exception("无效的就诊记录");
+        }
+
+        return ResponseBean.success(medicalLog);
     }
 
 

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

@@ -87,5 +87,4 @@ public class TaMedicalLog implements Serializable {
     @ApiModelProperty(value = "手机号")
     @TableField(exist = false)
     private String phone;
-
 }

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

@@ -22,4 +22,6 @@ public interface TaMedicalLogMapper extends BaseMapper<TaMedicalLog> {
                                           @Param("schoolId") String schoolId,
                                           @Param("specialtyId") String specialtyId,
                                           @Param("studentNo") String studentNo);
+
+    TaMedicalLog getMedicalLogDetail(Integer id);
 }

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

@@ -16,4 +16,6 @@ import com.yunzhi.demo.entity.TaPerson;
 public interface ITaMedicalLogService extends IService<TaMedicalLog> {
 
     IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentNo);
+
+    TaMedicalLog getProfileBy(Integer id);
 }

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

@@ -28,4 +28,9 @@ public class TaMedicalLogServiceImpl extends ServiceImpl<TaMedicalLogMapper, TaM
     public IPage<TaMedicalLog> getMedicalLogPagedBy(IPage<TaMedicalLog> pg, String schoolId, String specialtyId, String studentNo) {
         return taMedicalLogMapper.getMedicalLogPagedBy(pg, schoolId, specialtyId, studentNo);
     }
+
+    @Override
+    public TaMedicalLog getProfileBy(Integer id) {
+        return taMedicalLogMapper.getMedicalLogDetail(id);
+    }
 }

src/main/resources/mapper/TaMedicalLogMapper.xml

@@ -33,4 +33,24 @@
         ORDER BY
         a.create_date DESC
     </select>
+    <select id="getMedicalLogDetail" 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_student b on a.student_id = b.student_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.serial_no = #{id}
+            AND a.`status` > - 1
+    </select>
 </mapper>