Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java
#	svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -7558,15 +7558,15 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                cardNo = outpatientDO.getCardNo();
                            }
                            logger.info("cardNo:" + cardNo);
                            JSONObject jsonObject =entranceService.BS15054(patientMappingDO.getMappingCode(),prescriptionDO.getRealOrder(),demoFlag);
                           /* JSONObject jsonObject =entranceService.BS15054(patientMappingDO.getMappingCode(),prescriptionDO.getRealOrder(),demoFlag);
                            net.sf.json.JSONObject res = jsonObject.getJSONObject("resquest");
                            logger.info("获取待结算数据 res: " + res.toString());
                            String rsCode = res.getString("@RESULT");
                            String free= 0+"";
                            if ("0".equals(rsCode)) {
                                free = res.getString("@total_charge");
                            }
                            ylzPayService.msgPush("01", cardNo, "01", patientDO.getMobile(), "00", userNo, userName, idcard, voucherNo, applyDepaName, applyDoctorName, recipeTime, free, "1");
                            }*/
                            ylzPayService.msgPush("01", cardNo, "01", patientDO.getMobile(), "00", userNo, userName, idcard, voucherNo, applyDepaName, applyDoctorName, recipeTime, "0", "1");
                        }
                    }