添加默认的分类id

3.2.4.44
wyb 2 years ago
parent 95d92d2425
commit e07dbd234a

@ -1,12 +1,10 @@
package com.docus.server; package com.docus.server;
import com.docus.server.report.config.SdRyReportQueryConfig;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
import java.util.Properties; import java.util.Properties;
@ -14,16 +12,15 @@ import java.util.Properties;
@Slf4j @Slf4j
//@EnableFeignClients(basePackages = ("com.feign")) //@EnableFeignClients(basePackages = ("com.feign"))
//@EnableHystrix //@EnableHystrix
@SpringBootApplication(scanBasePackages ={"com.docus"}) @SpringBootApplication(scanBasePackages = {"com.docus"})
@MapperScan("com.docus.server.**.mapper") @MapperScan("com.docus.server.**.mapper")
public class AppRunBootstrap { public class AppRunBootstrap {
public static void main(String[] args) { public static void main(String[] args) {
Properties props = System.getProperties(); Properties props = System.getProperties();
props.setProperty("org.apache.cxf.stax.allowInsecureParser", "1"); props.setProperty("org.apache.cxf.stax.allowInsecureParser", "1");
props.setProperty("UseSunHttpHandler", "true"); props.setProperty("UseSunHttpHandler", "true");
System.setProperty("javax.xml.parsers.DocumentBuilderFactory","com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"); System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
ConfigurableApplicationContext run = SpringApplication.run(AppRunBootstrap.class, args); SpringApplication.run(AppRunBootstrap.class, args);
SdRyReportQueryConfig bean = run.getBean(SdRyReportQueryConfig.class);
bean.getReportQueryLisDefaultAssortType();
} }
} }

@ -155,7 +155,7 @@ public class ReportJob {
reportDto.setDownUrl(nisReport.getUrl()); reportDto.setDownUrl(nisReport.getUrl());
reportDto.setFileTitle(nisReport.getForm_name()); reportDto.setFileTitle(nisReport.getForm_name());
reportDto.setSerialnum(nisReport.getForm_id()); 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.setAdmisstimes(admissTimes);
reportDto.setInpatientNo(inpatientNo); reportDto.setInpatientNo(inpatientNo);
reportDto.setPatientId(patientId); reportDto.setPatientId(patientId);

Loading…
Cancel
Save