Merge branch 'dev' of liubing/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/HcyyEntranceService.java

@@ -3075,11 +3075,32 @@ public class HcyyEntranceService {
    //=====================结算==============================
    public List<Map<String, Object>> createSQLQuery(String sql, Map<String, Object> params, Integer page, Integer size){
        return hibenateUtils.createSQLQuery(sql,params,page,size);
        logger.info("createSQLQuery=== "+sql);
        List<Map<String, Object>> result = null;
        long beginTime = System.currentTimeMillis();
        try {
            result =  hibenateUtils.createSQLQuery(sql,params,page,size);
        }catch (Exception e){
            e.printStackTrace();
        }
        long endTime = System.currentTimeMillis();
        System.out.println("总共消耗时间为：" + (endTime - beginTime));
        return result;
    }
    public List<Map<String, Object>> jdbcSQLQuery(String sql){
        return jdbcTemplate.queryForList(sql);
        logger.info("jdbcSQLQuery=== "+sql);
        List<Map<String, Object>> result = null;
        long beginTime = System.currentTimeMillis();
        try {
            result =  jdbcTemplate.queryForList(sql);
        }catch (Exception e){
            e.printStackTrace();
        }
        long endTime = System.currentTimeMillis();
        System.out.println("总共消耗时间为：" + (endTime - beginTime));
        return result;
    }
@@ -3097,7 +3118,16 @@ public class HcyyEntranceService {
     * @return
     */
    public JSONObject  SP_SST_JSDP_JSMX_GJYB(String fzxbh0,String yyjgdm,String mct,String mcn){
        return hibenateUtils.SP_SST_JSDP_JSMX_GJYB(fzxbh0,yyjgdm,mct,mcn);
        long beginTime = System.currentTimeMillis();
        JSONObject result = null;
        try {
            result = hibenateUtils.SP_SST_JSDP_JSMX_GJYB(fzxbh0,yyjgdm,mct,mcn);
        }catch (Exception e){
            e.printStackTrace();
        }
        long endTime = System.currentTimeMillis();
        System.out.println("总共消耗时间为：" + (endTime - beginTime));
        return result;
    }
    /**

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -668,5 +668,5 @@ wechat:
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
express:
  sf_url: http://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
  sf_code: WH000091
  sf_check_word: SFAHKAOFAAITyjt7890
  sf_code: WH000573
  sf_check_word: JKZLHCYY1234

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -1130,8 +1130,8 @@ qywx:
express:
  sf_url: https://mrds-admin.sf-express.com:443
  sf_code: WH000102
  sf_check_word: TGUQASFNAZyjt9112
  sf_code: WH000573
  sf_check_word: JKZLHCYY1234
---