服务包id

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;//服务包名称
@@ -31,6 +32,14 @@ public class ServicePackageRecordVO {
    private String introduce;//服务介绍
    private String endIntroduce;//过期时间说明
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {
        return saasId;
    }

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

@@ -384,8 +384,7 @@ 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){