.....
Merge branch 'master' of https://github.com/10555019/CareMRS.git
Merge branch 'master' of https://github.com/10555019/CareMRS.git
add some data method
Merge branch 'master' of https://github.com/10555019/CareMRS.git
some minner method typed