trick9191 7 tahun lalu
induk
melakukan
9bfd8edb32

+ 36 - 36
common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionPay.java

@ -59,42 +59,42 @@ public class PrescriptionPay extends IdEntity {
    private Date createTime;//续方确认支付时间
    private Date czrq;//续方记录最后操作时间
    //    易联众新增查询返回字段v1.3.7
    private String medOrgNo;//医疗机构编号
    private String medOrgName;//医疗机构名称
    private Date traceTime;//交易成功时间
    private String traceNo;//支付平台跟踪号
    public Date getTraceTime() {
        return traceTime;
    }
    public void setTraceTime(Date traceTime) {
        this.traceTime = traceTime;
    }
    public String getTraceNo() {
        return traceNo;
    }
    public void setTraceNo(String traceNo) {
        this.traceNo = traceNo;
    }
    public String getMedOrgNo() {
        return medOrgNo;
    }
    public void setMedOrgNo(String medOrgNo) {
        this.medOrgNo = medOrgNo;
    }
    public String getMedOrgName() {
        return medOrgName;
    }
    public void setMedOrgName(String medOrgName) {
        this.medOrgName = medOrgName;
    }
//    private String medOrgNo;//医疗机构编号
//    private String medOrgName;//医疗机构名称
//    private Date traceTime;//交易成功时间
//    private String traceNo;//支付平台跟踪号
//    public Date getTraceTime() {
//        return traceTime;
//    }
//
//    public void setTraceTime(Date traceTime) {
//        this.traceTime = traceTime;
//    }
//
//    public String getTraceNo() {
//        return traceNo;
//    }
//
//    public void setTraceNo(String traceNo) {
//        this.traceNo = traceNo;
//    }
//
//    public String getMedOrgNo() {
//        return medOrgNo;
//    }
//
//    public void setMedOrgNo(String medOrgNo) {
//        this.medOrgNo = medOrgNo;
//    }
//
//    public String getMedOrgName() {
//        return medOrgName;
//    }
//
//    public void setMedOrgName(String medOrgName) {
//        this.medOrgName = medOrgName;
//    }
    public Integer getAccountBalance() {
        return accountBalance;

+ 2 - 0
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());//处方配送方式

+ 2 - 0
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());//处方配送方式