瀏覽代碼

Merge branch 'master' of https://172.16.32.165/lighter/web-server

xiaochan 2 年之前
父節點
當前提交
f41169e71e

+ 0 - 4
src/main/java/thyyxxk/webserver/entity/outpatient/interactive/comments/response/WechatPatientComment.java

@@ -1,8 +1,6 @@
 package thyyxxk.webserver.entity.outpatient.interactive.comments.response;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -16,8 +14,6 @@ public class WechatPatientComment {
   private String patientId;
   private Integer times;
   private String patientName;
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  @JsonFormat(pattern = "yyyy-MM-dd")
   private Date commentTime;
   private Integer commentLevel;
   private String commentContent;

+ 3 - 0
src/main/java/thyyxxk/webserver/service/outpatient/interactive/clinicsatisfied/ClinicSatisfiedService.java

@@ -322,6 +322,9 @@ public class ClinicSatisfiedService {
     }
 
     private String makePercentage(int a, int b) {
+        if (a == 0 || b == 0) {
+            return "0.00%";
+        }
         BigDecimal aDecimal = new BigDecimal(a);
         BigDecimal bDecimal = new BigDecimal(b);
         BigDecimal percentage = aDecimal.multiply(new BigDecimal(100))