Merge branch 'dev' of lyr/patient-co-management into dev

src/main/java/com/yihu/wlyy/repository/doctor/SignPatientLabelDao.java

@@ -52,7 +52,6 @@ public interface SignPatientLabelDao extends
    @Query("select a from SignPatientLabel a where a.status = 1 and (a.isSystem = 1  or a.teamCode = ?1) and a.labelType = 4")
    List<SignPatientLabel> findCustomLabels(long teamCode);
    @Query("select a from SignPatientLabel a where a.status = 1 and a.labelName = ?1 and a.labeType = ?2 and a.teamCode = ?3")
    @Query("select a from SignPatientLabel a where a.status = 1 and a.labelName = ?1 and a.labelType = ?2 and a.teamCode = ?3")
    SignPatientLabel findByLabelNameAndLabelTypeAndTeamCode(String labelName,String labelType,Long teamCode);
}