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/web/doctor/prescription/PrescriptionInfoController.java

@@ -212,6 +212,8 @@ public class PrescriptionInfoController extends BaseController {
            jo.put("prescriptionExpressage", prescriptionExpressage);
            jo.put("leadCode", adminTeam.getLeaderCode());//团队长code
            if (prescription != null) {
                jo.put("createTime", prescription.getCreateTime());//创建时间
                jo.put("doctorName", prescription.getDoctorName());//审核医生
                jo.put("prescriptionHospital", prescription.getHospitalName());//出药机构
                jo.put("dispensaryDispensaryType", prescription.getDispensaryType());//处方配送方式
                jo.put("dispensaryDispensaryTypeName", prescription.getDispensaryTypeName());//处方配送方式

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionController.java

@@ -236,6 +236,8 @@ public class PatientPrescriptionController extends WeixinBaseController {
            jo.put("prescriptionPay", prescriptionPay);
            jo.put("prescriptionInfos", prescriptionInfos);
            if (prescription != null) {
                jo.put("createTime", prescription.getCreateTime());//创建时间
                jo.put("doctorName", prescription.getDoctorName());//审核医生
                jo.put("prescriptionHospital", prescription.getHospitalName());//出药机构
                jo.put("dispensaryDispensaryType", prescription.getDispensaryType());//处方配送方式
                jo.put("dispensaryDispensaryTypeName", prescription.getDispensaryTypeName());//处方配送方式