Merge branch 'master' into his/common

# Conflicts:
#	src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

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

@@ -913,9 +913,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         // 病案首页
         //义乌数据回来还要处理
-    /*    if(analyzeVO.getHospitalId()==5 && ListUtil.isNotEmpty(recMap.get("病案首页"))){
-            addDataWithInnerKey("病案首页", recMap, medrecVoList);
-        }else {*/
+//        if(analyzeVO.getHospitalId()==5 && ListUtil.isNotEmpty(recMap.get("病案首页"))){
+//            addDataWithInnerKey("病案首页", recMap, medrecVoList);
+//        }else {
             if(homePage != null){
             addDataWithFirstPage("病案首页", homePage, medrecVoList, dicMap,
                     homePageList, homeOperationInfoList);
@@ -1865,7 +1865,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     List<ExportExcelWideBehospitalDTO> exportExcelWideBehospitalDTOs = new ArrayList<>();
                         excelBehospitalDTOS.forEach(exportExcelBehospitalDTO->{
                         ExportExcelWideBehospitalDTO exportExcelWideBehospitalDTO = new ExportExcelWideBehospitalDTO();
-                            exportExcelWideBehospitalDTO.setDoctorName(exportExcelBehospitalDTO.getDoctorName());
+                            exportExcelWideBehospitalDTO.setBehDoctorName(exportExcelBehospitalDTO.getBehDoctorName());
                             exportExcelWideBehospitalDTO.setBehospitalCode(exportExcelBehospitalDTO.getBehospitalCode());
                             exportExcelWideBehospitalDTO.setBehospitalDate(exportExcelBehospitalDTO.getBehospitalDate());
                             exportExcelWideBehospitalDTO.setLeaveHospitalDate(exportExcelBehospitalDTO.getLeaveHospitalDate());
@@ -1881,34 +1881,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return resWide;
     }
 
-    /**
-     * 个人质控结果导出
-     *
-     * @param response
-     * @param exportQcresultVO
-     */
-    public void exportQcresultByPerson(HttpServletResponse response, ExportQcresultVO exportQcresultVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        exportQcresultVO.setHospitalId(hospitalId);
-        exportQcresultVO.setUserId(Long.valueOf(userId));
-        //时间设置
-        exportQcresultVOSet(exportQcresultVO);
-        List<ExportExcelDTO> res = this.exportQcresultByPerson(exportQcresultVO);
-        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
-        if("2".equals(exportQcresultVO.getRadioCheck())){
-            resWide = transList(res, resWide);
-        }
-        String fileName = "抽查住院病历质量情况.xls";
-        response.setContentType("text/html;charset=UTF-8");
-        if("1".equals(exportQcresultVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(res, null, "sheet1", ExportExcelDTO.class, fileName, response);
-        }
-        if("2".equals(exportQcresultVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
-        }
-    }
-
     /**
      * 科室质控结果导出
      *
@@ -1967,7 +1939,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     private void exportQcresultVOSet(ExportQcresultVO exportQcresultVO) {
         //入参验证
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
+        long interval_90 = 90l * 24 * 60 * 60 * 1000;
         //入院时间
         if (null != exportQcresultVO && null != exportQcresultVO.getBehosDateStart() && null != exportQcresultVO.getBehosDateEnd()) {
             Date startDate = exportQcresultVO.getBehosDateStart();

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

@@ -22,6 +22,6 @@ public class AnalyzeRunVO {
     private Long modeId;
     // 归档字段
     private String isPlacefile = "0";
-
-    private Integer NeedGroup = 0;
+    //默认分组
+    private Integer NeedGroup = 1;
 }