Merge branch 'dev-1.3.8' of wujunjie/patient-co-management into dev-1.3.8

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/weixin/wxpay/service/OnePayService.java

@@ -232,6 +232,7 @@ public class OnePayService {
            charge.setCode(uuid);  //  接入应用支付业务流水号
            Date now = new Date();
            charge.setCreateTime(now);
            charge.setUpdateTime(now);
            charge.setPatient(patient);     //  用户
            charge.setOpenid(openid);     //  用戶微信openid

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/wx/OnePayController.java

@@ -345,6 +345,7 @@ public class OnePayController extends WeixinBaseController {
            charge.setIdType(idType);
            charge.setIdNo(idNo);
            charge.setTradeStatus(chargeStatus);
            charge.setUpdateTime(new Date());
            if (param.has("responseContent") && (param.getJSONObject("responseContent") != null)) {
                String requestParam = param.getString("responseContent");
@@ -518,6 +519,7 @@ public class OnePayController extends WeixinBaseController {
                    charge.setIdType(idType);
                    charge.setIdNo(idNo);
                    charge.setTradeStatus(chargeStatus);
                    charge.setUpdateTime(new Date());
                    String miRegisterNo = "";//医保签约号
                    if (requestParam.has("responseContent")) {