服务包

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

@@ -84,10 +84,13 @@ public class ServicePackageDO extends UuidIdentityEntity implements Serializable
    private String name;//服务包名称
    private Integer num;//服务项数量
    private Long price;//预售价//单位分
    private String organization;//发布机构
    private String organizationName;//发布机构名称
    private String level;//服务包级别（0系统，1.医生，2团队，3社区，4区）
    private String creater;//创建者
    private Date createTime;//创建时间
    private String introduce;//服务介绍
    private String endIntroduce;//过期时间说明
    private String status;//审核状态（预留字段0待审核，1审核通过，2审核不通过）
    private Integer del;//是否有效（1有效，0失效）
    private Integer sort;//排序
@@ -213,4 +216,28 @@ public class ServicePackageDO extends UuidIdentityEntity implements Serializable
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getEndIntroduce() {
        return endIntroduce;
    }
    public void setEndIntroduce(String endIntroduce) {
        this.endIntroduce = endIntroduce;
    }
    public String getOrganization() {
        return organization;
    }
    public void setOrganization(String organization) {
        this.organization = organization;
    }
    public String getOrganizationName() {
        return organizationName;
    }
    public void setOrganizationName(String organizationName) {
        this.organizationName = organizationName;
    }
}

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

@@ -19,10 +19,13 @@ public class ServicePackageVO {
    private String name;//服务包名称
    private Integer num;//服务项数量
    private Long price;//预售价//单位分
    private String organization;//上架机构
    private String organizationName;//上架机构名称
    private String level;//服务包级别（0系统，1.医生，2团队，3社区，4区）
    private String creater;//创建者
    private Date createTime;//创建时间
    private String introduce;//服务介绍
    private String endIntroduce;//过期描述
    private String status;//审核状态（预留字段0待审核，1审核通过，2审核不通过）
    private Integer del;//是否有效（1有效，0失效）
@@ -132,6 +135,14 @@ public class ServicePackageVO {
        this.introduce = introduce;
    }
    public String getEndIntroduce() {
        return endIntroduce;
    }
    public void setEndIntroduce(String endIntroduce) {
        this.endIntroduce = endIntroduce;
    }
    public String getStatus() {
        return status;
    }
@@ -155,4 +166,20 @@ public class ServicePackageVO {
    public void setItems(List<SerivePackageItemVO> items) {
        this.items = items;
    }
    public String getOrganization() {
        return organization;
    }
    public void setOrganization(String organization) {
        this.organization = organization;
    }
    public String getOrganizationName() {
        return organizationName;
    }
    public void setOrganizationName(String organizationName) {
        this.organizationName = organizationName;
    }
}

gateway/ag-basic/src/main/resources/application.yml

@@ -38,16 +38,16 @@ zuul:
  sensitive-headers:
  routes:
    svr-iot:
      path: /iot/**
      path: /csijk/iot/**
      serviceId: svr-iot
    svr-base:
      path: /base/**
      path: /csijk/base/**
      serviceId: svr-base
    svr-authentication:
      path: /auth/**
      path: /csijk/auth/**
      serviceId: svr-authentication
    svr-healthy-house:
      path: /healthyHouse/**
      path: /csijk/healthyHouse/**
      serviceId: svr-healthy-house

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/PatientApplyLogService.java

@@ -3,6 +3,8 @@ package com.yihu.jw.patient.service.myFamily;
import com.yihu.jw.entity.myFamily.PatientApplyLog;
import com.yihu.jw.patient.dao.myFamily.PatientApplyLogDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * @author liuwenbin on 2018/11/30.

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

@@ -84,9 +84,12 @@ public class PackageService {
                " p.city_code AS cityCode, " +
                " p.city_name AS cityName, " +
                " p.introduce AS introduce, " +
                " p.end_introduce AS endIntroduce," +
                " p.`name` , " +
                " p.num , " +
                " p.price, " +
                " p.organization," +
                " p.organization_name AS organizationName," +
                " p.level " +
                " FROM " +
                " base_service_package p " ;