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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/SignPatientLabelDao.java

@@ -33,7 +33,7 @@ public interface SignPatientLabelDao extends
     * @param status
     * @return
     */
    @Query("select a from SignPatientLabel a where a.labelType = ?1 and a.status = ?2 ORDER BY a.sort ASC ")
    @Query("select a from SignPatientLabel a where a.labelType = ?1 and a.status = ?2 and a.labelCode !=0 ORDER BY a.sort ASC ")
    List<SignPatientLabel> findByLabelTypeAndStatus(String labelType,Integer status);
    /**