Browse Source

报告单无分数显示空,而不是0

sd
zhizhi wu 5 years ago
parent
commit
952be0abdb
  1. 2
      ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java
  2. 4
      ht/src/main/java/com/ccsens/ht/service/PatientReportService.java
  3. 2
      tall/src/main/resources/application-dev.yml
  4. 4
      tall/src/main/resources/application.yml

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

@ -315,7 +315,7 @@ public class PatientReportVo {
scoreNameCell.setBorderRight(1); scoreNameCell.setBorderRight(1);
row1.addCell(scoreNameCell); row1.addCell(scoreNameCell);
PdfUtil.Cell scoreCell = new PdfUtil.Cell(); PdfUtil.Cell scoreCell = new PdfUtil.Cell();
scoreCell.setContent(this.score == null ? "" : this.score + (this.totalScore > 0 ? "/" + this.totalScore : "")); scoreCell.setContent((this.score == null ? "" : this.score) + (this.totalScore > 0 ? "/" + this.totalScore : ""));
scoreCell.setRowSpan(4); scoreCell.setRowSpan(4);
scoreCell.setBorderRight(1); scoreCell.setBorderRight(1);
row2.addCell(scoreCell); row2.addCell(scoreCell);

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

@ -337,7 +337,7 @@ public class PatientReportService implements IPatientReportService {
return score.getScore() == null ? null : 0; return score.getScore() == null ? null : 0;
} }
if (Constant.Ht.Report.MOCA_SJZ.equals(score.getCode())) { if (Constant.Ht.Report.MOCA_SJZ.equals(score.getCode())) {
return 0; return null;
} }
return score.getScore(); return score.getScore();
@ -346,7 +346,7 @@ public class PatientReportService implements IPatientReportService {
score.setScore(sum.get()); score.setScore(sum.get());
} }
return sum.get(); return hasAdd.get() ? sum.get() : null;
} }
@Override @Override

2
tall/src/main/resources/application-dev.yml

@ -11,7 +11,7 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
host: 49.233.89.188 host: 192.168.0.99
password: 111111 password: 111111
port: 5672 port: 5672
username: admin username: admin

4
tall/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: prod active: dev
include: util-prod,common include: util-dev,common
Loading…
Cancel
Save