From e07dbd234a578874edea955e0cbf98b7cfc7bd69 Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Tue, 27 Jun 2023 17:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E7=B1=BBid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/docus/server/AppRunBootstrap.java   | 11 ++++-------
 .../java/com/docus/server/report/job/ReportJob.java   |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/docus/server/AppRunBootstrap.java b/src/main/java/com/docus/server/AppRunBootstrap.java
index 115fd4e..c69d7c7 100644
--- a/src/main/java/com/docus/server/AppRunBootstrap.java
+++ b/src/main/java/com/docus/server/AppRunBootstrap.java
@@ -1,12 +1,10 @@
 package com.docus.server;
 
 
-import com.docus.server.report.config.SdRyReportQueryConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 
 import java.util.Properties;
 
@@ -14,16 +12,15 @@ import java.util.Properties;
 @Slf4j
 //@EnableFeignClients(basePackages = ("com.feign"))
 //@EnableHystrix
-@SpringBootApplication(scanBasePackages ={"com.docus"})
+@SpringBootApplication(scanBasePackages = {"com.docus"})
 @MapperScan("com.docus.server.**.mapper")
 public class AppRunBootstrap {
     public static void main(String[] args) {
         Properties props = System.getProperties();
         props.setProperty("org.apache.cxf.stax.allowInsecureParser", "1");
         props.setProperty("UseSunHttpHandler", "true");
-        System.setProperty("javax.xml.parsers.DocumentBuilderFactory","com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
-        ConfigurableApplicationContext run = SpringApplication.run(AppRunBootstrap.class, args);
-        SdRyReportQueryConfig bean = run.getBean(SdRyReportQueryConfig.class);
-        bean.getReportQueryLisDefaultAssortType();
+        System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
+        SpringApplication.run(AppRunBootstrap.class, args);
+
     }
 }
diff --git a/src/main/java/com/docus/server/report/job/ReportJob.java b/src/main/java/com/docus/server/report/job/ReportJob.java
index 1fc3423..211f38d 100644
--- a/src/main/java/com/docus/server/report/job/ReportJob.java
+++ b/src/main/java/com/docus/server/report/job/ReportJob.java
@@ -155,7 +155,7 @@ public class ReportJob {
                 reportDto.setDownUrl(nisReport.getUrl());
                 reportDto.setFileTitle(nisReport.getForm_name());
                 reportDto.setSerialnum(nisReport.getForm_id());
-                reportDto.setAssortId(ZdAssortConfig.getZdAssortId(nisReport.getForm_name()));
+                reportDto.setAssortId(ZdAssortConfig.getZdAssortId(nisReport.getForm_name(),sdRyReportQueryConfig.getReportQueryNurseInsertSugarDefaultAssortType()));
                 reportDto.setAdmisstimes(admissTimes);
                 reportDto.setInpatientNo(inpatientNo);
                 reportDto.setPatientId(patientId);