Merge remote-tracking branch 'origin/debug' into test

# Conflicts:
#	src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -62,6 +62,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/behospitalInfo/page_person").permitAll()
                 .antMatchers("/qc/behospitalInfo/page_group").permitAll()
                 .antMatchers("/qc/casesEntryHospital/findQcCasesEntry").permitAll()
+                .antMatchers("/qc/dataimport/import").permitAll()
+                .antMatchers("/qc/dataimport/test").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportExcel").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresult").permitAll()
                 .antMatchers("/qc/behospitalInfo/exportQcresultByDept").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -106,6 +106,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/behospitalInfo/page_group", request)
                 || matchers("/qc/casesEntryHospital/findQcCasesEntry", request)
                 || matchers("/qc/behospitalInfo/exportExcel", request)
+                || matchers("/qc/dataimport/import", request)
+                || matchers("/qc/dataimport/test", request)
+                || matchers("/qc/behospitalInfo/exportExcel", request)
                 || matchers("/qc/behospitalInfo/exportQcresult", request)
                 || matchers("/qc/behospitalInfo/exportQcresultByDept", request)
                 || matchers("/qc/behospitalInfo/exportQcresultByGroup", request)

src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java

@@ -209,7 +209,41 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
      */
     @Override
     public IPage<EntryNumDTO> entryGroupByEntryInnerPage(@Param("filterPageVO") FilterPageVO filterPageVO) {
+       //基础数据
         IPage<EntryNumDTO> entryNumDTOIPage  = baseMapper.entryGroupByEntryInnerPage(filterPageVO);
+        String hospitalId = filterPageVO.getHospitalId();
+        //缺陷总数
+          Integer sumInteget = baseMapper.entryGroupByEntrySum(filterPageVO.getHospitalId(),filterPageVO.getIsPlacefile(),
+                                                                filterPageVO.getStartDate(),filterPageVO.getEndDate());
+        float nsum = 0;
+          Set<Long> ids = new HashSet<Long>();
+        List<EntryNumDTO> records = entryNumDTOIPage.getRecords();
+        if(CollectionUtils.isEmpty(records)){
+            return null;
+        }
+        for (EntryNumDTO record : records) {
+            ids.add(record.getId());
+            int num = record.getNum().intValue();
+            if(sumInteget!=null && sumInteget!=0 ){
+                int sum = sumInteget.intValue();
+                 nsum =(float) num/sum;
+            }
+            DecimalFormat df = new DecimalFormat("0.00");
+            String percent = df.format(nsum*100);
+            record.setPercentStr(percent+"%");
+            record.setTotleNum(sumInteget);
+        }
+        //缺陷分值
+        String isPlacefile = filterPageVO.getIsPlacefile();
+        List<EntryNumDTO> entryScore = new ArrayList<>();
+        entryScore = baseMapper.entryGroupByEntryScore(hospitalId,isPlacefile, ids);
+        for (EntryNumDTO record : records) {
+            for (EntryNumDTO entryNumDTO : entryScore) {
+                if(record.getId().equals(entryNumDTO.getId())){
+                 record.setScore(entryNumDTO.getScore());
+                    }
+                }
+            }
         return entryNumDTOIPage;
     }
 

src/main/java/com/diagbot/vo/FilterPageVO.java

@@ -71,4 +71,5 @@ public class FilterPageVO extends Page {
      * 是否归档（0：未归档，1：已归档）
      */
     private String isPlacefile = "1";
-}
+
+}

src/main/java/com/diagbot/vo/QcResultShortPageVO.java

@@ -112,7 +112,6 @@ public class QcResultShortPageVO extends Page {
      * 首页核查截止时间
      */
     private Date mrTimeEnd;
-
     /**
      * 是否归档（0：未归档，1：已归档）
      */