feats

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

@@ -8,6 +8,8 @@ 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 com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.service.ITaStudentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -37,15 +39,19 @@ public class TaMedicalLogController extends BaseController {
     @Autowired
     public ITaMedicalLogService iTaMedicalLogService;
 
+    @Autowired
+    public ITaStudentService iTaStudentService;
+
     @GetMapping("/ma/medical-log")
     @ApiOperation(value="我的就诊记录", notes = "我的就诊记录", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean maMedicalList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
         TaPerson taPerson = getCurrentPerson();
+        TaStudent taStudent = iTaStudentService.getByPersonId(taPerson.getPersonId());
 
         IPage<TaMedicalLog> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMedicalLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id", taPerson.getPersonId());
+        queryWrapper.eq("student_id", taStudent.getStudentId());
         queryWrapper.eq("status", Constants.STATUS_NORMAL);
         queryWrapper.orderByDesc("create_date");
 
@@ -54,25 +60,6 @@ public class TaMedicalLogController extends BaseController {
     }
 
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taMedicalLog",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMedicalLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) 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);
-    }
-
     /**
      * 分页查询列表
      * @param pageNum
@@ -99,7 +86,17 @@ public class TaMedicalLogController extends BaseController {
      */
     @RequestMapping(value="/taMedicalLog",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taMedicalLogAdd(@ApiParam("保存内容") @RequestBody TaMedicalLog taMedicalLog) throws Exception{
+    public ResponseBean taMedicalLogAdd(@ApiParam("保存内容") @RequestBody TaMedicalLog taMedicalLog) throws Exception {
+
+        String schoolId = taMedicalLog.getSchoolId();
+        String studentNo = taMedicalLog.getStudentNo();
+
+        if (StringUtils.isEmpty(schoolId) || StringUtils.isEmpty(studentNo)) {
+            throw new Exception("学生信息不完整");
+        }
+
+        TaStudent taStudent = iTaStudentService.getByStudentNo(schoolId, studentNo);
+
 
         if (iTaMedicalLogService.save(taMedicalLog)){
             return ResponseBean.success(taMedicalLog);

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

@@ -86,7 +86,7 @@ public class TaStudentController extends BaseController {
         }
 
         if (!StringUtils.isEmpty(taStudent.getStudentNo())) {
-            TaStudent stu = iTaStudentService.getByStudentNo(taStudent.getStudentNo());
+            TaStudent stu = iTaStudentService.getByStudentNo(taStudent.getSchoolId(), taStudent.getStudentNo());
             if (null != stu && !StringUtils.isEmpty(taStudent.getStudentId()) && stu.getStudentId().equals(taStudent.getStudentId())) {
                 throw new Exception("学号信息重复");
             }
@@ -128,8 +128,9 @@ public class TaStudentController extends BaseController {
      */
     @RequestMapping(value="/admin/student-no/{id}",method= RequestMethod.GET)
     @ApiOperation(value="学生详情", notes = "查询人员详细信息", httpMethod = "GET", response = TaPerson.class)
-    public ResponseBean studentGet(@ApiParam("学生学号") @PathVariable String id) throws Exception{
-        TaStudent taStudent = iTaStudentService.getByStudentNo(id);
+    public ResponseBean studentGet(@ApiParam("学生学号") @PathVariable String id,
+                                   @ApiParam("学校ID") @RequestParam String schoolId) throws Exception{
+        TaStudent taStudent = iTaStudentService.getByStudentNo(schoolId, id);
         if (null == taStudent || Constants.STATUS_DELETED.equals(taStudent.getStatus())) {
             throw new Exception("验证人员信息失败, 请退出重试");
         }

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

@@ -20,7 +20,7 @@ public interface ITaStudentService extends IService<TaStudent> {
 
     IPage<TaStudent> getStudentInfoPagedBy(IPage<TaStudent> pg, String name, String schoolId, String specialtyId, String phone, String studentNo);
 
-    TaStudent getByStudentNo(String studentNo);
+    TaStudent getByStudentNo(String schoolId, String studentNo);
 
     TaStudent getByPersonId(String personId);
 

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

@@ -47,8 +47,9 @@ public class TaStudentServiceImpl extends ServiceImpl<TaStudentMapper, TaStudent
     }
 
     @Override
-    public TaStudent getByStudentNo(String studentNo) {
+    public TaStudent getByStudentNo(String schoolId, String studentNo) {
         QueryWrapper<TaStudent> queryWrapper = new QueryWrapper<TaStudent>()
+                .eq("school_id", schoolId)
                 .eq("student_no", studentNo)
                 .gt("status", Constants.STATUS_DELETED);
         return getOne(queryWrapper);

src/main/resources/mapper/TaMedicalLogMapper.xml

@@ -15,7 +15,7 @@
             e.user_name as doctor_name
         FROM
         ta_medical_log a
-        LEFT JOIN ta_student b on a.person_id = b.person_id
+        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