Merge remote-tracking branch 'origin/test' into test

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -17997,8 +17997,7 @@
         mbi.behospital_code behospitalCode,
         mhp.age,
         TIMESTAMPDIFF(year,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as ageYear,
-        TIMESTAMPDIFF(month,DATE_ADD(ifnull(mhp.birthday,mbi.birthday),INTERVAL TIMESTAMPDIFF(year,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) year),mbi.behospital_date) as ageMon,
-        TIMESTAMPDIFF(day,DATE_ADD(ifnull(mhp.birthday,mbi.birthday),INTERVAL TIMESTAMPDIFF(month,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) month),mbi.behospital_date) as ageDay
+        TIMESTAMPDIFF(day,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as ageDay
         FROM
         med_behospital_info mbi
         LEFT JOIN med_home_page mhp

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -236,6 +236,7 @@
         mbi.`name`,
         mbi.file_code fileCode,
         mbi.sex,
+        TIMESTAMPDIFF(day,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as birthday,
         mhp.age,
         mbi.beh_dept_name behDeptName,
         mbi.leave_hospital_date leaveHospitalDate,