湘雅同步数据

src/main/java/com/diagbot/MrqcSysApplication.java

@@ -21,7 +21,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @time: 2018/8/7 9:26
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class, DruidDataSourceAutoConfigure.class })
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrixDashboard
 @EnableHystrix

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

@@ -133,6 +133,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/resultStatistics").permitAll()
                 .antMatchers("/console/resultStatisticsByDeptPage").permitAll()
                 .antMatchers("/console/homePageMRCount").permitAll()
+                .antMatchers("/console/mrCountForHis").permitAll()
+                .antMatchers("/console/homePageMRCountForHis").permitAll()
                 .antMatchers("/console/qcCheckStatistics").permitAll()
                 .antMatchers("/console/unModifyMRStatistics").permitAll()
                 .antMatchers("/console/unModifyMRPage").permitAll()

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

@@ -177,6 +177,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/levelStatistics", request)
                 || matchers("/console/levelStatisticsByDeptClass", request)
                 || matchers("/console/mrCount", request)
+                || matchers("/console/mrCountForHis", request)
+                || matchers("/console/homePageMRCountForHis", request)
                 || matchers("/console/mrStatistics", request)
                 || matchers("/console/medicalRecordIndicator", request)
                 || matchers("/console/codingMonthly", request)

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

@@ -1284,6 +1284,21 @@ public class ConsoleFacade {
         return retMap;
     }
 
