3 Commits b1bc6bb19f ... cf9966fdde

Auteur SHA1 Message Date
  Trick cf9966fdde 测试环境 il y a 5 ans
  Trick 683ae6b09a Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev il y a 5 ans
  Trick 56450c3d7d 测试环境 il y a 5 ans

+ 11 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

@ -53,7 +53,7 @@ import java.util.*;
/**
 * 心脏中心内网his对接服务
 * Created by Trick on 2020/3/18.
 * Created by Trick on 2020/3/18
 */
@Service
@Transactional
@ -102,6 +102,7 @@ public class XzzxEntranceService{
    private WlyyInspectionDao wlyyInspectionDao;
    private static String key="bvvsf3JA0mUXMU+mVnMaOQ==";
    //发送微信模板消息
@ -126,6 +127,11 @@ public class XzzxEntranceService{
        return url;
    }
    public String getWXTokenUrl(){
        WlyyHospitalSysDictDO sysDictDO = wlyyHospitalSysDictDao.findById("getXzToken");
        return sysDictDO.getDictCode();
    }
    public String getXzzxWebServiceInfo(String api, Map<String,String> params,String url)throws Exception{
        logger.info("url"+url);
@ -853,6 +859,7 @@ public class XzzxEntranceService{
     * @throws Exception
     */
    public String getXzToken() throws Exception{
        String url =getWXTokenUrl();
        JSONObject params = new JSONObject();
        params.put("appId","1BQ08T2R60006501A8C00000BE73319D");
        params.put("encryptType","DES");
@ -864,7 +871,8 @@ public class XzzxEntranceService{
        JSONObject p = new JSONObject();
        p.put("medicalId","3501000014");
        params.put("param",p);
        String rs = HttpUtil.sendPost("http://xzbh.xmheart.com:8090/hospitalPortal-ext-app/ext/app/unifyapi",params.toJSONString());
        String path = url+"hospitalPortal-ext-app/ext/app/unifyapi";
        String rs = HttpUtil.sendPost(path,params.toJSONString());
        logger.info("rs :"+rs);
        JSONObject rsJson = JSON.parseObject(rs);
        String tokenAES = rsJson.getJSONObject("param").getString("token");
@ -872,6 +880,7 @@ public class XzzxEntranceService{
        return token;
    }
    public String ehospitalNotice(String userName, String idCard, String phone, String title, String url, String content, String contentString) {
        logger.info("ehospitalNotice:");
        BasePatientDO patientDO = patientDao.findByIdcardAndDel(idCard,"1");

+ 2 - 2
server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthYlzConfigService.java

@ -54,8 +54,8 @@ public class OauthYlzConfigService {
//    @Value("${testPattern.sign}")
//    private String isClose;
    @Value("${testPattern.remote_inner_url}")
    private String remote_inner_url;
//    @Value("${testPattern.remote_inner_url}")
//    private String remote_inner_url;
    @Autowired
    private ObjectMapper objectMapper;