Merge branch 'dev/20201224_2.0.0' into test

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -13632,9 +13632,8 @@
         be.leaveHospitalDate,
         be.lastBehDeptId,
         be.lastBehDeptName,
+        be.lastDoctorId,
         be.lastDoctorName,
-        be.lastBoctorId,
-        be.lastBoctorName,
         be.lastBehospitalCode,
         be.lastBehospitalDate,
         be.lastLeaveHospitalDate,