Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareService.java

@@ -157,7 +157,7 @@ public class HealthCareService {
        JSONObject jsonObject = JSONObject.parseObject(obj);
        logger.info("请求前funid=="+funid+"data="+data.toJSONString());
        String response = httpClientUtil.postBody(ylzConfigUrl,jsonObject);
        ylzHttpLogDO.setResponseEncrypt(response);
        ylzHttpLogDO.setResponseEncrpty(response);
        if (response!=null&&response!=""){
            JSONObject result = JSONObject.parseObject(response);
            if (result.getString("flag").equalsIgnoreCase("1")){
@@ -174,7 +174,7 @@ public class HealthCareService {
        ylzHttpLogDO.setCode(funid);
        ylzHttpLogDO.setName(name);
        ylzHttpLogDO.setRequest(data.toJSONString());
        ylzHttpLogDO.setRequestEncrypt(obj);
        ylzHttpLogDO.setRequestEncrpty(obj);
        ylzHttpLogDO.setResponse(response);
        ylzHttpLogDO.setCreateTime(new Date());
        ylzHttpLogDao.save(ylzHttpLogDO);
@@ -900,7 +900,7 @@ public class HealthCareService {
        JSONObject jsonObject = JSONObject.parseObject(obj);
        logger.info("请求前funid=="+funid+"data="+data);
        String response = httpClientUtil.postBody(ylzConfigUrl,jsonObject);
        ylzHttpLogDO.setResponseEncrypt(response);
        ylzHttpLogDO.setResponseEncrpty(response);
        logger.info("请求后response=="+response);
        if (response!=null&&response!=""){
            JSONObject result = JSONObject.parseObject(response);
@@ -919,7 +919,7 @@ public class HealthCareService {
        ylzHttpLogDO.setCode(funid);
        ylzHttpLogDO.setName("获取AccessToken");
        ylzHttpLogDO.setRequest(data.toJSONString());
        ylzHttpLogDO.setRequestEncrypt(obj);
        ylzHttpLogDO.setRequestEncrpty(obj);
        ylzHttpLogDO.setResponse(response);
        ylzHttpLogDO.setCreateTime(new Date());
        ylzHttpLogDao.save(ylzHttpLogDO);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/httplog/YlzHttpLogDO.java

@@ -20,9 +20,9 @@ public class YlzHttpLogDO extends UuidIdentityEntity {
    private String patient;//居民code',
    private String doctor;//医生code',
    private String request;//请求参数',
    private String requestEncrypt;//加密请求参数
    private String requestEncrpty;//加密请求参数
    private String response;//返回参数',
    private String responseEncrypt;//加密返回参数',
    private String responseEncrpty;//加密返回参数',
    private String status;//状态0成功，其他失败',
    private Date createTime;//创建时间',
@@ -92,21 +92,21 @@ public class YlzHttpLogDO extends UuidIdentityEntity {
        this.createTime = createTime;
    }
    @Column(name = "request_encrypt")
    public String getRequestEncrypt() {
        return requestEncrypt;
    @Column(name = "request_encrpty")
    public String getRequestEncrpty() {
        return requestEncrpty;
    }
    public void setRequestEncrypt(String requestEncrypt) {
        this.requestEncrypt = requestEncrypt;
    public void setRequestEncrpty(String requestEncrpty) {
        this.requestEncrpty = requestEncrpty;
    }
    @Column(name = "response_encrpty")
    public String getResponseEncrypt() {
        return responseEncrypt;
    public String getResponseEncrpty() {
        return responseEncrpty;
    }
    public void setResponseEncrypt(String responseEncrypt) {
        this.responseEncrypt = responseEncrypt;
    public void setResponseEncrpty(String responseEncrpty) {
        this.responseEncrpty = responseEncrpty;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/healthCare/HealthCareEndPoint.java

@@ -93,6 +93,25 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
        return ObjEnvelop.getSuccess("ok",healthCareService.pharmacistReviewResults(outpatientId));
    }
    @PostMapping(value = "outpatientReminder")
    @ApiOperation(value = "门诊提醒", notes = "门诊提醒")
    public ObjEnvelop outpatientReminder(@ApiParam(name = "outpatientId", value = "处方id", required = true)
                                                     @RequestParam(value = "outpatientId",required = true) String outpatientId,
                                                     @ApiParam(name = "doctorCode",value="医保医生code",required = true)
                                                     @RequestParam(value = "doctorCode",required = true) String doctorCode)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.outpatientReminder(outpatientId,doctorCode));
    }
    @PostMapping(value = "outpatientEventReminder")
    @ApiOperation(value = "门诊事中提醒", notes = "门诊事中提醒")
    public ObjEnvelop outpatientEventReminder(@ApiParam(name = "outpatientId", value = "处方id", required = true)
                                                     @RequestParam(value = "outpatientId",required = true) String outpatientId,
                                                     @ApiParam(name = "doctorCode",value="医保医生code",required = true)
                                                     @RequestParam(value = "doctorCode",required = true) String doctorCode)throws Exception{
        return ObjEnvelop.getSuccess("ok",healthCareService.outpatientEventReminder(outpatientId,doctorCode));
    }
    @GetMapping(value = "/getYlzToken")
    @ApiOperation(value = "获取医保accessToken", notes = "获取医保accessToken")
    public ObjEnvelop getChargeDict()throws Exception{