测导出

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

@@ -12,18 +12,12 @@ import com.ccsens.game.bean.po.GameRecord;
 import com.ccsens.game.bean.po.GameUserJoin;
 import com.ccsens.game.bean.po.GameUserJoinExample;
 import com.ccsens.game.bean.vo.ClientVo;
-import com.ccsens.game.persist.dao.GameRecordDao;
 import com.ccsens.game.persist.dao.GameUserJoinDao;
 import com.ccsens.game.util.GameConstant;
-import com.ccsens.game.util.SendMsg;
 import com.ccsens.util.CodeEnum;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
-import com.ccsens.util.mq.DelayProducer;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.ZSetOperations;
@@ -33,10 +27,6 @@ import org.springframework.transaction.annotation.Transactional;
 import com.ccsens.util.bean.dto.QueryDto;
 
 import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 
 /**
  * @description:

ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java

@@ -215,7 +215,8 @@ public class PatientReportVo {
 //                    fillBlankCell(row2);
                     //子测评项
                     this.subReport.forEach(reportScore -> {
-                        fillRow(row1,row2, reportScore.getName(), reportScore.score == null ? "" : reportScore.score + (reportScore.totalScore > 0  ? "/" + reportScore.totalScore : ""), npi.equalsIgnoreCase(this.code) ? new int[]{3,3} : null);
+                        String score = (reportScore.score == null ? "" : reportScore.score) + (reportScore.getTotalScore() > 0 ? "/" + reportScore.getTotalScore() : "");
+                        fillRow(row1,row2, reportScore.getName(), score, npi.equalsIgnoreCase(this.code) ? new int[]{3,3} : null);
                     });
                     // 总分
                     if (mmse.equalsIgnoreCase(this.code)) {
@@ -237,9 +238,10 @@ public class PatientReportVo {
                         ReportScore reportScore = this.subReport.get(i);
                         String jy = "JY";
                         if (jy.equalsIgnoreCase(reportScore.getCode())) {
-                            fillRow(row1, row2, reportScore.getName(), "", i == 0 ? new int[]{2,2}: null);
+                            fillRow(row1, row2, reportScore.getName(), " ", i == 0 ? new int[]{2,2}: null);
                         } else {
-                            fillRow(row1, row2, reportScore.getName(), reportScore.score == null ? "" : reportScore.score + (reportScore.totalScore > 0  ? "/" + reportScore.totalScore : ""), i == 0 ? new int[]{2,2}: null);
+                            String score = (reportScore.score == null ? "" : reportScore.score) + (reportScore.getTotalScore() > 0 ? "/" + reportScore.getTotalScore() : "");
+                            fillRow(row1, row2, reportScore.getName(), score, i == 0 ? new int[]{2,2}: null);
                         }
                     }
                     PdfUtil.Cell scoreNameCell = new PdfUtil.Cell();
@@ -280,7 +282,8 @@ public class PatientReportVo {
                             }
                         }
                         PdfUtil.Cell scoreScoreCell = new PdfUtil.Cell();
-                        scoreScoreCell.setContent(reportScore.score == null ? "" : reportScore.score + (reportScore.totalScore > 0  ? "/" + reportScore.totalScore : ""));
+                        String score = (reportScore.score == null ? "" : reportScore.score) + (reportScore.getTotalScore() > 0 ? "/" + reportScore.getTotalScore() : "");
+                        scoreScoreCell.setContent(score);
                         scoreScoreCell.setRowSpan(2);
                         row4.addCell(scoreScoreCell);
 //                        fillBlankCell(row5);