Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@@ -90,6 +90,9 @@ public class Prescription extends IdEntity {
    private String prescribeReason; //开方失败/成功原因
    private Date prescribeTime;//开方失败、成功时间
    //用于药品用药情况排序
    private Integer minDrugDay; //药品最小用药天数
    private Date presCreateTime; //处方建立时间
    private String dispensaryTypeName; //类型翻译
@@ -669,4 +672,20 @@ public class Prescription extends IdEntity {
    public void setJwPayStatus(Integer jwPayStatus) {
        this.jwPayStatus = jwPayStatus;
    }
    public Integer getMinDrugDay() {
        return minDrugDay;
    }
    public void setMinDrugDay(Integer minDrugDay) {
        this.minDrugDay = minDrugDay;
    }
    public Date getPresCreateTime() {
        return presCreateTime;
    }
    public void setPresCreateTime(Date presCreateTime) {
        this.presCreateTime = presCreateTime;
    }
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionExpressage.java

@@ -72,6 +72,7 @@ public class PrescriptionExpressage extends IdEntity{
    private Date createTime;                //创建的时间
    private Integer del;    //1可用 0删除
    private Date deliveryTime; //送达时间
    public String getHospitalCode() {
        return hospitalCode;
@@ -415,4 +416,12 @@ public class PrescriptionExpressage extends IdEntity{
    public void setFetchingMedicineTime(Date fetchingMedicineTime) {
        this.fetchingMedicineTime = fetchingMedicineTime;
    }
    public Date getDeliveryTime() {
        return deliveryTime;
    }
    public void setDeliveryTime(Date deliveryTime) {
        this.deliveryTime = deliveryTime;
    }
}