diff --git a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
index fdf883a..2cf27ec 100644
--- a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
@@ -210,8 +210,15 @@ function ExceptionParkReport() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -497,11 +504,13 @@ function ExceptionParkReport() {
                 onChange={(date, dateString) => {
                   console.log(date, dateString);
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_date: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_date: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_date: dateString });
@@ -526,11 +535,13 @@ function ExceptionParkReport() {
                 value={FormData.end_date ? moment(FormData.end_date) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_date: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_date: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_date: dateString });
diff --git a/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
index e799144..d2089df 100644
--- a/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
@@ -147,8 +147,15 @@ function ParkingAly() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -500,11 +507,13 @@ function ParkingAly() {
                 value={FormData.start_date ? moment(FormData.start_date) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_date: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_date: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_date: dateString });
@@ -529,11 +538,13 @@ function ParkingAly() {
                 value={FormData.end_date ? moment(FormData.end_date) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_date: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_date: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_date: dateString });
diff --git a/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
index 236b1df..9d472d3 100644
--- a/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
@@ -160,8 +160,15 @@ function PayAly() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -789,11 +796,13 @@ function PayAly() {
                 value={FormData.start_date ? moment(FormData.start_date) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_date: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_date: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_date: dateString });
@@ -818,11 +827,13 @@ function PayAly() {
                 value={FormData.end_date ? moment(FormData.end_date) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_date: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_date: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_date: dateString });
diff --git a/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
index 8f4cdff..35d7033 100644
--- a/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
@@ -151,8 +151,15 @@ function RegisterAly() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -662,11 +669,13 @@ function RegisterAly() {
                 value={FormData.start_date ? moment(FormData.start_date) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_date: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_date: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_date: dateString });
@@ -691,11 +700,13 @@ function RegisterAly() {
                 value={FormData.end_date ? moment(FormData.end_date) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_date: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_date: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_date: dateString });
diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
index 7f0e774..808f953 100644
--- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
@@ -1350,9 +1350,10 @@ const ParkingOverview = connect(function mapStateToProps(state) {
         let yune = data?.data?.content;
         setText(yune);
       } else if (data?.data?.type == "arrears") {
-        let buf = [data?.data, ...qfdata].slice(0, 10);
-        sessionStorage.setItem("tmd", JSON.stringify(buf));
-        setqfdata(buf);
+        let buf = JSON.parse(JSON.stringify(qfdata));
+        let arrs = buf.unshift(data?.data).slice(0, 10);
+        sessionStorage.setItem("tmd", JSON.stringify(arrs));
+        setqfdata(arrs);
         setHoShow(true);
       }
     };
diff --git a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
index 9e23ad5..22997df 100644
--- a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
@@ -315,8 +315,15 @@ function BookReport() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -632,11 +639,13 @@ function BookReport() {
                 value={FormData.start_time ? moment(FormData.start_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_time: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_time: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_time: dateString });
@@ -658,11 +667,13 @@ function BookReport() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_time: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_time: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_time: dateString });
diff --git a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
index db16285..c0ae6c2 100644
--- a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
@@ -455,8 +455,15 @@ function OperationReport() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -706,11 +713,13 @@ function OperationReport() {
                 onChange={(date, dateString) => {
                   console.log(date, dateString);
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_time: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_time: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_time: dateString });
@@ -732,11 +741,13 @@ function OperationReport() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_time: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_time: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_time: dateString });
diff --git a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
index 23cff7e..105ca9c 100644
--- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
@@ -196,8 +196,15 @@ function ParkCardReport() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -410,11 +417,13 @@ function ParkCardReport() {
                 value={FormData.start_time ? moment(FormData.start_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_time: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_time: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_time: dateString });
@@ -436,11 +445,13 @@ function ParkCardReport() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_time: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_time: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_time: dateString });
diff --git a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
index 29817dc..5851cee 100644
--- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
@@ -369,8 +369,15 @@ function ParkingIncomeReport() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -621,11 +628,13 @@ function ParkingIncomeReport() {
                 value={FormData.start_time ? moment(FormData.start_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_time: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_time: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_time: dateString });
@@ -647,11 +656,13 @@ function ParkingIncomeReport() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_time: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_time: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_time: dateString });
diff --git a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
index 75fe0d1..e7549e9 100644
--- a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
@@ -370,8 +370,15 @@ function PayChannelStat() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -604,11 +611,13 @@ function PayChannelStat() {
                 value={FormData.start_time ? moment(FormData.start_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_time: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_time: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_time: dateString });
@@ -630,11 +639,13 @@ function PayChannelStat() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_time: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_time: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_time: dateString });
diff --git a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
index c373c81..d5a482b 100644
--- a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
@@ -248,8 +248,15 @@ function PaySummaryReport() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -506,8 +513,14 @@ function PaySummaryReport() {
                 value={FormData.start_time ? moment(FormData.start_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date).subtract(
+                      weekOfday - 1,
+                      "days"
+                    );
+
                     let days = moment(FormData.end_time).diff(
-                      moment(date).day(1),
+                      last_sunday,
                       "days"
                     );
                     if (days > 30) {
@@ -522,7 +535,7 @@ function PaySummaryReport() {
                       setFormData({
                         ...FormData,
                         start_time: date
-                          ? moment(date).day(1).format("YYYY-MM-DD")
+                          ? last_sunday.format("YYYY-MM-DD")
                           : null,
                       });
                     }
@@ -556,9 +569,12 @@ function PaySummaryReport() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
-                    let days = moment(date)
-                      .day(7)
-                      .diff(moment(FormData.start_time), "days");
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date).add(7 - weekOfday, "days");
+                    let days = last_sunday.diff(
+                      moment(FormData.start_time),
+                      "days"
+                    );
                     console.log(days);
                     if (days > 30) {
                       setFormData({
@@ -569,7 +585,7 @@ function PaySummaryReport() {
                       setFormData({
                         ...FormData,
                         end_time: date
-                          ? moment(date).day(7).format("YYYY-MM-DD")
+                          ? last_sunday.format("YYYY-MM-DD")
                           : null,
                       });
                     }
diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
index 80b8d9d..023fec3 100644
--- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
@@ -230,8 +230,15 @@ function PdaStat() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -493,11 +500,13 @@ function PdaStat() {
                 value={FormData.start_time ? moment(FormData.start_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_time: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_time: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_time: dateString });
@@ -519,11 +528,13 @@ function PdaStat() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_time: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_time: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_time: dateString });
diff --git a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
index d210635..e6a128f 100644
--- a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
@@ -237,8 +237,15 @@ function PreOrderReport() {
       start = moment().format("YYYY-MM");
       end = moment().format("YYYY-MM");
     } else if (e == 2) {
-      start = moment().day(1).format("YYYY-MM-DD");
-      end = moment().day(7).format("YYYY-MM-DD");
+      let weekOfday = moment().format("E");
+      let last_monday = moment()
+        .subtract(weekOfday - 1, "days")
+        .format("YYYY-MM-DD");
+      let last_sunday = moment()
+        .add(7 - weekOfday, "days")
+        .format("YYYY-MM-DD");
+      start = last_monday;
+      end = last_sunday;
       // start = moment().subtract(7, "days").format("YYYY-MM-DD");
       // end = moment().format("YYYY-MM-DD");
     } else {
@@ -471,11 +478,13 @@ function PreOrderReport() {
                 value={FormData.start_time ? moment(FormData.start_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_monday = moment(date)
+                      .subtract(weekOfday - 1, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      start_time: date
-                        ? moment(date).day(1).format("YYYY-MM-DD")
-                        : null,
+                      start_time: date ? last_monday : null,
                     });
                   } else {
                     setFormData({ ...FormData, start_time: dateString });
@@ -497,11 +506,13 @@ function PreOrderReport() {
                 value={FormData.end_time ? moment(FormData.end_time) : null}
                 onChange={(date, dateString) => {
                   if (TimeChange().str == "week") {
+                    let weekOfday = moment(date).format("E");
+                    let last_sunday = moment(date)
+                      .add(7 - weekOfday, "days")
+                      .format("YYYY-MM-DD");
                     setFormData({
                       ...FormData,
-                      end_time: date
-                        ? moment(date).day(7).format("YYYY-MM-DD")
-                        : null,
+                      end_time: date ? last_sunday : null,
                     });
                   } else {
                     setFormData({ ...FormData, end_time: dateString });