huangzhiyong před 7 roky
rodič
revize
ab6526c411

+ 2 - 1
hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/PatientCDAUpload.java

@ -36,6 +36,7 @@ public class PatientCDAUpload {
        try {
            if (zipFile == null || zipFile.file == null) {
                logger.info("压缩病人档案失败,病人文档未生成,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                FileUtil.deleteDirectory(new File(zipFile.directory));
                return false;
            }
@ -49,7 +50,7 @@ public class PatientCDAUpload {
            logger.trace(zipFile.directory);
            result = FileUtil.deleteDirectory(new File(zipFile.directory));
            if (!result) {
                logger.info("删除临时文件失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                System.out.println("删除临时文件失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                return result;
            }
        } catch (Exception e) {

+ 2 - 1
hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/QCDataUpload.java

@ -37,6 +37,7 @@ public class QCDataUpload {
        try {
            if (zipFile == null || zipFile.file == null) {
                logger.info("压缩质控日报数据失败,质控日报数据未生成,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                FileUtil.deleteDirectory(new File(zipFile.directory));
                return false;
            }
@ -50,7 +51,7 @@ public class QCDataUpload {
            logger.trace(zipFile.directory);
            result = FileUtil.deleteDirectory(new File(zipFile.directory));
            if (!result) {
                logger.info("删除质控日报临时文件失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                System.out.println("删除质控日报临时文件失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                return result;
            }
        } catch (Exception e) {

+ 1 - 1
hos-rest/src/main/resources/config/sys.config.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config>
    <temp_file>D:/temp</temp_file>
    <temp_file>/usr/local/esb/rest/temp</temp_file>
    <ehr_version>
        <org_code code="jkzl">
            <version>56395d75b854</version>

+ 5 - 5
src/main/resources/application.yml

@ -53,7 +53,7 @@ spring:
    proxy-target-class: true
hos:
  administrators: jkzl #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  clientId: 0e3DIdNaQ2  #应用ID,集成时授权使用
  zbus:
    url: 172.19.103.57:9020
  filesystem:
@ -110,9 +110,9 @@ hos:
  mysql:
    filePath: /usr/local/esb/esb.sql   #租户基础表 sql文件位置
service-gateway:
  portalUrl: http://192.168.1.221:10280/api/v1.0/portal
  adminUrl: http://192.168.1.221:10000/api/v1.0/admin
  oauth2authorize: http://192.168.1.221:10260/
  oauth2RedictUrl: http://192.168.1.221:8080/ehr/login/signinReport
  portalUrl: http://172.19.103.73:10280/api/v1.0/portal
  adminUrl: http://172.19.103.73:10000/api/v1.0/admin
  oauth2authorize: http://172.19.103.73:10260/
  oauth2RedictUrl: http://172.19.103.73:8080/ehr/login/signinReport
  oauth2ReportClientId: 2YTOSRI0tw
  url: http://172.19.103.37:9999/api