改善率统计

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -29,7 +29,6 @@ import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.QcResultShortPageVO;
 import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -789,6 +788,7 @@ public class ConsoleFacade {
     public Map<String, Object> homePageMRCount(FilterVO filterVO) {
         Map<String, Object> retMap = new HashMap<>();
         retMap.put("合格率", null);
+        retMap.put("不合格率", null);
         retMap.put("完整率", null);
         retMap.put("改善率", null);
         filterFacade.filterVOSet(filterVO);
@@ -796,14 +796,42 @@ public class ConsoleFacade {
         HomePageNumDTO emptyNumDTO = behospitalInfoFacade.hmEmptyEntryPercent(filterVO);
         HomePageImproveDTO improveDTO = behospitalInfoFacade.homePageImproveCount(filterVO);
 
-        /*qcNumDTO.setEntryTotleNum(emptyNumDTO.getEntryTotleNum());
-        qcNumDTO.setEmptyNum(emptyNumDTO.getEmptyNum());
-        qcNumDTO.setEmptyPercent(emptyNumDTO.getEmptyPercent());
-        qcNumDTO.setEmptyPercentStr(emptyNumDTO.getEmptyPercentStr());*/
-
-        retMap.put("合格率", qcNumDTO);
-        retMap.put("完整率", emptyNumDTO);
-        retMap.put("改善率", improveDTO);
+        //合格率
+        NumDTO pass = new NumDTO();
+        pass.setName("合格率");
+        pass.setNum(qcNumDTO.getFirstLevelNum());
+        pass.setTotleNum(qcNumDTO.getMrNum());
+        pass.setPercent(qcNumDTO.getFirstLevelPercent());
+        pass.setPercentStr(qcNumDTO.getFirstLevelPercentStr());
+
+        //不合格率
+        NumDTO unPass = new NumDTO();
+        unPass.setName("不合格率");
+        unPass.setNum(qcNumDTO.getSecondLevelNum());
+        unPass.setTotleNum(qcNumDTO.getMrNum());
+        unPass.setPercent(qcNumDTO.getSecondLevelPercent());
+        unPass.setPercentStr(qcNumDTO.getSecondLevelPercentStr());
+
+        //完整率
+        NumDTO full = new NumDTO();
+        full.setName("完整率");
+        full.setNum(emptyNumDTO.getEmptyNum());
+        full.setTotleNum(emptyNumDTO.getEntryTotleNum());
+        full.setPercent(emptyNumDTO.getEmptyPercent());
+        full.setPercentStr(emptyNumDTO.getEmptyPercentStr());
+
+        //改善率
+        NumDTO improve = new NumDTO();
+        improve.setName("改善率");
+        improve.setNum(improveDTO.getImproveNum());
+        improve.setTotleNum(improveDTO.getMrNum());
+        improve.setPercent(improveDTO.getImprovePercent());
+        improve.setPercentStr(improveDTO.getImprovePercentStr());
+
+        retMap.put("合格率", pass);
+        retMap.put("不合格率", unPass);
+        retMap.put("完整率", full);
+        retMap.put("改善率", improve);
         return retMap;
     }