+    /**
+     * 质控病历统计
+     *
+     * @param filterVO
+     * @return
+     */
+    public Map<String, Object> mrCountForHis(FilterVO filterVO) {
+        Map<String, Object> retMap = new HashMap<>();
+        filterFacade.filterVOSetForHis(filterVO);
+        List<NumDTO> mrCountList = mrStatisticsAggregate.mrCount(filterVO);
+        if (ListUtil.isNotEmpty(mrCountList)) {
+            retMap.put("病历数统计", mrCountList);
+        }
+        return retMap;
+    }
     /**
      * 各模块缺陷占比排行
      *
@@ -2656,6 +2671,30 @@ public class ConsoleFacade {
         return retMap;
     }
 
+    /**
+     * 病案首页合格率、完整率、改善率统计
+     *
+     * @param filterVO
+     * @return
+     */
+    public Map<String, Object> homePageMRCountForHis(FilterVO filterVO) {
+        Map<String, Object> retMap = new HashMap<>();
+        retMap.put("合格率", null);
+        retMap.put("不合格率", null);
+        retMap.put("完整率", null);
+        retMap.put("改善率", null);
+        filterFacade.filterVOSetForHis(filterVO);
+        try {
+            Map<String, Object> invokeParams = new HashMap<>();
+            invokeParams.put("filterVO", filterVO);
+            retMap
+                    = dataBeanAggregateQueryFacade.get("setAllHomePage", invokeParams, Map.class);
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
+        }
+        return retMap;
+    }
+
     /**
      * 离院病人质控评分详情页
      *

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

@@ -185,6 +185,39 @@ public class FilterFacade {
      * @param filterVO
      */
     public void filterVOSet(FilterVO filterVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+//        String hospitalId ="35";
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
+        }
+        if (StringUtil.isBlank(filterVO.getStartDate())) {
+            String startDate = getStartDateStr(filterVO.getType(), null);
+            filterVO.setStartDate(startDate);
+        }
+        if (StringUtil.isBlank(filterVO.getEndDate())) {
+            String endDate = getEndDateStr(filterVO.getType(), null);
+            filterVO.setEndDate(endDate);
+        } /*else {
+            try {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = dateFormat.parse(filterVO.getEndDate());
+                long interval = date.getTime() + 1000;
+                filterVO.setEndDate(dateFormat.format(new Date(Long.valueOf(interval))));
+            } catch (ParseException e) {
+
+            }
+        }*/
+    }
+
+    /**
+     * 入参拼接
+     *
+     * @param filterVO
+     */
+    public void filterVOSetForHis(FilterVO filterVO) {
 //        String hospitalId = SysUserUtils.getCurrentHospitalID();
 //        String userId = SysUserUtils.getCurrentPrincipleID();
         String hospitalId ="35";

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

@@ -278,7 +278,7 @@ public class ViewFacade {
      */
     public RespDTO<Map<String, Object>> getHomePageByView(XyHomePageVo xyHomePageVo) {
         //保存入参
-        aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页入参", xyHomePageVo.getHomePageId(), xyHomePageVo.getBehospitalCode(), JSON.toJSONString(xyHomePageVo), "");
+       // aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页入参", xyHomePageVo.getHomePageId(), xyHomePageVo.getBehospitalCode(), JSON.toJSONString(xyHomePageVo), "");
         Long modeId = Long.valueOf("6");//病案首页默认为6
         String behospitalCode = xyHomePageVo.getBehospitalCode() + "_" + xyHomePageVo.getFileCode();
         //从视图拉取数据
@@ -319,7 +319,7 @@ public class ViewFacade {
         try {
             deptInfos = tzDBConn.getDeptInfo(sql);
             aBasDeptInfoFacade.execute(deptInfos);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取科室信息正常", "", sql, JSON.toJSONString(deptInfos), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取科室信息正常", "", sql, JSON.toJSONString(deptInfos), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取科室信息错误", "", sql, JSON.toJSONString(deptInfos), e.getMessage());
         }
@@ -335,7 +335,7 @@ public class ViewFacade {
         try {
             homeDiagnoseInfos = tzDBConn.getHomeDiagnose(sql);
             aHomeDiagnoseInfoFacade.execute(homeDiagnoseInfos);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取出院诊断信息正常", "", sql, JSON.toJSONString(homeDiagnoseInfos), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取出院诊断信息正常", "", sql, JSON.toJSONString(homeDiagnoseInfos), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取出院诊断信息错误", "", sql, JSON.toJSONString(homeDiagnoseInfos), e.getMessage());
         }
@@ -351,7 +351,7 @@ public class ViewFacade {
         try {
             homeOperation = tzDBConn.getHomeOperation(sql);
             aHomeOperationInfoFacade.execute(homeOperation);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取病案首页手术信息正常", "", sql, JSON.toJSONString(homeOperation), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取病案首页手术信息正常", "", sql, JSON.toJSONString(homeOperation), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取病案首页手术信息错误", "", sql, JSON.toJSONString(homeOperation), e.getMessage());
         }
@@ -367,9 +367,9 @@ public class ViewFacade {
         try {
             homePage = tzDBConn.getHomePage(sql);
             aHomePageFacade.execute(homePage);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取病案首页手术信息正常", "", sql, JSON.toJSONString(homePage), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取病案首页手术信息正常", "", sql, JSON.toJSONString(homePage), "");
         } catch (Exception e) {
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取病案首页手术信息错误", "", sql, JSON.toJSONString(homePage), e.getMessage());
+            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取病案首页信息错误", "", sql, JSON.toJSONString(homePage), e.getMessage());
         }
     }
 
@@ -383,7 +383,7 @@ public class ViewFacade {
         try {
             doctorAdvice = tzDBConn.getDoctorAdvice(sql);
             aDoctorAdviceFacade.execute(doctorAdvice);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取医嘱信息正常", "", sql, JSON.toJSONString(doctorAdvice), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取医嘱信息正常", "", sql, JSON.toJSONString(doctorAdvice), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取医嘱信息错误", "", sql, JSON.toJSONString(doctorAdvice), e.getMessage());
         }
@@ -404,7 +404,7 @@ public class ViewFacade {
                     this.getLisResult(lis.getRepNo());
                 });
             }
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取化验信息正常", "", sql, JSON.toJSONString(lisInfos), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取化验信息正常", "", sql, JSON.toJSONString(lisInfos), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取化验信息错误", "", sql, JSON.toJSONString(lisInfos), e.getMessage());
         }
@@ -422,7 +422,7 @@ public class ViewFacade {
         try {
             lisResults = tzDBConn.getLisResult(sql);
             aMedLisResultFacade.execute(lisResults);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取化验结果信息正常", "", sql, JSON.toJSONString(lisResults), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取化验结果信息正常", "", sql, JSON.toJSONString(lisResults), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取化验结果信息错误", "", sql, JSON.toJSONString(lisResults), e.getMessage());
         }
@@ -443,7 +443,7 @@ public class ViewFacade {
                     this.getPacsResult(pacs.getRepNo());
                 });
             }
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取检查信息正常", "", sql, JSON.toJSONString(pacsInfos), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取检查信息正常", "", sql, JSON.toJSONString(pacsInfos), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取检查信息错误", "", sql, JSON.toJSONString(pacsInfos), e.getMessage());
         }
@@ -460,7 +460,7 @@ public class ViewFacade {
         try {
             pacsResults = tzDBConn.getPacsResult(sql);
             aMedPacsResultFacade.execute(pacsResults);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取检查结果信息正常", "", sql, JSON.toJSONString(pacsResults), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取检查结果信息正常", "", sql, JSON.toJSONString(pacsResults), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取检查结果信息错误", "", sql, JSON.toJSONString(pacsResults), e.getMessage());
         }
@@ -476,7 +476,7 @@ public class ViewFacade {
         try {
             behospitalInfoList = tzDBConn.getBehospitalInfo(sql);
             aBehospitalInfoFacade.execute(behospitalInfoList);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取入院登记信息正常", "", sql, JSON.toJSONString(behospitalInfoList), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取入院登记信息正常", "", sql, JSON.toJSONString(behospitalInfoList), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取入院登记信息错误", "", sql, JSON.toJSONString(behospitalInfoList), e.getMessage());
         }
@@ -503,7 +503,7 @@ public class ViewFacade {
                 });
             }
             aMedicalRecordFacade.execute(medicalRecordList);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取文书信息正常", "", sql, JSON.toJSONString(medicalRecordList), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取文书信息正常", "", sql, JSON.toJSONString(medicalRecordList), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从试图拉取文书信息错误", "", sql, JSON.toJSONString(medicalRecordList), e.getMessage());
         }
