上传的机构错误修复

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/CrawlerManager.java

@@ -87,7 +87,7 @@ public class CrawlerManager {
        }
        if ((end.getTime() - begin.getTime()) <= 0) {
            return Result.error("错误：采集上传结束时间小于开始时间！"); //结束时间小于开始时间时，不获取
            return Result.error("错误：采集上传结束时间小于开始时间！jobId: "+jobId +",start:"+begin.toString()+" end: "+end.toString()); //结束时间小于开始时间时，不获取
        }
        end = DateUtil.fromatDateToTimestamp(end);
@@ -96,7 +96,7 @@ public class CrawlerManager {
            //调整截止时间，当前时间-偏移量
            end = DateUtil.addDate(-rsJobConfig.getDelayTime(), DateUtil.getSysDateTime());
            if ((end.getTime() - begin.getTime()) <= 0) {
                return Result.success("错误：采集上传结束时间小于开始时间！"); //结束时间小于开始时间时，不获取
                return Result.error("调整截止时间偏移量错误：采集上传结束时间小于开始时间！jobId: " + jobId + ",start:" + begin.toString() + " end: " + end.toString()); //结束时间小于开始时间时，不获取
            }
        }
@@ -216,7 +216,7 @@ public class CrawlerManager {
//                    }
//                }
            }
            logger.info("上传-采集病人信息成功,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
            logger.info("上传档案流程-获取病人信息成功,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
            //上传档案
            logger.info("上传病人档案");
            try {

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/EsbHttp.java

@@ -291,7 +291,7 @@ public class EsbHttp {
            Map<String, String> formParams = new HashMap<>();
            formParams.put("md5", fileMd5);
            formParams.put("package_crypto", encryptPwd);
            formParams.put("org_code", patient.getOrgCode());
            formParams.put("org_code", SysConfig.orgcode);
//            formParams.put("token", token);
            Map<String, String> header = new HashMap<>();
            header.put("Authorization", "Basic " + EHRHttpHelper.clientKey);

hos-rest/src/main/resources/application.yml

@@ -13,7 +13,7 @@ spring:
  profiles: dev
  data:
    mongodb:
      host: 172.19.103.42
      host: 172.19.103.57
      port: 27017
      username: esb
      password: esb