From e79f8fec3f811a007adbf267f80c4eb812cba1c9 Mon Sep 17 00:00:00 2001 From: wang1007152140 <1007152140@qq.com> Date: Thu, 4 Feb 2021 10:14:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E7=97=85?= =?UTF-8?q?=E4=BE=8B=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java index 397c8d48..4f6a7371 100644 --- a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java +++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java @@ -24,10 +24,8 @@ public interface PatientDao { Integer countCase(@Param("param") StatisticDto.SelCount param,@Param("inputStatus") byte inputStatus); -<<<<<<< HEAD StatisticVo.SelGroupList countAnalysis(List conditionList, List conditionListDate, Long aLong, Long id); -======= /** * 统计病例完成情况 * @param hospitalId 医院id @@ -48,5 +46,4 @@ public interface PatientDao { * @return 返回完成情况按医生分组 */ List completeDoctor(@Param("hospitalId")Long hospitalId); ->>>>>>> 56dd44ed6563a7cf642ed1ee775eca6980ebe8ca }