@@ -536,7 +536,7 @@ public class ViewFacade {
 
             aMedicalRecordContentFacade.execute(medicalRecordContentList);
 
-            aMedAbnormalInfoFacade.saveAbnormalInfo("从webService获取文书详情信息正常", "", recId, JSON.toJSONString(medicalRecordContentList), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("从webService获取文书详情信息正常", "", recId, JSON.toJSONString(medicalRecordContentList), "");
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("从webService获取文书详情信息错误", "", recId, JSON.toJSONString(medicalRecordContentList), e.getMessage());
         }

src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -91,11 +91,11 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 });
 
                 execute(behospitalInfoList);
-                if(true){
-                    behospitalInfoList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记入参",s.getBehospitalCode(), JSON.toJSONString(s),"","");
-                    });
-                }
+//                if(true){
+//                    behospitalInfoList.forEach(s->{
+//                        aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记入参",s.getBehospitalCode(), JSON.toJSONString(s),"","");
+//                    });
+//                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
@@ -217,7 +217,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 updateWrapper.set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new BehospitalInfo(),updateWrapper);
-                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除成功",JSON.toJSONString(aDeleteFlagVO),"",flag.toString(),"");
+//                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除成功",JSON.toJSONString(aDeleteFlagVO),"",flag.toString(),"");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
@@ -243,7 +243,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new BehospitalInfo(),updateWrapper);
-                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-归档成功",aPlaceFileVO.getBehospitalCode(),JSON.toJSONString(aPlaceFileVO),flag.toString(),"");
+//                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-归档成功",aPlaceFileVO.getBehospitalCode(),JSON.toJSONString(aPlaceFileVO),flag.toString(),"");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
@@ -274,7 +274,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new BehospitalInfo(),updateWrapper);
-                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-出院成功",aBehospitalInfoVO.getBehospitalCode(),JSON.toJSONString(aBehospitalInfoVO),flag.toString(),"");
+//                aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-出院成功",aBehospitalInfoVO.getBehospitalCode(),JSON.toJSONString(aBehospitalInfoVO),flag.toString(),"");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -259,18 +259,23 @@ public class AHomePageFacade extends HomePageServiceImpl{
                         String behospitalDoctorID=this.getDoctorId(behospitalDoctor);//获取住院医师id
                         String attendingDoctorID=this.getDoctorId(attendingDoctor);//获取主治医师id
                         String directorDoctorID=this.getDoctorId(directorDoctor);//获取主任医师id
-
                         UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
