|
|
@@ -46,6 +46,7 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -1583,6 +1584,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
.select("behospital_code", "level", "score_res"));
|
|
|
BigDecimal bigDecimal = new BigDecimal(0);
|
|
|
BigDecimal res = new BigDecimal(120);
|
|
|
+ BigDecimal resPr = new BigDecimal(100);
|
|
|
String reNum = "0";
|
|
|
SysHospitalSet sysHospitalSet
|
|
|
= sysHospitalSetFacade.getOne(new QueryWrapper<SysHospitalSet>()
|
|
|
@@ -1598,9 +1600,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
analyzeRunDTO.setLevel(qcresultInfo.getLevel()==null?"":qcresultInfo.getLevel());
|
|
|
analyzeRunDTO.setScoreRes(qcresultInfo.getScoreRes() ==null ? bigDecimal : qcresultInfo.getScoreRes());
|
|
|
if("1".equals(reNum)) {
|
|
|
- bigDecimal = res.subtract(analyzeRunDTO.getScoreRes());
|
|
|
- }else{
|
|
|
- bigDecimal = res.subtract(analyzeRunDTO.getScoreRes().multiply(new BigDecimal(1.2)));
|
|
|
+ bigDecimal = resPr.subtract(analyzeRunDTO.getScoreRes());
|
|
|
+ }else if("0".equals(reNum)){
|
|
|
+ bigDecimal = res.subtract(analyzeRunDTO.getScoreRes().multiply(new BigDecimal(120))
|
|
|
+ .divide(new BigDecimal(100), 1, RoundingMode.HALF_UP));
|
|
|
}
|
|
|
//缺陷总数
|
|
|
Long num = msgDTOList
|
chengyao