Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -177,24 +177,24 @@ public class PatientPrescriptionPayService extends BaseService {
            Map temp = new HashMap();
            String code = (String) hspital.get("code");
            String name = (String) hspital.get("name");
            provinceCode = (String) hspital.get("provinceCode");
            provinceName = (String) hspital.get("provinceName");
            cityCode = (String) hspital.get("cityCode");
            cityName = (String) hspital.get("cityName");
            townCode = (String) hspital.get("townCode");
            townName = (String) hspital.get("townName");
            streeCode = (String) hspital.get("streeCode");
            address = (String) hspital.get("address");
            String manageProvinceCode = (String) hspital.get("provinceCode");
            String manageProvinceName = (String) hspital.get("provinceName");
            String manageCityCode = (String) hspital.get("cityCode");
            String manageCityName = (String) hspital.get("cityName");
            String manageTownCode = (String) hspital.get("townCode");
            String manageTownName = (String) hspital.get("townName");
            String manageStreeCode = (String) hspital.get("streeCode");
            String manageAddress = (String) hspital.get("address");
            temp.put("code", code);
            temp.put("name", name);
            temp.put("provinceCode", provinceCode);
            temp.put("provinceName", provinceName);
            temp.put("cityCode", cityCode);
            temp.put("cityName", cityName);
            temp.put("townCode", townCode);
            temp.put("townName", townName);
            temp.put("streeCode", streeCode);
            temp.put("address", address);
            temp.put("provinceCode", manageProvinceCode);
            temp.put("provinceName", manageProvinceName);
            temp.put("cityCode", manageCityCode);
            temp.put("cityName", manageCityName);
            temp.put("townCode", manageTownCode);
            temp.put("townName", manageTownName);
            temp.put("streeCode", manageStreeCode);
            temp.put("address", manageAddress);
            manage.add(temp);
        }
        //                社区下没有服务站只能自取或快递
@@ -835,6 +835,7 @@ public class PatientPrescriptionPayService extends BaseService {
            //* ***************************  伪造数据 *************************************** ***************************  测通流程 ***************************************
//            JSONObject jsonParams = prescriptionService.getPayInfo("D21085562", "3277903");
            String visitNo = prescription.getVisitNo();//续方挂号号
            LOGGER.debug("======================> getPayInfo " + ssc + visitNo);
            if (visitNo == null || ssc == null) {
                resultMap.put("status", "-2");
                return resultMap;