-                        updateWrapper.eq("behospital_code",s.getBehospitalCode())
-                                .eq("hospital_id", homePage.getHospitalId())
-                                .eq("is_deleted",IsDeleteEnum.N)
-                                .set("beh_doctor_name",behospitalDoctor)
-                                .set("doctor_name",attendingDoctor)
-                                .set("director_doctor_name",directorDoctor)
-                                .set("beh_doctor_id",behospitalDoctorID)
-                                .set("doctor_id",attendingDoctorID)
-                                .set("director_doctor_id",directorDoctorID);
-                        behospitalInfoFacade.update(updateWrapper);
+
+                        BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
+                                .eq("behospital_code", s.getBehospitalCode())
+                                .eq("hospital_id", s.getHospitalId()), false);
+                        if (behospitalInfo != null){
+                            updateWrapper.eq("behospital_code",s.getBehospitalCode())
+                                    .eq("hospital_id", homePage.getHospitalId())
+                                    .eq("is_deleted",IsDeleteEnum.N)
+                                    .set("beh_doctor_name",behospitalDoctor)
+                                    .set("doctor_name",attendingDoctor)
+                                    .set("director_doctor_name",directorDoctor)
+                                    .set("beh_doctor_id",behospitalDoctorID)
+                                    .set("doctor_id",attendingDoctorID)
+                                    .set("director_doctor_id",directorDoctorID);
+                            behospitalInfoFacade.update(updateWrapper);
+                        }
                     }catch (Exception e){
                         aMedAbnormalInfoFacade.saveAbnormalInfo("反查医师id出错","", JSON.toJSONString(homePageList),"",e.getMessage());
                     }

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -263,7 +263,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     public Map<String,String> executeMrRecordIng(AMrContentVO aMrContentVO) {
         Map<String,String> respDto=new HashMap<>();
         if (aMrContentVO.getRecords() != null && aMrContentVO.getRecords().size() > 0) {
-            AMrContentDTO aMrContentDTO = new AMrContentDTO();
+//            AMrContentDTO aMrContentDTO = new AMrContentDTO();
             //循环验证数据有效性
             for (AMedicalRecordVO aMedicalRecordVO : aMrContentVO.getRecords()) {
                 if ("".equals(aMedicalRecordVO.getRecId())) {
@@ -313,7 +313,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 respDto.put("ret","0");respDto.put("mag","true");
             }
 
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息入參", behospitalCode, JSON.toJSONString(aMrContentVO), JSON.toJSONString(respDto), "");
+//            aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息入參", behospitalCode, JSON.toJSONString(aMrContentVO), JSON.toJSONString(respDto), "");
             //异步调用评分接口
             ExecutorService executorService = Executors.newCachedThreadPool();
             executorService.execute(() -> {
@@ -416,11 +416,12 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     Long modeId = initModeId(s);
                     if (modeId == Long.valueOf("0")) {
                         //未匹配到模板的进行记录，后续可跟进
-                        ModelHospital modelHospital = new ModelHospital();
-                        modelHospital.setHospitalId(s.getHospitalId());
-                        modelHospital.setHospitalModelName(s.getRecTitle());
-                        modelHospital.setRemark(s.getRecTypeId());
-                        modelHospitalList.add(modelHospital);
+//                        ModelHospital modelHospital = new ModelHospital();
+//                        modelHospital.setHospitalId(s.getHospitalId());
+//                        modelHospital.setHospitalModelName(s.getRecTitle());
+//                        modelHospital.setRemark(s.getRecTypeId());
+//                        modelHospitalFacade.save(modelHospital);
+//                        modelHospitalList.add(modelHospital);
                     } else if (modeId == Long.valueOf("1")) {
                         //入院记录保存时，同步调整住院病人的质控类型，即qc_type_id
                         BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
@@ -462,10 +463,15 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     if (mRecord != null) {
                         s.setGmtModified(new Date());
                         s.setIsDeleted(IsDeleteEnum.N.getKey());
+//                        this.update(new UpdateWrapper<MedicalRecord>()
+//                                .eq("rec_id", s.getRecId())
+//                                .eq("hospital_id", s.getHospitalId())
+//                                .eq("behospital_code", s.getBehospitalCode()));
                         updateE.add(s);
                     } else {
                         s.setGmtCreate(new Date());
-                        addE.add(s);
+                        this.save(s);
+//                        addE.add(s);
                     }
                 });
             }

src/main/java/com/diagbot/task/ViewTask.java

@@ -59,12 +59,12 @@ public class ViewTask implements SchedulingConfigurer{
                 //2.1 从数据库获取执行周期
                 taskDate = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
                         .eq("cron_code", "ViewTASK"), false);
-                String cron = "0 0 23 * * ? ";
+                String cron = "0 0 21 * * ? ";
                 //2.2 合法性校验.
                 if (null != taskDate && StringUtil.isNotBlank(taskDate.getCron())) {
                     cron = taskDate.getCron();
                 }
-                CronTrigger trigger = new CronTrigger(cron);
+                    CronTrigger trigger = new CronTrigger(cron);
                 return trigger.nextExecutionTime(triggerContext);
             }
         });

src/main/java/com/diagbot/web/ConsoleController.java

@@ -206,6 +206,21 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.mrCount(filterVO));
     }
 
