diff --git a/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java b/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java index 6b48c5f1..7fbb9206 100644 --- a/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java +++ b/ht/src/main/java/com/ccsens/ht/bean/vo/PatientReportVo.java @@ -315,7 +315,7 @@ public class PatientReportVo { scoreNameCell.setBorderRight(1); row1.addCell(scoreNameCell); 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.setBorderRight(1); row2.addCell(scoreCell); diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index f60c69ee..4351043a 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/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; } if (Constant.Ht.Report.MOCA_SJZ.equals(score.getCode())) { - return 0; + return null; } return score.getScore(); @@ -346,7 +346,7 @@ public class PatientReportService implements IPatientReportService { score.setScore(sum.get()); } - return sum.get(); + return hasAdd.get() ? sum.get() : null; } @Override diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index 97cb23b2..488106b8 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -11,7 +11,7 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: 49.233.89.188 + host: 192.168.0.99 password: 111111 port: 5672 username: admin diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index af245946..1d881c2f 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: util-prod,common \ No newline at end of file + active: dev + include: util-dev,common \ No newline at end of file