修改提交病例信息

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<PatientDto.Condition> conditionList, List<PatientDto.ConditionDate> conditionListDate, Long aLong, Long id);
-=======
     /**
      * 统计病例完成情况
      * @param hospitalId 医院id
@@ -48,5 +46,4 @@ public interface PatientDao {
      * @return 返回完成情况按医生分组
      */
     List<StatisticVo.CompleteDoctor> completeDoctor(@Param("hospitalId")Long hospitalId);
->>>>>>> 56dd44ed6563a7cf642ed1ee775eca6980ebe8ca
 }