Merge remote-tracking branch 'origin/his/zjHospital' into his/zjHospital

# Conflicts:
#	src/main/java/com/diagbot/facade/BillFacade.java
#	src/main/java/com/diagbot/facade/CommonFacade.java
#	src/main/java/com/diagbot/process/OtherTipProcess.java
#	src/main/java/com/diagbot/util/CoreUtil.java
#	src/main/resources/application-local.yml