Browse Source

处方详情查看加入支付信息

wangjun 4 năm trước cách đây
mục cha
commit
63345dcc76

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

@ -538,9 +538,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (prescriptionDOs != null && prescriptionDOs.size() > 0) {
        if (prescriptionDOs != null && prescriptionDOs.size() > 0) {
            convertToModels(prescriptionDOs, prescriptionVOs, WlyyPrescriptionVO.class);
            convertToModels(prescriptionDOs, prescriptionVOs, WlyyPrescriptionVO.class);
            for (WlyyPrescriptionVO vo : prescriptionVOs) {
            for (WlyyPrescriptionVO vo : prescriptionVOs) {
                List<WlyyPrescriptionCheckDO> prescriptionCheckDO = prescriptionCheckDao.findByPrescriptionId(vo.getId());
                //疾病信息
                //疾病信息
                vo.setDiagnosisVOs(findDiagnosisById(vo.getId()));
                vo.setDiagnosisVOs(findDiagnosisById(vo.getId()));
                if(null!=prescriptionCheckDO&&prescriptionCheckDO.size()>0){
                    vo.setDispUser(prescriptionCheckDO.get(0).getOperate());
                    vo.setDispUserName(prescriptionCheckDO.get(0).getOperateName());
                }
                //药品信息
                //药品信息
                List<WlyyPrescriptionInfoVO> infoVOs = new ArrayList<>();
                List<WlyyPrescriptionInfoVO> infoVOs = new ArrayList<>();

+ 9 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionVO.java

@ -397,7 +397,16 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "医生职称名称", example = "模块1")
    @ApiModelProperty(value = "医生职称名称", example = "模块1")
    private String jobTitleName;
    private String jobTitleName;
    @ApiModelProperty(value = "单据号", example = "模块1")
    private String voucherNo;
    public String getVoucherNo() {
        return voucherNo;
    }
    public void setVoucherNo(String voucherNo) {
        this.voucherNo = voucherNo;
    }
    public Double getDrugFee() {
    public Double getDrugFee() {
        return drugFee;
        return drugFee;