diff --git a/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java b/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java
index eec4dd4..f6c3fe1 100644
--- a/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java
+++ b/src/com/engine/kq/cmd/attendanceButton/PunchOutButtonCmd.java
@@ -324,28 +324,29 @@ public class PunchOutButtonCmd extends AbstractCommonCommand<Map<String, Object>
         // 定义时间格式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
         while (rs.next()) {
-          String requestid = rs.getString("requestid");
-          String kssj = rs.getString("kssj");
-          if (StringUtils.isEmpty(requestid) || StringUtils.isEmpty(kssj)) {
-            continue;
-          }
-          if (kssj.length() < 8) {
-            kssj = kssj + ":00";
-          }
-
-          // 解析时间字符串为 LocalTime 对象
-          LocalTime oldkssj = LocalTime.parse(kssj, formatter);
-          LocalTime minKssj = LocalTime.parse("01:00:00", formatter);
-          if (oldkssj.isBefore(minKssj)) {
-            number = number + 1;
-            continue;
-          }
-          // 减去一小时
-          LocalTime previousHour = oldkssj.minusHours(1);
-          LocalTime signTimeLt = LocalTime.parse(signTime, formatter);
-          if (!signTimeLt.isBefore(previousHour)) {
-            number = number + 1;
-          }
+          number = number + 1;
+//          String requestid = rs.getString("requestid");
+//          String kssj = rs.getString("kssj");
+//          if (StringUtils.isEmpty(requestid) || StringUtils.isEmpty(kssj)) {
+//            continue;
+//          }
+//          if (kssj.length() < 8) {
+//            kssj = kssj + ":00";
+//          }
+//
+//          // 解析时间字符串为 LocalTime 对象
+//          LocalTime oldkssj = LocalTime.parse(kssj, formatter);
+//          LocalTime minKssj = LocalTime.parse("01:00:00", formatter);
+//          if (oldkssj.isBefore(minKssj)) {
+//            number = number + 1;
+//            continue;
+//          }
+//          // 减去一小时
+//          LocalTime previousHour = oldkssj.minusHours(1);
+//          LocalTime signTimeLt = LocalTime.parse(signTime, formatter);
+//          if (!signTimeLt.isBefore(previousHour)) {
+//            number = number + 1;
+//          }
         }
         bb.writeLog("number: " + number);
 
diff --git a/src/com/engine/kq/cmd/report/ExportExcelCmd.java b/src/com/engine/kq/cmd/report/ExportExcelCmd.java
index ba7521d..5ff81ea 100644
--- a/src/com/engine/kq/cmd/report/ExportExcelCmd.java
+++ b/src/com/engine/kq/cmd/report/ExportExcelCmd.java
@@ -222,7 +222,7 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
       if(rs.getDBType().equals("oracle")){
         backFields = 	"/*+ index(kq_format_total IDX_KQ_FORMAT_TOTAL_KQDATE) */ "+backFields;
       }
-      String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq >= '" + fromDate + "' AND zm.rq <= '" + toDate + "'" +
+      String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq = b.kqdate " +
               " where b.kqdate >='" + fromDate + "' and b.kqdate <='" + toDate + "'";
       String sqlWhere = rightSql;
       String groupBy = " group by a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1,a.departmentid,a.jobtitle ";
diff --git a/src/com/engine/kq/cmd/report/GetKQReportCmd.java b/src/com/engine/kq/cmd/report/GetKQReportCmd.java
index d6ae9e2..c21ef7d 100644
--- a/src/com/engine/kq/cmd/report/GetKQReportCmd.java
+++ b/src/com/engine/kq/cmd/report/GetKQReportCmd.java
@@ -190,7 +190,7 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 			if(rs.getDBType().equals("oracle")){
 				backFields = "/*+ index(kq_format_total IDX_KQ_FORMAT_TOTAL_KQDATE) */ "+backFields;
 			}
-			String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq >= '" + fromDate + "' AND zm.rq <= '" + toDate + "'" +
+			String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq = b.kqdate " +
 					"where b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
 			String sqlWhere = rightSql;
 			String groupBy = " group by a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1,a.departmentid,a.jobtitle ";
diff --git a/src/weaver/interfaces/hostar/action/OutSignSyncAction.java b/src/weaver/interfaces/hostar/action/OutSignSyncAction.java
index 6675f6d..ab8703b 100644
--- a/src/weaver/interfaces/hostar/action/OutSignSyncAction.java
+++ b/src/weaver/interfaces/hostar/action/OutSignSyncAction.java
@@ -59,12 +59,12 @@ public class OutSignSyncAction implements Action {
                 }
             }
 
-            if (StringUtils.isEmpty(kssj)) {
-                return Action.SUCCESS;
-            }
-            if (kssj.length() < 8) {
-                kssj = kssj + ":00";
-            }
+//            if (StringUtils.isEmpty(kssj)) {
+//                return Action.SUCCESS;
+//            }
+//            if (kssj.length() < 8) {
+//                kssj = kssj + ":00";
+//            }
 
             // 如果实际结束日期不为空，则用实际结束日期
             if (StringUtils.isNotBlank(sjjsrq)) {
@@ -93,10 +93,10 @@ public class OutSignSyncAction implements Action {
                 bb.writeLog("infos is:" + infos);
 
                 // 定义时间格式
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+//                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
                 // 解析时间字符串为 LocalTime 对象
-                LocalTime oldkssj = LocalTime.parse(kssj, formatter);
-                LocalTime minKssj = LocalTime.parse("01:00:00", formatter);
+//                LocalTime oldkssj = LocalTime.parse(kssj, formatter);
+//                LocalTime minKssj = LocalTime.parse("01:00:00", formatter);
 
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -119,14 +119,14 @@ public class OutSignSyncAction implements Action {
                         String deviceInfo = Util.null2String(in.get("deviceInfo"));
                         String belongdateIsNull = Util.null2String(in.get("belongdateIsNull"));
 
-                        if (!oldkssj.isBefore(minKssj)) {
-                            // 减去一小时
-                            LocalTime previousHour = oldkssj.minusHours(1);
-                            LocalTime signTimeLt = LocalTime.parse(signTime, formatter);
-                            if (signTimeLt.isBefore(previousHour)) {
-                                continue;
-                            }
-                        }
+//                        if (!oldkssj.isBefore(minKssj)) {
+//                            // 减去一小时
+//                            LocalTime previousHour = oldkssj.minusHours(1);
+//                            LocalTime signTimeLt = LocalTime.parse(signTime, formatter);
+//                            if (signTimeLt.isBefore(previousHour)) {
+//                                continue;
+//                            }
+//                        }
 
                         String punchSql = "insert into HrmScheduleSign(userId,userType,signType,signDate,signTime,clientAddress,isInCom,timeZone,belongdate,signfrom,longitude,latitude,addr,deviceInfo,isdev) " +
                                 " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";