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

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

@@ -456,7 +456,7 @@ public class PatientPrescriptionPayService extends BaseService {
            response.getWriter().write(e.getMessage());
        }
        //                记录log日志到数据库
        logService.saveHttpLog(isSuccess, config.getReturnUrl(), "长处方支付页面跳转", "POST", null, "", responses, error, logService.onepayType);
        logService.saveHttpLog(isSuccess, config.getRecipeReturnUrl(), "长处方支付页面跳转", "POST", null, "", responses, error, logService.onepayType);
        //记录支付log日志到数据库
        payLogService.addLog(prescription, 2, flag, 1);
        return resultMap;
@@ -753,6 +753,32 @@ public class PatientPrescriptionPayService extends BaseService {
                expressage.setExpressageHospitalName("顺丰快递");
                expressage.setCreateTime(now);//创建时间
                expressage.setOneselfPickupFlg(0);//是否自取 1是 0否
                expressage.setDel(1);//有效
                break;
            case 3:
                prescription.setDispensaryType(3);//取药类型:1 自取 2快递配送 3健管师配送
                //健管师配送
                expressage.setName(userName);//居民姓名
                expressage.setProvinceCode(userProvince);//省代码
                expressage.setProvinceName(userProvinceName);//省名称
                expressage.setCityCode(userCity);//市代码
                expressage.setCityName(userCityName);//市名称
                expressage.setTownCode(userTown);//区code
                expressage.setTownName(userTownName);//区名称
                expressage.setStreetCode(userStreet);//街道code
                expressage.setStreetName(userStreetName);//街道名称
                expressage.setAddress(userAddress);//居民详细地址
                //居民选择的要送达的服务站
                String userOrgCode = addressInfo.getString("code");
                String userOrgName = addressInfo.getString("name");
                String userOrgAddress = addressInfo.getString("address");
                expressage.setPatientHospitalCode(userOrgCode);
                expressage.setPatientHospitalName(userOrgName);
                expressage.setPatientHospitalAddress(userOrgAddress);
                expressage.setCreateTime(now);//创建时间
                expressage.setOneselfPickupFlg(0);//是否自取 1是 0否
                expressage.setDel(1);//有效
@@ -793,32 +819,6 @@ public class PatientPrescriptionPayService extends BaseService {
                message.setRelationCode(prescriptionCode);//业务关联code 续方code
                messageDao.save(message);
                break;
            case 3:
                prescription.setDispensaryType(3);//取药类型:1 自取 2快递配送 3健管师配送
                //健管师配送
                expressage.setName(userName);//居民姓名
                expressage.setProvinceCode(userProvince);//省代码
                expressage.setProvinceName(userProvinceName);//省名称
                expressage.setCityCode(userCity);//市代码
                expressage.setCityName(userCityName);//市名称
                expressage.setTownCode(userTown);//区code
                expressage.setTownName(userTownName);//区名称
                expressage.setStreetCode(userStreet);//街道code
                expressage.setStreetName(userStreetName);//街道名称
                expressage.setAddress(userAddress);//居民详细地址
                //居民选择的要送达的服务站
                String userOrgCode = addressInfo.getString("code");
                String userOrgName = addressInfo.getString("name");
                String userOrgAddress = addressInfo.getString("address");
                expressage.setPatientHospitalCode(userOrgCode);
                expressage.setPatientHospitalName(userOrgName);
                expressage.setPatientHospitalAddress(userOrgAddress);
                expressage.setCreateTime(now);//创建时间
                expressage.setOneselfPickupFlg(0);//是否自取 1是 0否
                expressage.setDel(1);//有效
                break;
        }