Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/prescription/VO/PrescriptionExpressageVO.java

@@ -50,6 +50,8 @@ public class PrescriptionExpressageVO extends Result {
    private Integer pay_method;
    private String receive_time;//收件时间
    
    private Integer dispensaryType;//取药类型:1 自取 2快递配送 3健管师配送
    //订单的药品详情
    private List<PrescriptionInfo> infos = new ArrayList<>();
@@ -205,4 +207,12 @@ public class PrescriptionExpressageVO extends Result {
    public void setReceive_time(String receive_time) {
        this.receive_time = receive_time;
    }
    
    public Integer getDispensaryType() {
        return dispensaryType;
    }
    
    public void setDispensaryType(Integer dispensaryType) {
        this.dispensaryType = dispensaryType;
    }
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/prescription/PrescriptionService.java

@@ -1088,7 +1088,7 @@ public class PrescriptionService extends ZysoftBaseService{
        vo.setD_cityName(prescriptionExpressage.getCityName());
        vo.setD_townName(prescriptionExpressage.getTownName());
        vo.setD_address(prescriptionExpressage.getAddress());
        vo.setD_phone(prescriptionExpressage.getPhone());
        vo.setD_phone(prescriptionExpressage.getMobile());
        vo.setPay_method(2);
        vo.setExpress_type(11);
        //---2017.08.30-huangwnejie,新增收件时间
@@ -1097,7 +1097,10 @@ public class PrescriptionService extends ZysoftBaseService{
        }else{
            vo.setReceive_time("");
        }
    
        //---2017.09.25-huangwnejie,增加取药类型:1 自取 2快递配送 3健管师配送
        vo.setDispensaryType(prescription.getDispensaryType());
        
        vo.setInfos(prescriptionInfolist);
        return Result.success("查询成功",vo);