Merge remote-tracking branch 'origin/master'

# Conflicts:
#	smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java