Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/ZysoftApi.java

@@ -59,7 +59,6 @@ public class ZysoftApi extends AbstractApiExecuter {
    private String licence = SystemConfig.getInstance().getGatewayLicence();
    private String basepath = SystemConfig.getInstance().getGatewayUrl();
    private String ca_url = SystemConfig.sysPropertiesSets.get("ca_url");
    private ZysoftApi(byte[] platformPublicKey, byte[] parameterPublicKey, byte[] resultPrivateKey) {
@@ -228,6 +227,7 @@ public class ZysoftApi extends AbstractApiExecuter {
                i++;
            }
        }
        String ca_url = SystemConfig.sysPropertiesSets.get("ca_url");
        System.out.println("ca_url:"+ca_url);
        String response = doHttpPost(ca_url,licence,openCrypto,paramsList,headersList);
        response = response.replace("\r","").replace("\n","").replace("\t","").replace("\f","");
@@ -262,6 +262,7 @@ public class ZysoftApi extends AbstractApiExecuter {
                i++;
            }
        }
        String ca_url = SystemConfig.sysPropertiesSets.get("ca_url");
        String response = doHttpGet(ca_url, licence, openCrypto, paramsList, headersList);
        response = response.replace("\r","").replace("\n","").replace("\t","").replace("\f","");
        System.out.print("response:"+response+"\r\n");

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/common/InitiSysProService.java

@@ -32,9 +32,10 @@ public class InitiSysProService {
        List<SystemProperties> sysvalueList = systemPropertiesDao.findSystemPropertiesByClientAndSpaValue(1);
        if(!sysvalueList.isEmpty()){
            for (SystemProperties systemProperties : sysvalueList) {
                System.out.println("key:"+systemProperties.getKey());
                System.out.println("value:"+systemProperties.getValue());
                sysPropertiesSets.put(systemProperties.getKey(),systemProperties.getValue());
            }
            SystemConfig.sysPropertiesSets = sysPropertiesSets;
        }
    }

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionCAService.java

@@ -121,7 +121,9 @@ public class PrescriptionCAService extends ZysoftBaseService {
            StringWriter sw = new StringWriter();
            PrintWriter pw = new PrintWriter(sw);
            ex.printStackTrace(pw);
            System.out.println("error1:"+ex.getMessage());
            error = sw.toString();
            System.out.println("error2:"+error);
            //保存http日志
            logService.saveHttpLog(isSuccess,api,content,method,msgHeader,msgBody,re,error);
@@ -129,9 +131,11 @@ public class PrescriptionCAService extends ZysoftBaseService {
            if(ex instanceof ApiException)
            {
                ApiException apiEx = (ApiException) ex;
                System.out.println("error3:"+ex.getMessage());
                throw new HttpApiException(apiEx.errorCode(),ex.getMessage());
            }
            else{
                System.out.println("error4:"+ex.getMessage());
                throw new HttpApiException(-1,ex.getMessage());
            }
        }

patient-co/patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/service/JobService.java

@@ -164,7 +164,7 @@ public class JobService {
                params.put("yesterday", getYesterday(0 - i));
                if (!StringUtils.isEmpty(quartzJobConfig.getJobClass())) {
                    quartzHelper.startNow(getRightClass(quartzJobConfig), quartzJobConfig.getId() + UUID.randomUUID().toString().replace("-", ""), params);
                    Thread.sleep(10000L);
                    Thread.sleep(20000L);
                }
            }
        }
@@ -206,7 +206,7 @@ public class JobService {
            params.put("yesterday", yesterday);
            if (!StringUtils.isEmpty(quartzJobConfig.getJobClass())) {
                quartzHelper.startNow(getRightClass(quartzJobConfig), quartzJobConfig.getId() + UUID.randomUUID().toString().replace("-", ""), params);
                Thread.sleep(40000L);
                Thread.sleep(20000L);
            }
        }
@@ -252,7 +252,7 @@ public class JobService {
        params.put("yesterday", yesterday);
        if (!StringUtils.isEmpty(quartzJobConfig.getJobClass())) {
            quartzHelper.startNow(getRightClass(quartzJobConfig), quartzJobConfig.getId() + UUID.randomUUID().toString().replace("-", ""), params);
            Thread.sleep(40000L);
            Thread.sleep(20000L);
        }
    }
@@ -283,7 +283,7 @@ public class JobService {
            params.put("yesterday", getYesterday(0 - i));
            if (!StringUtils.isEmpty(quartzJobConfig.getJobClass())) {
                quartzHelper.startNow(getRightClass(quartzJobConfig), quartzJobConfig.getId() + UUID.randomUUID().toString().replace("-", ""), params);
                Thread.sleep(40000L);
                Thread.sleep(20000L);
            }
        }
    }
@@ -418,7 +418,7 @@ public class JobService {
        params.put("now", yesterday);
        params.put("yesterday", day);
        quartzHelper.startNow(HealthMessageJob.class, HealthMessageJob.jobKey + UUID.randomUUID().toString().replace("-", ""), params);
        Thread.sleep(40000L);
        Thread.sleep(20000L);
    }
    public void productHealthDataByDayToDay(String start, String end) throws Exception {

patient-co/patient-co-statistics/src/main/resources/application.yml

@@ -184,7 +184,7 @@ spring:
      username: wlyy
      password: jkzlehr@123
    primaryRead:
      url: jdbc:mysql://59.61.92.90:8082/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      url: jdbc:mysql://59.61.92.90:8079/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: wlyy
      password: jkzlehr@123
    im: #im库: