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

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageSignRecordDO.java

@@ -36,6 +36,8 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntity implements Se
    private String operator;//签约申请人处理人
    private Date createTime;//创建时间
    private Integer sort;//排序：0 待支付，1未通过，2未通过，3待审核，4.生效
    private String cancelReason;//取消原因
    private String reviewReason;//审核原因
    @Column(name = "saas_id")
    public String getSaasId() {
@@ -207,4 +209,20 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntity implements Se
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getCancelReason() {
        return cancelReason;
    }
    public void setCancelReason(String cancelReason) {
        this.cancelReason = cancelReason;
    }
    public String getReviewReason() {
        return reviewReason;
    }
    public void setReviewReason(String reviewReason) {
        this.reviewReason = reviewReason;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/patient/signPackage/ServicePackageRecordVO.java

@@ -7,6 +7,7 @@ import java.util.Date;
 */
public class ServicePackageRecordVO {
    private String id;
    private String saasId;
    private String servicePackageId;//服务包id
    private String servicePackageName;//服务包名称
@@ -27,10 +28,19 @@ public class ServicePackageRecordVO {
    private String operator;//签约申请人处理人
    private Date createTime;//创建时间
    private Integer sort;//排序：0 待支付，1未通过，2未通过，3待审核，4.生效
    private String cancelReason;//取消原因
    private String reviewReason;//审核原因
    private String introduce;//服务介绍
    private String endIntroduce;//过期时间说明
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {
        return saasId;
    }
@@ -206,4 +216,20 @@ public class ServicePackageRecordVO {
    public void setEndIntroduce(String endIntroduce) {
        this.endIntroduce = endIntroduce;
    }
    public String getCancelReason() {
        return cancelReason;
    }
    public void setCancelReason(String cancelReason) {
        this.cancelReason = cancelReason;
    }
    public String getReviewReason() {
        return reviewReason;
    }
    public void setReviewReason(String reviewReason) {
        this.reviewReason = reviewReason;
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/servicepackage/PackageService.java

@@ -107,7 +107,8 @@ public class PackageService {
                " p.price, " +
                " p.organization," +
                " p.organization_name AS organizationName," +
                " p.level " +
                " p.level," +
                " P.end_time AS endTime" +
                " FROM " +
                " base_service_package p " ;
                if(StringUtils.isNotBlank(labelCode)&&StringUtils.isNotBlank(labelType)){
@@ -385,17 +386,16 @@ public class PackageService {
                }else if("3".equals(familyModel)){
                    //查询已经授权，自己创建和家人相关记录
                    if(StringUtils.isNotBlank(patient)&&StringUtils.isNotBlank(operator)){
                        sql +=" AND (r.operator = '"+operator+"' " +
                                " OR r.patient = '"+patient+"' )";
                        sql +=" AND r.patient = '"+patient+"'";
                    }
                }
                if(status != null){
                    sql +=" AND r.`status` ="+status;
                }
                if(StringUtils.isNotBlank(isHos)){
                    sql +=" AND r.`status` < 0 ";
                    sql +=" AND r.`status` < -1 ";
                }else{
                    sql +=" AND r.`status` >= 0 ";
                    sql +=" AND r.`status` >= -1 ";
                }
                if(StringUtils.isNotBlank(label)&&StringUtils.isNotBlank(labelType)){
@@ -434,7 +434,9 @@ public class PackageService {
                " r.create_time AS createTime," +
                " r.sort," +
                " p.introduce, " +
                " p.end_introduce AS endIntroduce " +
                " p.end_introduce AS endIntroduce," +
                " r.cancel_reason," +
                " r.review_reason " +
                " FROM " +
                " base_service_package_sign_record r  " +
                " JOIN base_service_package p ON r.service_package_id = p.id " +