+    /**
+     * 质控病历统计
+     *
+     * @param filterVO
+     * @return
+     */
+    @ApiOperation(value = "质控病历统计[by:zhaops]",
+            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+    @PostMapping("/mrCountForHis")
+    @SysLogger("mrCountForHis")
+    public RespDTO<Map<String, Object>> mrCountForHis(@RequestBody @Valid FilterVO filterVO) {
+        return RespDTO.onSuc(consoleFacade.mrCountForHis(filterVO));
+    }
+
     /**
      * 各模块缺陷占比排行
      *
@@ -680,6 +695,17 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.homePageMRCount(filterVO));
     }
 
+    @ApiOperation(value = "病案首页病历统计[by:zhaops]",
+            notes = "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>" +
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+    @PostMapping("/homePageMRCountForHis")
+    @SysLogger("homePageMRCountForHis")
+    public RespDTO<Map<String, Object>> homePageMRCountForHis(@RequestBody @Valid FilterVO filterVO) {
+        return RespDTO.onSuc(consoleFacade.homePageMRCountForHis(filterVO));
+    }
+
+
     /**
      * 出院人数统计
      *

src/main/java/com/diagbot/web/DataController.java

@@ -123,6 +123,7 @@ public class DataController {
     @ApiOperation(value = "数据引擎-获取病人出院信息")
     @PostMapping("/sendLeaveInfo")
     @SysLogger("sendLeaveInfo")
+    @MrqcLog
     public RespDTO sendLeaveInfo(@RequestBody ABehospitalInfoVO aBehospitalInfoVO){
         return aBehospitalInfoFacade.sendLeaveInfo(aBehospitalInfoVO);
     }
@@ -146,8 +147,8 @@ public class DataController {
     @PostMapping("/sendHomePageIng")
     @SysLogger("sendHomePageIng")
     @MrqcLog
-    public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody AHomePageIngVO aHomePageIngVO) {
-        return aHomePageFacade.executeHomePageIng(aHomePageIngVO);
+    public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody XyHomePageVo xyHomePageVo) {
+        return viewFacade.getHomePageByView(xyHomePageVo);
     }
 
     @ApiOperation(value = "终末质控-获取病案首页")
@@ -326,7 +327,7 @@ public class DataController {
         viewFacade.executeOldData();
         return RespDTO.onSuc(true);
     }
-    }*/
+
 
     @ApiOperation(value = "his数据补录")
     @PostMapping("/dataSupplement")

src/main/resources/application-local.yml

@@ -68,7 +68,7 @@ spring:
       # 初始化大小，最小，最大
       initialSize: 5
       minIdle: 5
-      maxActive: 20
+      maxActive: 65
       # 配置获取连接等待超时的时间
       maxWait: 60000
       # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
@@ -117,9 +117,9 @@ spring:
           destination: mrqcLog
           group: mrqcLogReceiveGroup
 
-  #mq
+
   rabbitmq:
-    host: 192.168.2.236
+    host: 132.147.253.31
     port: 5672
     username: lantone
     password: lantone
@@ -206,7 +206,7 @@ initmodeid:
 
 #对接过程中是否记录正常流程的日志
 log_switch:
-  enable: true
+  enable: false
 
 mrqcLog:
   enable: true

src/main/resources/logback-spring.xml

@@ -34,7 +34,7 @@
             <fileNamePattern>${LOG_PATH}/${APPDIR}/error/${APPDIR}-error-%d{yyyy-MM-dd}.%i.log
             </fileNamePattern>
             <!--  保留日志天数 -->
-            <maxHistory>30</maxHistory>
+            <maxHistory>3</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-error-1992-11-06.0.log -->
             <timeBasedFileNamingAndTriggeringPolicy
@@ -73,7 +73,7 @@
             <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/${APPDIR}-warn-%d{yyyy-MM-dd}.%i.log
             </fileNamePattern>
             <!--  保留日志天数 -->
-            <maxHistory>15</maxHistory>
+            <maxHistory>3</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-warn-1992-11-06.0.log -->
             <timeBasedFileNamingAndTriggeringPolicy
@@ -112,7 +112,7 @@
             <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log
             </fileNamePattern>
             <!--  保留日志天数 -->
-            <maxHistory>15</maxHistory>
+            <maxHistory>3</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-info-1992-11-06.0.log -->
             <timeBasedFileNamingAndTriggeringPolicy
@@ -151,7 +151,7 @@
             <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log
             </fileNamePattern>
             <!--  保留日志天数 -->
-            <maxHistory>15</maxHistory>
+            <maxHistory>3</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-debug-1992-11-06.0.log -->
             <timeBasedFileNamingAndTriggeringPolicy
@@ -185,7 +185,7 @@
         </encoder>
         <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
+            <level>error</level>
         </filter>
     </appender>