# Conflicts:
#	family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientSignServiceImpl.java

(cherry picked from commit 173e67a9)

(cherry picked from commit 01411f02)