diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 3f4ea8c09..7015ae71c 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -258,14 +258,14 @@ class HrAttendance(models.Model):
             [('role_id.name', '=', '保安部'), ('template_id.planning_name', '=', '白班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_in_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     def ba_card_white_down(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '保安部'), ('template_id.planning_name', '=', '白班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_out_comment(user.resource_id.employee_id)
+                self.card_out_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
         # 保安部 - 中班
     # 保安部 - 中班
@@ -274,14 +274,14 @@ class HrAttendance(models.Model):
             [('role_id.name', '=', '保安部'), ('template_id.planning_name', '=', '中班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_in_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     def ba_card_mid_down(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '保安部'), ('template_id.planning_name', '=', '中班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_out_comment(user.resource_id.employee_id)
+                self.card_out_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     # 保安部 - 夜班
     def ba_card_night_up(self):
@@ -289,14 +289,14 @@ class HrAttendance(models.Model):
             [('role_id.name', '=', '保安部'), ('template_id.planning_name', '=', '夜班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_in_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     def ba_card_night_down(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '保安部'), ('template_id.planning_name', '=', '夜班')])
         for user in ba_up_users:
             if user.end_datetime.date() == fields.date.today():
-                self.card_out_comment(user.resource_id.employee_id)
+                self.card_out_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     # 工程部 - 白班 白值
     def gc_white_in_remind(self):
@@ -304,20 +304,20 @@ class HrAttendance(models.Model):
             [('role_id.name', '=', '工程部'), ('template_id.planning_name', 'in', ['白班', '白班中午值班'])])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_in_comment(user.resource_id,user.template_id.planning_name)
 
     def gc_white_shift_remind(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '白班中午值班')])
         for user in ba_up_users:
-            self.card_in_comment(user.resource_id.employee_id)
+            self.card_duty_remind(user.resource_id.employee_id)
 
     def gc_white_out_remind(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '工程部'), ('template_id.planning_name', 'in', ['白班', '白班中午值班'])])
         for user in ba_up_users:
             if user.end_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_out_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     # 工程部-中值夜
     def gc_night_remind_in(self):
@@ -325,20 +325,20 @@ class HrAttendance(models.Model):
             [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '中值夜班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_in_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     def gc_night_remind_shift(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '中值夜班')])
         for user in ba_up_users:
-            self.card_in_comment(user.resource_id.employee_id)
+            self.card_duty_remind(user.resource_id.employee_id)
 
     def gc_night_remind_out(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '工程部'), ('template_id.planning_name', '=', '中值夜班')])
         for user in ba_up_users:
             if user.end_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_out_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     # 粮储-白班
     def card_lc_remind_in(self):
@@ -346,14 +346,14 @@ class HrAttendance(models.Model):
             [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_in_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     def card_lc_remind_out(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白班')])
         for user in ba_up_users:
             if user.end_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_out_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     # 粮储-值班
     def card_lc_shift_remind_in(self):
@@ -361,30 +361,34 @@ class HrAttendance(models.Model):
             [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '值班')])
         for user in ba_up_users:
             if user.start_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_in_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
     def card_lc_shift_remind(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '值班')])
         for user in ba_up_users:
-            self.card_in_comment(user.resource_id.employee_id)
+            self.card_duty_remind(user.resource_id.employee_id)
 
     def card_lc_shift_remind_out(self):
         ba_up_users = self.env['planning.slot'].search(
             [('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '值班')])
         for user in ba_up_users:
             if user.end_datetime.date() == fields.date.today():
-                self.card_in_comment(user.resource_id.employee_id)
+                self.card_out_comment(user.resource_id.employee_id,user.template_id.planning_name)
 
-    def card_in_comment(self, employee_id):
-        data = "您还有10分钟上班，记得打卡"
+    def card_in_comment(self, employee_id, planning_name):
+        data = f"您还有10分钟上班，记得打卡 班次--{planning_name}"
         self.sudo().env["wecom.apps"].sync_send_message(category='att', user_id='18562027762', message=data)
         self.sudo().env["wecom.apps"].sync_send_message(category='att', user_id=employee_id.wecom_userid, message=data)
 
-    def card_out_comment(self, employee_id):
-        data = "下班时间到了，记得打卡"
+    def card_out_comment(self, employee_id,planning_name):
+        data = f"下班时间到了，记得打卡 班次-{planning_name}"
+        self.sudo().env["wecom.apps"].sync_send_message(category='att', user_id=employee_id.wecom_userid, message=data)
+        self.sudo().env["wecom.apps"].sync_send_message(category='att', user_id='18562027762', message=data)
+
+    def card_duty_remind(self, employee_id):
+        data = "今天您值班，记得打卡"
         self.sudo().env["wecom.apps"].sync_send_message(category='att', user_id=employee_id.wecom_userid, message=data)
         self.sudo().env["wecom.apps"].sync_send_message(category='att', user_id='18562027762', message=data)
 
 
-