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

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

@@ -49,6 +49,8 @@ public class PrescriptionExpressage extends IdEntity {
    private Date createTime;                //创建的时间
    private Integer del;    //1可用 0删除
    private Date deliveryTime; //送达时间
    @Column(name = "code", unique = true , nullable=false)
@@ -304,4 +306,12 @@ public class PrescriptionExpressage extends IdEntity {
    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }
    public Date getDeliveryTime() {
        return deliveryTime;
    }
    public void setDeliveryTime(Date deliveryTime) {
        this.deliveryTime = deliveryTime;
    }
}

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

@@ -832,10 +832,6 @@ public class PrescriptionService extends ZysoftBaseService{
        params.put("visitNo",visitNo);
        String response = postSecond("getDispUnSettleFeeInfoList","查询处方结算结果列表",params,null,header,false,2);
        //添加日志到wlyy_zy_push_log表
        addZyPushLog(response,"getDispUnSettleFeeInfoList","查询处方结算结果列表",null  ,"POST","","2","");
        return response;
    }
@@ -844,6 +840,7 @@ public class PrescriptionService extends ZysoftBaseService{
     * @param  prescriptionCode 处方号
     * @throws Exception
     */
    @Transactional
    public String executeSickSettle(String prescriptionCode)  throws Exception
    {
        Prescription prescription = prescriptionDao.findByCode(prescriptionCode);
@@ -905,10 +902,6 @@ public class PrescriptionService extends ZysoftBaseService{
        }
        String response = postSecond("executeSickSettle","院内结算确认接口",null,json,header,false,2);
        //添加日志到wlyy_zy_push_log表
        addZyPushLog(response,"executeSickSettle","院内结算确认接口",null  ,"POST","","3","");
        if(StringUtils.isNotBlank(response)){
            JSONObject reobj =  JSON.parseObject(response);
            Integer code = reobj.getInteger("CODE");
@@ -1038,7 +1031,12 @@ public class PrescriptionService extends ZysoftBaseService{
        vo.setD_phone(prescriptionExpressage.getPhone());
        vo.setPay_method(2);
        vo.setExpress_type(11);
        vo.setReceive_time("");//---2017.08.22-huangwnejie,新增收件时间，默认先放空
        //---2017.08.30-huangwnejie,新增收件时间
        if(prescriptionExpressage.getDeliveryTime() != null ){
            vo.setReceive_time(DateUtil.dateToStrLong(prescriptionExpressage.getDeliveryTime()));
        }else{
            vo.setReceive_time("");
        }
        vo.setInfos(prescriptionInfolist);