Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -57,8 +57,12 @@ public interface SignPatientLabelInfoDao extends
     * @param status
     * @return
     */
    @Modifying
    int deleteByPatientAndLabelTypeAndStatus(String patient, String labelType, Integer status);
    @Modifying
    int deleteByLabel(String labelCode);
    /**
     * 更新某个标签名称
     *

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelService.java

@@ -125,6 +125,8 @@ public class SignPatientLabelService extends BaseService {
            return -2;
        }
        labelInfoDao.deleteByLabel(labelCode);
        SignPatientLabelLog log = new SignPatientLabelLog();
        log.setLabelCode(labelCode);