|
|
@ -452,6 +452,10 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
rs.put("doctorCancelValue",outpatientDO.getDoctorCancelValue());
|
|
|
rs.put("doctorCancelRemark",outpatientDO.getDoctorCancelRemark());
|
|
|
rs.put("payStatus",outpatientDO.getPayStatus());
|
|
|
rs.put("patientCancelType",outpatientDO.getPatientCancelType());
|
|
|
rs.put("patientCancelValue",outpatientDO.getPatientCancelValue());
|
|
|
rs.put("patientCancelRemark",outpatientDO.getPatientCancelRemark());
|
|
|
rs.put("operator",userAgent.getUID());
|
|
|
//居民详情
|
|
|
BasePatientDO basePatientDO = basePatientDao.findById(outpatientDO.getPatient());
|
|
|
rs.put("patientName",basePatientDO.getName());
|
|
|
@ -3895,7 +3899,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
" a.total AS \"consultTotal\"," +
|
|
|
" h.org_name AS \"orgName\"," +
|
|
|
" h.org_code AS \"orgCode\"," +
|
|
|
" follow.id AS followid "+
|
|
|
" follow.id AS \"followid\" "+
|
|
|
" FROM " +
|
|
|
" base_doctor d " +
|
|
|
" JOIN base_doctor_hospital h ON h.doctor_code = d.id "+
|
