merge from remote
the properties file should be UTF-8
1.分离医生DAO
2.医生如果在上周已填数据，则在本周不能进行删除