Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

recovery/src/main/java/com/ccsens/recovery/bean/dto/HospitalDto.java

@@ -24,8 +24,8 @@ public class HospitalDto {
     @Data
     @ApiModel("康复中心id")
     public static class RecoveryCentreId{
-        @ApiModelProperty("康复中心id")
-        private Long id;
+        @ApiModelProperty("项目id")
+        private Long projectId;
     }
 
 

recovery/src/main/java/com/ccsens/recovery/service/HospitalService.java

@@ -3,12 +3,16 @@ package com.ccsens.recovery.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.recovery.bean.dto.HospitalDto;
+import com.ccsens.recovery.bean.po.RecoveryCentre;
+import com.ccsens.recovery.bean.po.RecoveryCentreExample;
 import com.ccsens.recovery.bean.po.RecoveryDoctor;
 import com.ccsens.recovery.bean.po.RecoveryDoctorExample;
 import com.ccsens.recovery.bean.vo.HospitalVo;
 import com.ccsens.recovery.persist.dao.DoctorDao;
+import com.ccsens.recovery.persist.mapper.RecoveryCentreMapper;
 import com.ccsens.recovery.persist.mapper.RecoveryDoctorMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.validator.constraints.pl.REGON;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,14 +31,14 @@ public class HospitalService implements IHospitalService{
     private RecoveryDoctorMapper recoveryDoctorMapper;
     @Resource
     private DoctorDao doctorDao;
+    @Resource
+    private RecoveryCentreMapper recoveryCentreMapper;
 
     @Override
     public List<HospitalVo.RobotInfo> queryRobotByHospital(HospitalDto.RecoveryCentreId param, Long userId) {
-        //康复室id非必填，如果没有则用当前登录的userId来查找所属的康复室
-        Long centreId = param.getId();
-        if(ObjectUtil.isNull(centreId)){
-            centreId = getCentreByUserId(userId);
-        }
+
+        Long centreId = getCentreByUserId(param.getProjectId());
+
         return doctorDao.queryRobotByCentre(centreId);
     }
 
@@ -49,4 +53,16 @@ public class HospitalService implements IHospitalService{
         }
         return centreId;
     }
+
+    @Override
+    public Long getCentreByProjectId(Long projectId) {
+        Long centreId = null;
+        RecoveryCentreExample recoveryCentreExample = new RecoveryCentreExample();
+        recoveryCentreExample.createCriteria().andProjectIdEqualTo(projectId);
+        List<RecoveryCentre> recoveryCentres = recoveryCentreMapper.selectByExample(recoveryCentreExample);
+        if(CollectionUtil.isNotEmpty(recoveryCentres)){
+            centreId = recoveryCentres.get(0).getId();
+        }
+        return centreId;
+    }
 }

recovery/src/main/java/com/ccsens/recovery/service/IHospitalService.java

@@ -23,4 +23,11 @@ public interface IHospitalService {
      * @return 康复中心id
      */
     Long getCentreByUserId(Long userId);
+
+    /**
+     * 通过userId查看康复中心的id
+     * @param projectId 项目id
+     * @return 康复中心id
+     */
+    Long getCentreByProjectId(Long projectId);
 }

recovery/src/main/java/com/ccsens/recovery/service/PatientService.java

@@ -77,10 +77,10 @@ public class PatientService implements IPatientService{
 
     @Override
     public List<PatientVo.Patient> queryPatientByRecovery(HospitalDto.RecoveryCentreId param, Long userId) {
-        Long centreId = param.getId();
-        if(ObjectUtil.isNull(centreId)){
-            centreId = hospitalService.getCentreByUserId(userId);
-        }
+        Long centreId = hospitalService.getCentreByProjectId(param.getProjectId());
+//        if(ObjectUtil.isNull(centreId)){
+////            centreId = hospitalService.getCentreByUserId(userId);
+////        }
         return patientDao.queryPatientByHospitalId(centreId);
     }
 
@@ -197,8 +197,11 @@ public class PatientService implements IPatientService{
         RecipeRecord recipeRecord = recipeRecordMapper.selectByPrimaryKey(param.getId());
         if(ObjectUtil.isNotNull(recipeRecord)){
             //添加结束时间和分数
-            Object o = redisUtil.get(Constant.Redis.RECORD_SCORE + param.getPatientId());
+            Object o = redisUtil.get(Constant.Redis.RECORD_SCORE + param.getId());
+            Object o1 = redisUtil.get(Constant.Redis.RECORD_TIMES + param.getId());
             int score = ObjectUtil.isNotNull(o) ? (int) o : 0;
+            int times = ObjectUtil.isNotNull(o1) ? (int) o1 : 0;
+            log.info("{}训练的分数：{}--次数:{}",recipeRecord.getId(),score,times);
             recipeRecord.setEndTime(System.currentTimeMillis());
             recipeRecord.setScore(score);
 
@@ -207,6 +210,7 @@ public class PatientService implements IPatientService{
             RecoveryWithEndDrill.Data data = new RecoveryWithEndDrill.Data();
             data.setRecordId(param.getId());
             data.setScore(score);
+            data.setTimes(times);
             data.setStatus(2);
             RecoveryWithEndDrill recoveryWithEndDrill = new RecoveryWithEndDrill(data);
             //查找患者信息