diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index a85937315..dde7828c5 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -15,8 +15,13 @@ class AttachmentsController < ApplicationController
       update_downloads(@file)
       redirect_to @file.cloud_url and return
     end
-    send_file(absolute_path(local_path(@file)), filename: @file.filename, type: @file.content_type.presence || 'application/octet-stream')
 
+    pdf_attachment = params[:disposition] || "attachment"
+    if pdf_attachment == "inline"
+      render pdf: absolute_path(local_path(@file)), filename: @file.filename, disposition: 'inline', type: @file.content_type.presence || 'application/octet-stream'
+    else
+      send_file(absolute_path(local_path(@file)), filename: @file.filename,stream:false, type: @file.content_type.presence || 'application/octet-stream')
+    end
     update_downloads(@file)
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 099d45406..a5f291c7b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -257,8 +257,8 @@ module ApplicationHelper
     end
   end
 
-  def download_url attachment
-    attachment_path(attachment)
+  def download_url attachment,options={}
+    attachment_path(attachment,options)
   end
 
   # 耗时：天、小时、分、秒
diff --git a/app/views/attachment_histories/_attachment_history.json.jbuilder b/app/views/attachment_histories/_attachment_history.json.jbuilder
index 285aced42..a2369888f 100644
--- a/app/views/attachment_histories/_attachment_history.json.jbuilder
+++ b/app/views/attachment_histories/_attachment_history.json.jbuilder
@@ -6,6 +6,7 @@ json.publish_time attachment.publish_time
 json.quotes attachment.quotes_count
 json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
-json.url attachment_path(attachment, type: 'history').gsub("/api","")
+# json.url attachment_path(attachment, type: 'history').gsub("/api","")
 json.is_pdf attachment.is_history_pdf?
+json.url attachment.is_history_pdf? ? attachment_path(attachment, type: 'history',disposition:"inline") : attachment_path(attachment, type: 'history')
 json.attachment_id attachment.attachment_id
diff --git a/app/views/attachments/_attachment.json.jbuilder b/app/views/attachments/_attachment.json.jbuilder
index b87154157..25d7aecd0 100644
--- a/app/views/attachments/_attachment.json.jbuilder
+++ b/app/views/attachments/_attachment.json.jbuilder
@@ -11,6 +11,7 @@ json.quotes attachment.quotes_count
 json.description attachment.description
 json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
-json.url download_url(attachment)
+json.is_pdf attachment.is_pdf?
+json.url attachment.is_pdf? ? download_url(attachment,disposition:"inline") : download_url(attachment)
 
 # json.url download_url(attachment) unless attachment.locked?(@is_member)
diff --git a/app/views/attachments/_attachment_simple.json.jbuilder b/app/views/attachments/_attachment_simple.json.jbuilder
index ad98fadb5..6737838d1 100644
--- a/app/views/attachments/_attachment_simple.json.jbuilder
+++ b/app/views/attachments/_attachment_simple.json.jbuilder
@@ -2,5 +2,7 @@ json.id attachment.id
 json.title attachment.title
 json.filesize  number_to_human_size attachment.filesize
 json.description attachment.description
-json.url download_url(attachment)
+json.is_pdf attachment.is_pdf?
+json.url attachment.is_pdf? ? download_url(attachment,disposition:"inline") : download_url(attachment)
+# json.url download_url(attachment)
 json.set! :delete, delete.nil? ? true : delete if defined? delete
\ No newline at end of file
diff --git a/app/views/attachments/_attachment_small.json.jbuilder b/app/views/attachments/_attachment_small.json.jbuilder
index 97cbee120..853c14b40 100644
--- a/app/views/attachments/_attachment_small.json.jbuilder
+++ b/app/views/attachments/_attachment_small.json.jbuilder
@@ -1,6 +1,6 @@
 json.id attachment.id
 json.title attachment.title
 json.filesize number_to_human_size(attachment.filesize)
-json.url download_url(attachment)
+json.is_pdf attachment.is_pdf?
+json.url attachment.is_pdf? ? download_url(attachment,disposition:"inline") : download_url(attachment)
 json.created_on attachment.created_on
-json.is_pdf attachment.is_pdf?
\ No newline at end of file
diff --git a/app/views/files/histories.json.jbuilder b/app/views/files/histories.json.jbuilder
index ed322bb17..7039752e7 100644
--- a/app/views/files/histories.json.jbuilder
+++ b/app/views/files/histories.json.jbuilder
@@ -1,9 +1,3 @@
 
-# json.partial! 'attachments/attachment_small', attachment: @file
-json.id @file.id
-json.title @file.title
-json.filesize number_to_human_size(@file.filesize)
-json.url download_url(@file).gsub("/api","")
-json.created_on @file.created_on
-json.is_pdf @file.is_pdf?
+json.partial! 'attachments/attachment_small', attachment: @file
 json.partial! "attachment_histories/list", attachment_histories: @attachment_histories