Merge branch 'master' of gitee.com:ccsens_s/ccsenscloud

game/src/main/java/com/ccsens/game/service/ScreenService.java

@@ -579,7 +579,8 @@ public class ScreenService implements IScreenService{
         long current = System.currentTimeMillis();
         long moreTime = start.getLocalTime() - current;
         //查询游戏
-        GameRecord gameRecord = gameRecordDao.selectByPrimaryKey(start.getMemberRecord());
+//        GameRecord gameRecord = gameRecordDao.selectByPrimaryKey(start.getMemberRecord());
+        GameRecord gameRecord = getGameRecord(start.getMemberRecord());
         log.info("游戏信息：{}", gameRecord);
         if (gameRecord == null) {
             throw new BaseException(CodeEnum.PARAM_ERROR);
@@ -588,7 +589,7 @@ public class ScreenService implements IScreenService{
         switch (gameRecord.getGameStatus().byteValue()) {
             case GameConstant.GAME_PREPARATION: throw new BaseException(CodeEnum.GAME_PREPARATION);
             case GameConstant.GAME_PROCESSING: throw new BaseException(CodeEnum.GAME_PROCESSING);
-            case GameConstant.GAME_COMPLETED: throw new BaseException(CodeEnum.GAME_COMPLETED);
+//            case GameConstant.GAME_COMPLETED: throw new BaseException(CodeEnum.GAME_COMPLETED);
         }
 
         //更新状态和时间

ht/src/main/java/com/ccsens/ht/service/PatientReportService.java

@@ -3,6 +3,7 @@ package com.ccsens.ht.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.ht.bean.dto.PatientReportDto;
 import com.ccsens.ht.bean.po.*;
@@ -84,6 +85,7 @@ public class PatientReportService implements IPatientReportService {
         htPatientReport.setDoctorId(doctors.get(0).getId());
         htPatientReport.setPatientId(generate.getPatientId());
         htPatientReport.setPatientIdcard(htPatient.getIdcard());
+        htPatientReport.setPatientAge(StrUtil.isEmpty(htPatient.getIdcard()) ? null : (byte)IdcardUtil.getAgeByIdCard(htPatient.getIdcard()));
         htPatientReport.setEvaluationCode(Constant.Ht.Report.PARENT_CODE);
         htPatientReport.setName(Constant.Ht.Report.PARENT_NAME + DateUtil.today());
         htPatientReport.setSerialNumber(htPatient.getId() + "_" + (times + 1));

ht/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test