diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java index c2da7cd..b46815d 100644 --- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneCaseVerifController.java @@ -104,7 +104,7 @@ public class SubOneCaseVerifController { - @Operation(summary = "禁闭处理情况 & 停职处理情况") + @Operation(summary = "禁闭处理情况") @GetMapping("/getSubOneConfinementAndPause") public Result getSubOneConfinement(@RequestParam Integer departId, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java index fb5a897..5d6a2c2 100644 --- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java @@ -926,7 +926,7 @@ public class DatavServiceImpl implements DatavService { .toList(); //计算查实率(向上取整) Double verificationRate = 0.0; - if (!dataCaseVerifs.isEmpty()) { + if (!dataCaseVerifs.isEmpty() || !jbNegatvieList.isEmpty()) { double rawRate = (double) ssNegative.size() / (dataCaseVerifs.size() + jbNegatvieList.size()) * 100; verificationRate = Math.round(rawRate * 10) / 10.0; } @@ -989,7 +989,7 @@ public class DatavServiceImpl implements DatavService { .toList(); Double verificationRate = 0.0; - if (!dataCaseVerifs.isEmpty()) { + if (!dataCaseVerifs.isEmpty() || !jbNegatvieList.isEmpty()) { double rawRate = (double) ssNegative.size() / (dataCaseVerifs.size() + jbNegatvieList.size()) * 100; verificationRate = Math.round(rawRate * 10) / 10.0; } diff --git a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java index 75ab82f..9ff8537 100644 --- a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java @@ -767,7 +767,7 @@ public class SubDatavServiceImpl implements SubDatavService { .toList(); Double verificationRate = 0.0; - if (!dataCaseVerifs.isEmpty()) { + if (!dataCaseVerifs.isEmpty() || !jbNegatvieList.isEmpty()) { double rawRate = (double) ssNegative.size() / (dataCaseVerifs.size() + jbNegatvieList.size()) * 100; verificationRate = Math.round(rawRate * 10) / 10.0; }