diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index a4614d5..f41c5f8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,6 +105,9 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
+            ORDER BY bosr.real_deliver_time DESC
+        </if>
+        <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
         </if>
     </select>

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index a4614d5..f41c5f8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,6 +105,9 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
+            ORDER BY bosr.real_deliver_time DESC
+        </if>
+        <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
         </if>
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 5f20b3b..0427dd2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -166,6 +166,19 @@
         MeterFile file = new MeterFile();
         file.setId(id);
         file.setEffectiveStatus(EffectiveStatusEnum.REPEALED.getCode());
+        MeterFile meterFile = meterFileMapper.selectById(id);
+        meterFile.setEffectiveStatus(EffectiveStatusEnum.REPEALED.getCode());
+        PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
+        String printFileName = printFileRegister.registerPrintFile(
+                RegisterCustomParameters.builder()
+//                            .customFileName(meterFile.getFileName())
+                        .customObject(meterFile)
+                        .prefixType(FilePrintTypeEnum.METER_FILE)
+                        .pdf(true)
+                        .build());
+        if (StringUtils.isNotEmpty(printFileName)) {
+            file.setMinioFilePdfName(printFileName);
+        }
         if (meterFileMapper.updateById(file) > 0) {
             return ReturnUtil.success();
         }
@@ -487,7 +500,7 @@
         QueryWrapper<MeterFile> wrapper = new QueryWrapper<>();
         if ("0".equals(request.getFileType())) {
             //质量文件全部包括：质量手册/程序文件/作业指导书/质量记录/操作规程
-            wrapper.in("file_type", Arrays.asList("2","3","4","8","9"));
+            wrapper.in("file_type", Arrays.asList("2", "3", "4", "8", "9"));
         } else {
             wrapper.eq(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
         }

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index a4614d5..f41c5f8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,6 +105,9 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
+            ORDER BY bosr.real_deliver_time DESC
+        </if>
+        <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
         </if>
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 5f20b3b..0427dd2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -166,6 +166,19 @@
         MeterFile file = new MeterFile();
         file.setId(id);
         file.setEffectiveStatus(EffectiveStatusEnum.REPEALED.getCode());
+        MeterFile meterFile = meterFileMapper.selectById(id);
+        meterFile.setEffectiveStatus(EffectiveStatusEnum.REPEALED.getCode());
+        PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
+        String printFileName = printFileRegister.registerPrintFile(
+                RegisterCustomParameters.builder()
+//                            .customFileName(meterFile.getFileName())
+                        .customObject(meterFile)
+                        .prefixType(FilePrintTypeEnum.METER_FILE)
+                        .pdf(true)
+                        .build());
+        if (StringUtils.isNotEmpty(printFileName)) {
+            file.setMinioFilePdfName(printFileName);
+        }
         if (meterFileMapper.updateById(file) > 0) {
             return ReturnUtil.success();
         }
@@ -487,7 +500,7 @@
         QueryWrapper<MeterFile> wrapper = new QueryWrapper<>();
         if ("0".equals(request.getFileType())) {
             //质量文件全部包括：质量手册/程序文件/作业指导书/质量记录/操作规程
-            wrapper.in("file_type", Arrays.asList("2","3","4","8","9"));
+            wrapper.in("file_type", Arrays.asList("2", "3", "4", "8", "9"));
         } else {
             wrapper.eq(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java
index f392747..0f6fe47 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java
@@ -132,7 +132,7 @@
     private QueryWrapper<SystemTemplate> getWrapper(TemplateListRequest request) {
         QueryWrapper<SystemTemplate> wrapper = new QueryWrapper<>();
         if ("0".equals(request.getTemplateType())) {
-            wrapper.in("template_type", Arrays.asList("1","2","3"));
+            wrapper.in("template_type", Arrays.asList("1","2","3","4"));
         } else {
             wrapper.eq(StringUtils.isNotBlank(request.getTemplateType()),"template_type", request.getTemplateType());
         }

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index a4614d5..f41c5f8 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -105,6 +105,9 @@
             ORDER BY bosr.real_deliver_time DESC
         </if>
         <if test="request.sampleStatus == 5">
+            ORDER BY bosr.real_deliver_time DESC
+        </if>
+        <if test="request.sampleStatus == 6">
             ORDER BY bosr.return_time DESC
         </if>
     </select>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
index 5f20b3b..0427dd2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java
@@ -166,6 +166,19 @@
         MeterFile file = new MeterFile();
         file.setId(id);
         file.setEffectiveStatus(EffectiveStatusEnum.REPEALED.getCode());
+        MeterFile meterFile = meterFileMapper.selectById(id);
+        meterFile.setEffectiveStatus(EffectiveStatusEnum.REPEALED.getCode());
+        PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
+        String printFileName = printFileRegister.registerPrintFile(
+                RegisterCustomParameters.builder()
+//                            .customFileName(meterFile.getFileName())
+                        .customObject(meterFile)
+                        .prefixType(FilePrintTypeEnum.METER_FILE)
+                        .pdf(true)
+                        .build());
+        if (StringUtils.isNotEmpty(printFileName)) {
+            file.setMinioFilePdfName(printFileName);
+        }
         if (meterFileMapper.updateById(file) > 0) {
             return ReturnUtil.success();
         }
@@ -487,7 +500,7 @@
         QueryWrapper<MeterFile> wrapper = new QueryWrapper<>();
         if ("0".equals(request.getFileType())) {
             //质量文件全部包括：质量手册/程序文件/作业指导书/质量记录/操作规程
-            wrapper.in("file_type", Arrays.asList("2","3","4","8","9"));
+            wrapper.in("file_type", Arrays.asList("2", "3", "4", "8", "9"));
         } else {
             wrapper.eq(StringUtils.isNotBlank(request.getFileType()), "file_type", request.getFileType());
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java
index f392747..0f6fe47 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemTemplateServiceImpl.java
@@ -132,7 +132,7 @@
     private QueryWrapper<SystemTemplate> getWrapper(TemplateListRequest request) {
         QueryWrapper<SystemTemplate> wrapper = new QueryWrapper<>();
         if ("0".equals(request.getTemplateType())) {
-            wrapper.in("template_type", Arrays.asList("1","2","3"));
+            wrapper.in("template_type", Arrays.asList("1","2","3","4"));
         } else {
             wrapper.eq(StringUtils.isNotBlank(request.getTemplateType()),"template_type", request.getTemplateType());
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
index 4ec190c..704cb40 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
@@ -41,7 +41,7 @@
      */
     protected String createResponseFileInput(String printDocUrl, String customFileName, HttpServletResponse response, FilePrintRegister filePrintRegister) {
         if (response == null) {
-            if (filePrintRegister.getQrCode().contains("png")) {
+            if (StringUtils.isNotEmpty(filePrintRegister.getQrCode()) && filePrintRegister.getQrCode().contains("png")) {
                 getQrCodeUrl(printDocUrl, filePrintRegister.getQrCode(), filePrintRegister.getTemDir());
                 uploadCertificate( filePrintRegister.getTemDir()+filePrintRegister.getQrCode(),filePrintRegister.getQrCode());
             }