代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorServiceOrderDO.java

@@ -215,9 +215,10 @@ public class WlyyDoorServiceOrderDO extends UuidIdentityEntityWithOperator {
    }
    private String packageId;//服务包的id
    private String feeAfter;//服务后收费标识（1是0否）
    private String signId;//签约id
    private String planId;//服务包的id---改成计划id ==>planId
    private String planItemDetailId;//签约id ---改成详情id===>planItemDetailId
    private String feeAfter;//服务后收费标识（1是0否）--这个暂时没用
    /**
@@ -1266,13 +1267,7 @@ public class WlyyDoorServiceOrderDO extends UuidIdentityEntityWithOperator {
        this.nursingStaffType = nursingStaffType;
    }
    public String getPackageId() {
        return packageId;
    }
    public void setPackageId(String packageId) {
        this.packageId = packageId;
    }
    public String getFeeAfter() {
        return feeAfter;
@@ -1282,11 +1277,20 @@ public class WlyyDoorServiceOrderDO extends UuidIdentityEntityWithOperator {
        this.feeAfter = feeAfter;
    }
    public String getSignId() {
        return signId;
    public String getPlanId() {
        return planId;
    }
    public void setPlanId(String planId) {
        this.planId = planId;
    }
    public String getPlanItemDetailId() {
        return planItemDetailId;
    }
    public void setSignId(String signId) {
        this.signId = signId;
    public void setPlanItemDetailId(String planItemDetailId) {
        this.planItemDetailId = planItemDetailId;
    }
}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/DoorOrderService.java

@@ -1398,11 +1398,11 @@ public class DoorOrderService {
        doorServiceOrderDao.save(one);
        //
        String signId = one.getSignId();//签约id
        String packageId = one.getPackageId();//服务包id
        String planId = one.getPlanId();//计划id
        String planItemDetailId = one.getPlanItemDetailId();//计划服务项id
        Date date = new Date();
        //更新计划状态为完成
//        serviceItemPlanDao.updateState(signId, packageId, date);
        serviceItemPlanDao.updateState(planId, planItemDetailId, date);
        WlyyDoorServiceOrderDO doorServiceOrderDO = this.getDoorServiceOrderById(orderId, level);