diff --git a/app/models/issue.rb b/app/models/issue.rb
index 2c1a22d92..ad1090d8e 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -109,8 +109,20 @@ class Issue < ApplicationRecord
   after_destroy :update_closed_issues_count_in_project!, :decre_project_common, :decre_user_statistic, :decre_platform_statistic
 
   def check_pm_and_update_due_date
-    if pm_project_id.present? && status_id.changed? && status_id == 5
-      self.due_date = self.due_date || Time.current
+    if pm_project_id.present? && pm_issue_type.present? && status_id_chenged?
+      status_ids = case pm_issue_type
+                   when 1
+                     [3,5]
+                   when 2
+                     [3,5]
+                   when 3
+                     [5]
+                   else
+                     []
+                   end
+      if status_ids.include? self.status_id
+        self.due_date = self.due_date || Time.current
+      end
     end
   end