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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PatientPrescriptionPayService.java

@@ -1025,7 +1025,7 @@ public class PatientPrescriptionPayService extends BaseService {
                List<BindCard> bindCard = onePayService.bindCardList(openid);
                for (BindCard cards : bindCard) {
                    String attachCardNo = cards.getAttachCardNo();
                    if (StringUtil.isNotEmpty(attachCardNo) && StringUtil.isNotEmpty(ssc) && ssc.equals(attachCardNo)) {
                    if (StringUtil.isNotEmpty(attachCardNo) && StringUtil.isNotEmpty(paySsc) && paySsc.equals(attachCardNo)) {
                        resIdNo = cards.getAttachIdNo();
                        resName = cards.getAttachName();
                        resSsc = cards.getAttachCardNo();
@@ -1132,6 +1132,7 @@ public class PatientPrescriptionPayService extends BaseService {
            map.put("settleType", "01"); //诊间医保结算
//            易联众新增字段代支付v1.3.7
            map.put("principalCardNo", ssc); //实际结算卡号（ 默认为绑卡主体卡号）
            prescriptionPay.setPrincipalCardNo(ssc);
            if (!patient.equals(repUid)) {
                String principalCardNo = null;
                Patient person = patientDao.findByCode(repUid);

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

@@ -694,7 +694,7 @@ public class OnePayService {
                Patient p = patientDao.findByCode(patient);
                p.setOpenid(openid);
//            增加绑定电子社保卡信息
                if (p.getSicardStatus()!=1){
                if (p.getSicardStatus()!=null && p.getSicardStatus()!=1){
                    p.setSicardTime(new Date());
                }
                patientDao.save(p);