trick9191 hace 7 años
padre
commit
a56a559fdf

+ 3 - 1
patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@ -142,7 +142,9 @@ public class PatientService extends TokenService {
            patient.setOpenidTime(new Date());
        }
        //System.out.println("========openid=======");
        patient.setOpenid(openid);
        if(!"undefined".equals(openid)){
            patient.setOpenid(openid);
        }
        Patient ps = patientDao.save(patient);
        System.out.print(new JSONObject(ps));
        if (StringUtils.isNotEmpty(patient.getOpenid())) {

+ 6 - 2
patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/service/weixin/wxpay/service/OnePayService.java

@ -86,7 +86,9 @@ public class OnePayService {
        //更新患者信息
        if (card != null) {
            Patient p = patientDao.findByCode(patient);
            p.setOpenid(openid);
            if(!"undefined".equals(openid)){
                p.setOpenid(openid);
            }
            p.setSsc(card.getAttachCardNo());
//            增加绑定电子社保卡信息
            p.setSicardStatus(1);
@ -475,7 +477,9 @@ public class OnePayService {
                //保存到患者表
                Patient p = patientDao.findByCode(patient);
                p.setOpenid(openid);
                if(!"undefined".equals(openid)){
                    p.setOpenid(openid);
                }
//            增加绑定电子社保卡信息
                p.setSicardTime(new Date());
                patientDao.save(p);

+ 5 - 1
patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@ -114,6 +114,10 @@ public class LoginController extends BaseController {
                         @ApiParam(required = false, name = "platform", value = "医生端pc,取药系统 或者对外系统") @RequestParam(required = false) Integer platform,
                         @ApiParam(required = false, name = "password", value = "密码") @RequestParam(required = false) String password,
                         @ApiParam(required = false, name = "openid", value = "openid") @RequestParam(required = false) String openid) {
        if(StringUtils.isNotBlank(openid)&&"undefined".equals(openid)){
            return error(-1, "openid参数不合法");
        }
        String errorMessage;
        LoginLog loginLog = new LoginLog();
        loginLog.setCreateTime(new Date());
@ -253,7 +257,7 @@ public class LoginController extends BaseController {
                    }
                    loginLogService.saveLog(loginLog);
                    if(StringUtils.isNotBlank(openid)){
                    if(!"undefined".equals(openid)&&StringUtils.isNotBlank(openid)){
                        doctor.setOpenid(openid);
                        doctorService.save(doctor);
                    }

+ 1 - 1
patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@ -263,7 +263,7 @@ public class WechatController extends WeixinBaseController {
            password = StringUtils.reverse(password);
            patient.setPassword(MD5.GetMD5Code(password + salt));
            patient.setSsc(ssc);
            if (!org.springframework.util.StringUtils.isEmpty(openid)) {
            if (!org.springframework.util.StringUtils.isEmpty(openid)&&"undefined".equals(openid)) {
                patient.setOpenid(openid);
                patient.setOpenidTime(new Date());
            }