Merge branch 'dev' of trick9191/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionInfoDO.java

@@ -43,12 +43,12 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
    private String dosage;
    /**
     *
     *数量
     */
    private String quantity;
    /**
     *
     *单位
     */
    private String unit;

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

@@ -281,6 +281,12 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "处方结算状态，0为未结算，1为结算成功，默认为0", example = "模块1")
    private Integer payStatus;
    @ApiModelProperty(value = "关联诊断实体", example = "模块1")
    List<WlyyPrescriptionDiagnosisVO> diagnosisVOs;
    @ApiModelProperty(value = "关联药品实体", example = "模块1")
    List<WlyyPrescriptionInfoVO> infoVOs;
    public String getRealOrder() {
        return realOrder;
@@ -576,5 +582,19 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
        this.payStatus = payStatus;
    }
    public List<WlyyPrescriptionDiagnosisVO> getDiagnosisVOs() {
        return diagnosisVOs;
    }
    public void setDiagnosisVOs(List<WlyyPrescriptionDiagnosisVO> diagnosisVOs) {
        this.diagnosisVOs = diagnosisVOs;
    }
    public List<WlyyPrescriptionInfoVO> getInfoVOs() {
        return infoVOs;
    }
    public void setInfoVOs(List<WlyyPrescriptionInfoVO> infoVOs) {
        this.infoVOs = infoVOs;
    }
}