瀏覽代碼

代码修改

LAPTOP-KB9HII50\70708 2 年之前
父節點
當前提交
2af7004b9e
共有 100 個文件被更改,包括 13348 次插入22 次删除
  1. 165 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/address/Address.java
  2. 81 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/address/AddressDict.java
  3. 37 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/apps/AppApiCategory.java
  4. 79 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/apps/AppApiErrorCode.java
  5. 86 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/apps/AppVersion.java
  6. 1 1
      common/common-util/src/main/java/com/yihu/jw/util/id/BizObject.java
  7. 1 1
      common/common-util/src/main/java/com/yihu/jw/util/id/ObjectId.java
  8. 129 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/oauth2/OauthClientDetails.java
  9. 66 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/LdapEntries.java
  10. 135 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgDept.java
  11. 226 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgDeptDetail.java
  12. 95 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgHealthCategory.java
  13. 247 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgMemberRelation.java
  14. 65 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgSaas.java
  15. 875 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/Organization.java
  16. 169 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/AbstractCard.java
  17. 185 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/ArchiveApply.java
  18. 189 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/ArchiveRelation.java
  19. 146 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/Authentication.java
  20. 66 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/DemographicId.java
  21. 183 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/DemographicInfo.java
  22. 84 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/Families.java
  23. 149 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/MedicalCards.java
  24. 67 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/Members.java
  25. 162 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/PhysicalCard.java
  26. 246 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/UserCards.java
  27. 123 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/VirtualCard.java
  28. 145 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResource.java
  29. 114 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceDownload.java
  30. 105 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareDb.java
  31. 172 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareMaster.java
  32. 394 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareResult.java
  33. 197 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareServer.java
  34. 172 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceSoftwareMaster.java
  35. 341 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceSoftwareResult.java
  36. 207 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalAccountRepresentation.java
  37. 106 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalDoctorShortcut.java
  38. 174 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalFeedback.java
  39. 3 3
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/PortalMessageTemplate.java
  40. 120 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalNotices.java
  41. 120 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalSetting.java
  42. 113 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalStandards.java
  43. 6 4
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/ProtalMessageRemind.java
  44. 111 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyAnswers.java
  45. 65 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyLabelInfo.java
  46. 138 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyOptionAnswers.java
  47. 128 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyQuestion.java
  48. 93 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyQuestionOption.java
  49. 154 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyStatistics.java
  50. 95 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyTemplate.java
  51. 120 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyTemplateOptions.java
  52. 166 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyTemplateQuestions.java
  53. 198 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/JsonArchives.java
  54. 155 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/JsonReport.java
  55. 115 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReport.java
  56. 69 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportDataset.java
  57. 105 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportDatasets.java
  58. 155 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportDetail.java
  59. 164 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportMetadata.java
  60. 103 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaDict.java
  61. 214 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaResult.java
  62. 106 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaResultAnalyse.java
  63. 186 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaResultDetail.java
  64. 77 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/security/UserKey.java
  65. 90 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/security/UserSecurity.java
  66. 108 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/security/UserToken.java
  67. 578 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/Doctors.java
  68. 44 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleApiRelation.java
  69. 43 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleAppRelation.java
  70. 43 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleFeatureRelation.java
  71. 44 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleOrg.java
  72. 45 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleReportRelation.java
  73. 43 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleUser.java
  74. 81 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/Roles.java
  75. 421 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/User.java
  76. 94 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserLoginLog.java
  77. 79 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserTelVerification.java
  78. 52 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserType.java
  79. 71 0
      common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserTypeRoles.java
  80. 214 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MApp.java
  81. 181 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApi.java
  82. 186 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApiDetail.java
  83. 114 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApiParameter.java
  84. 78 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApiResponse.java
  85. 150 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppFeature.java
  86. 97 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MUserApp.java
  87. 181 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/OpenAppApi.java
  88. 88 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/MConventionalDict.java
  89. 63 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/MDictionaryEntry.java
  90. 77 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/MSystemDict.java
  91. 12 13
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/tj/MapDataModel.java
  92. 82 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/SystemDictEntryAppModel.java
  93. 71 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/family/MFamilies.java
  94. 55 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/family/MMembers.java
  95. 142 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/geography/MGeography.java
  96. 71 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/geography/MGeographyDict.java
  97. 158 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MAbstractCard.java
  98. 160 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MArApply.java
  99. 69 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MArRelation.java
  100. 0 0
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MAuthentication.java

+ 165 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/address/Address.java

@ -0,0 +1,165 @@
package com.yihu.jw.entity.ehr.address;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * @author Sand
 * @version 1.0
 * @updated 25-05-2015 19:56:00
 */
@Entity
@Table(name = "addresses")
@Access(value = AccessType.PROPERTY)
public class Address {
    private String id;
    private String country;
    private String province;
    private String city;
    private String district;
    private String town;
    private String street;
    private String extra;
    private String postalCode;
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "assigned")
    @Column(name = "id", unique = true, nullable = false)
    public String getId() {
        return id;
    } public void setId(String id) {
        this.id = id;
    }
    @Column(name = "country",  nullable = true)
    public String getCountry() {
        return country;
    }
    public void setCountry(String country) {
        this.country = country;
    }
    @Column(name = "province",  nullable = true)
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    @Column(name = "city",  nullable = true)
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    @Column(name = "district",  nullable = true)
    public String getDistrict() {
        return district;
    }
    public void setDistrict(String district) {
        this.district = district;
    }
    @Column(name = "town",  nullable = true)
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    @Column(name = "street",  nullable = true)
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
    @Column(name = "extra",  nullable = true)
    public String getExtra() {
        return extra;
    }
    public void setExtra(String extra) {
        this.extra = extra;
    }
    @Column(name = "postal_code",  nullable = true)
    public String getPostalCode() {
        return postalCode;
    }
    public void setPostalCode(String postalCode) {
        this.postalCode = postalCode;
    }
//
//
//
//    public String getCanonicalAddress() {
//        String address = "";
//        //if (country != null) address += country;
//        if (province != null){
//            address += province;
//            if (city != null) {
//                if (!province.equals(city)){
//                    address += city;
//                }
//            }
//        }
//        if (district != null) address += district;
//        if (town != null) address += town;
//        if (street != null) address += street;
//        if (extra != null) address += extra;
//
//        return address;
//    }
//
//    public boolean isNullAddress() {
//        return province == null && city == null && district == null && town == null && country == null && street == null;
//    }
//
//    public boolean isAvailable(){
//        if(country == null && province == null) return false;
//        if(province == null && city != null) return false;
//        if(city == null && district != null) return false;
//        return true;
//    }
//
//    public boolean equals(Object o) {
//        if (this == o) return true;
//        if (o == null || getClass() != o.getClass()) return false;
//
//        Address address = (Address) o;
//
//        //if (id != address.id) return false;
//        if (country != null ? !country.equals(address.country) : address.country != null) return false;
//        if (province != null ? !province.equals(address.province) : address.province != null) return false;
//        if (city != null ? !city.equals(address.city) : address.city != null) return false;
//        if (district != null ? !district.equals(address.district) : address.district != null) return false;
//        if (town != null ? !town.equals(address.town) : address.town != null) return false;
//        if (street != null ? !street.equals(address.street) : address.street != null) return false;
//        if (extra != null ? !extra.equals(address.extra) : address.extra != null) return false;
//        if (postalCode != null ? !postalCode.equals(address.postalCode) : address.postalCode != null) return false;
//
//        return true;
//    }
//
//    public int hashCode() {
//        int result = 1;
//        result = 31 * result + (country != null ? country.hashCode() : 0);
//        result = 31 * result + (province != null ? province.hashCode() : 0);
//        result = 31 * result + (city != null ? city.hashCode() : 0);
//        result = 31 * result + (district != null ? district.hashCode() : 0);
//        result = 31 * result + (town != null ? town.hashCode() : 0);
//        result = 31 * result + (street != null ? street.hashCode() : 0);
//        result = 31 * result + (extra != null ? extra.hashCode() : 0);
//        result = 31 * result + (postalCode != null ? postalCode.hashCode() : 0);
//        return result;
//    }
}

+ 81 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/address/AddressDict.java

@ -0,0 +1,81 @@
package com.yihu.jw.entity.ehr.address;
import javax.persistence.*;
/**
 * 地址字典
 * @author zqb
 * @version 1.0
 * @created 30-六月-2015 15:59:31
 */
@Entity
@Table(name = "address_dict")
@Access(value = AccessType.PROPERTY)
public class AddressDict {
    private int id;   //序号
    private String abbreviation;    //简称
    private int level;  //级别
    private String name;  //名字
    private int pid; //上级序号
    private String postCode;  //邮政编码
    public AddressDict(){
        //id  = Integer.parseInt(UUID.randomUUID().toString());
    }
    @Id
    @Column(name = "id", unique = true, nullable = false)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Column(name = "abbreviation", nullable = true)
    public String getAbbreviation() {
        return abbreviation;
    }
    public void setAbbreviation(String abbreviation) {
        this.abbreviation = abbreviation;
    }
    @Column(name = "level",  nullable = false)
    public int getLevel() {
        return level;
    }
    public void setLevel(int level) {
        this.level = level;
    }
    @Column(name = "name",  nullable = false)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "pid",  nullable = true)
    public int getPid() {
        return pid;
    }
    public void setPid(int pid) {
        this.pid = pid;
    }
    @Column(name = "post_code",  nullable = true)
    public String getPostcode() {
        return postCode;
    }
    public void setPostcode(String postCode) {
        this.postCode = postCode;
    }
}

+ 37 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/apps/AppApiCategory.java

@ -0,0 +1,37 @@
package com.yihu.jw.entity.ehr.apps;
import com.yihu.jw.entity.BaseIdentityEntity;
import javax.persistence.*;
/**
 * Entity - Api业务类别
 * Created by progr1mmer on 2018/3/14.
 */
@Entity
@Table(name = "app_api_category")
@Access(value = AccessType.PROPERTY)
public class AppApiCategory extends BaseIdentityEntity {
    private String name;
    private String description;
    @Column(name = "name", nullable = false)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "description", nullable = false)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
}

+ 79 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/apps/AppApiErrorCode.java

@ -0,0 +1,79 @@
package com.yihu.jw.entity.ehr.apps;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * Entity - Api错误码说明
 * Created by progr1mmer on 2018/3/14.
 */
@Entity
@Table(name = "app_api_error_code")
@Access(value = AccessType.PROPERTY)
public class AppApiErrorCode {
    private Integer id; //id
    private Integer appApiId; //apiId
    private Integer code; //错误码
    private String description; //描述
    private String solve; //解决方案
    private Integer sort; //序号
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "app_api_id", nullable = false)
    public Integer getAppApiId() {
        return appApiId;
    }
    public void setAppApiId(Integer appApiId) {
        this.appApiId = appApiId;
    }
    @Column(name = "code", nullable = false)
    public Integer getCode() {
        return code;
    }
    public void setCode(Integer code) {
        this.code = code;
    }
    @Column(name = "description", nullable = false)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Column(name = "solve", nullable = false)
    public String getSolve() {
        return solve;
    }
    public void setSolve(String solve) {
        this.solve = solve;
    }
    @Column(name = "sort", nullable = false)
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
}

+ 86 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/apps/AppVersion.java

@ -0,0 +1,86 @@
package com.yihu.jw.entity.ehr.apps;
import com.yihu.jw.entity.BaseAssignedEntity;
import javax.persistence.*;
/**
 * Created by Trick on 2018/3/12.
 */
@Entity
@Table(name = "app_version")
@Access(value = AccessType.PROPERTY)
public class AppVersion extends BaseAssignedEntity {
    private String code; //版本(用于区分大小版本)
    private String name; //版本名称
    private Double versionInt; //数字版本号
    private String versionStr; //字符串版本号
    private String url; //更新链接地址
    private String info; //版本信息
    private Double size; //升级包大小,单位M
    @Column(name = "code", nullable = false)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "size", nullable = false)
    public Double getSize() {
        return size;
    }
    public void setSize(Double size) {
        this.size = size;
    }
    @Column(name = "name", nullable = false)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "version_int", nullable = false)
    public Double getVersionInt() {
        return versionInt;
    }
    public void setVersionInt(Double versionInt) {
        this.versionInt = versionInt;
    }
    @Column(name = "version_str", nullable = false)
    public String getVersionStr() {
        return versionStr;
    }
    public void setVersionStr(String versionStr) {
        this.versionStr = versionStr;
    }
    @Column(name = "url", nullable = false)
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    @Column(name = "info", nullable = false)
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
}

+ 1 - 1
common/common-util/src/main/java/com/yihu/jw/util/id/BizObject.java

@ -1,4 +1,4 @@
package com.yihu.jw.util.id;
package com.yihu.jw.entity.ehr.id;
/**
 * 业务对象划分, 全局唯一ID会使用此划分. 因为 ObjectId 中仅使用一个short作为

+ 1 - 1
common/common-util/src/main/java/com/yihu/jw/util/id/ObjectId.java

@ -1,4 +1,4 @@
package com.yihu.jw.util.id;
package com.yihu.jw.entity.ehr.id;
import java.io.Serializable;

+ 129 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/oauth2/OauthClientDetails.java

@ -0,0 +1,129 @@
package com.yihu.jw.entity.ehr.oauth2;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * Entity - Oauth2
 * Created by progr1mmer on 2018/1/23.
 */
@Entity
@Table(name = "oauth_client_details")
@Access(value = AccessType.PROPERTY)
public class OauthClientDetails {
    private String clientId;
    private String resourceIds;
    private String clientSecret;
    private String scope;
    private String authorizedGrantTypes;
    private String webServerRedirectUri;
    private String authorities;
    private Integer accessTokenValidity;
    private Integer refreshTokenValidity;
    private String additionalInformation;
    private String autoApprove;
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "assigned")
    @Column(name = "client_id", nullable = false)
    public String getClientId() {
        return clientId;
    }
    public void setClientId(String clientId) {
        this.clientId = clientId;
    }
    @Column(name = "resource_ids")
    public String getResourceIds() {
        return resourceIds;
    }
    public void setResourceIds(String resourceIds) {
        this.resourceIds = resourceIds;
    }
    @Column(name = "client_secret")
    public String getClientSecret() {
        return clientSecret;
    }
    public void setClientSecret(String clientSecret) {
        this.clientSecret = clientSecret;
    }
    @Column(name = "scope")
    public String getScope() {
        return scope;
    }
    public void setScope(String scope) {
        this.scope = scope;
    }
    @Column(name = "authorized_grant_types")
    public String getAuthorizedGrantTypes() {
        return authorizedGrantTypes;
    }
    public void setAuthorizedGrantTypes(String authorizedGrantTypes) {
        this.authorizedGrantTypes = authorizedGrantTypes;
    }
    @Column(name = "web_server_redirect_uri")
    public String getWebServerRedirectUri() {
        return webServerRedirectUri;
    }
    public void setWebServerRedirectUri(String webServerRedirectUri) {
        this.webServerRedirectUri = webServerRedirectUri;
    }
    @Column(name = "authorities")
    public String getAuthorities() {
        return authorities;
    }
    public void setAuthorities(String authorities) {
        this.authorities = authorities;
    }
    @Column(name = "access_token_validity")
    public Integer getAccessTokenValidity() {
        return accessTokenValidity;
    }
    public void setAccessTokenValidity(Integer accessTokenValidity) {
        this.accessTokenValidity = accessTokenValidity;
    }
    @Column(name = "refresh_token_validity")
    public Integer getRefreshTokenValidity() {
        return refreshTokenValidity;
    }
    public void setRefreshTokenValidity(Integer refreshTokenValidity) {
        this.refreshTokenValidity = refreshTokenValidity;
    }
    @Column(name = "additional_information")
    public String getAdditionalInformation() {
        return additionalInformation;
    }
    public void setAdditionalInformation(String additionalInformation) {
        this.additionalInformation = additionalInformation;
    }
    @Column(name = "autoapprove")
    public String getAutoApprove() {
        return autoApprove;
    }
    public void setAutoApprove(String autoApprove) {
        this.autoApprove = autoApprove;
    }
}

+ 66 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/LdapEntries.java

@ -0,0 +1,66 @@
package com.yihu.jw.entity.ehr.org;
import javax.persistence.*;
import java.io.Serializable;
/**
 * @author hzp
 */
@Entity
@Table(name = "ldap_entries")
public class LdapEntries implements Serializable {
    private Long id;
    private String dn;
    private Integer ocMapId;
    private Long parent;
    private Long keyval;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id",unique = true,nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getDn() {
        return dn;
    }
    public void setDn(String dn) {
        this.dn = dn;
    }
    public Integer getOcMapId() {
        return ocMapId;
    }
    public void setOcMapId(Integer ocMapId) {
        this.ocMapId = ocMapId;
    }
    public Long getParent() {
        return parent;
    }
    public void setParent(Long parent) {
        this.parent = parent;
    }
    public Long getKeyval() {
        return keyval;
    }
    public void setKeyval(Long keyval) {
        this.keyval = keyval;
    }
}

+ 135 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgDept.java

@ -0,0 +1,135 @@
package com.yihu.jw.entity.ehr.org;
import javax.persistence.*;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "org_dept", schema = "", catalog = "healtharchive")
public class OrgDept {
    private int id;
    private int parentDeptId;
    private String orgId;
    private String code;
    private String name;
    private Integer delFlag;
    private Integer sortNo;
    private Integer jkzlHosDeptId;
    private OrgDeptDetail deptDetail;
    @Transient
    public OrgDeptDetail getDeptDetail() {
        return deptDetail;
    }
    public void setDeptDetail(OrgDeptDetail deptDetail) {
        this.deptDetail = deptDetail;
    }
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Column(name = "parent_dept_id", nullable = false, insertable = true, updatable = true)
    public int getParentDeptId() {
        return parentDeptId;
    }
    public void setParentDeptId(int parentDeptId) {
        this.parentDeptId = parentDeptId;
    }
    @Column(name = "org_id", nullable = false, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Column(name = "code", nullable = true)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "name", nullable = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "del_flag", nullable = true)
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    @Column(name = "sort_no", nullable = true)
    public Integer getSortNo() {
        return sortNo;
    }
    public void setSortNo(Integer sortNo) {
        this.sortNo = sortNo;
    }
    public Integer getJkzlHosDeptId() {
        return jkzlHosDeptId;
    }
    public void setJkzlHosDeptId(Integer jkzlHosDeptId) {
        this.jkzlHosDeptId = jkzlHosDeptId;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        OrgDept orgDept = (OrgDept) o;
        if (id != orgDept.id) return false;
        if (parentDeptId != orgDept.parentDeptId) return false;
        if (orgId != null ? !orgId.equals(orgDept.orgId) : orgDept.orgId != null) return false;
        if (code != null ? !code.equals(orgDept.code) : orgDept.code != null) return false;
        if (name != null ? !name.equals(orgDept.name) : orgDept.name != null) return false;
        if (delFlag != null ? !delFlag.equals(orgDept.delFlag) : orgDept.delFlag != null) return false;
        if (sortNo != null ? !sortNo.equals(orgDept.sortNo) : orgDept.sortNo != null) return false;
        if (jkzlHosDeptId != null ? !jkzlHosDeptId.equals(orgDept.jkzlHosDeptId) : orgDept.jkzlHosDeptId != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + parentDeptId;
        result = 31 * result + (orgId != null ? orgId.hashCode() : 0);
        result = 31 * result + (code != null ? code.hashCode() : 0);
        result = 31 * result + (name != null ? name.hashCode() : 0);
        result = 31 * result + (delFlag != null ? delFlag.hashCode() : 0);
        result = 31 * result + (sortNo != null ? sortNo.hashCode() : 0);
        result = 31 * result + (jkzlHosDeptId != null ? jkzlHosDeptId.hashCode() : 0);
        return result;
    }
}

+ 226 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgDeptDetail.java

@ -0,0 +1,226 @@
package com.yihu.jw.entity.ehr.org;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 *  科室表。。。
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "org_dept_detail", schema = "", catalog = "healtharchive")
public class OrgDeptDetail {
    private int id;
    private int deptId;
    private String nationalDeptSn;
    private String code;
    private String name;
    private String phone;
    private Integer displayStatus;
    private String gloryId;
    private String orgId;
    private String introduction;
    private Integer sortNo;
    private String place;
    private String pyCode;
    private Integer typeId;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public int getId() {
        return id;
    }
    private Timestamp insertTime;
    private Timestamp updateTime;
    public void setId(int id) {
        this.id = id;
    }
    @Column(name = "dept_id", nullable = false, insertable = true, updatable = true)
    public int getDeptId() {
        return deptId;
    }
    public void setDeptId(int deptId) {
        this.deptId = deptId;
    }
    @Column(name = "national_dept_sn", nullable = true, insertable = true, updatable = true)
    public String getNationalDeptSn() {
        return nationalDeptSn;
    }
    public void setNationalDeptSn(String nationalDeptSn) {
        this.nationalDeptSn = nationalDeptSn;
    }
    @Column(name = "code", nullable = true, insertable = true, updatable = true)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "name", nullable = true, insertable = true, updatable = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "phone", nullable = true, insertable = true, updatable = true)
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    @Column(name = "display_status", nullable = true, insertable = true, updatable = true)
    public Integer getDisplayStatus() {
        return displayStatus;
    }
    public void setDisplayStatus(Integer displayStatus) {
        this.displayStatus = displayStatus;
    }
    @Column(name = "glory_id", nullable = true, insertable = true, updatable = true)
    public String getGloryId() {
        return gloryId;
    }
    public void setGloryId(String gloryId) {
        this.gloryId = gloryId;
    }
    @Column(name = "org_id", nullable = true, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Column(name = "introduction", nullable = true, insertable = true, updatable = true)
    public String getIntroduction() {
        return introduction;
    }
    public void setIntroduction(String introduction) {
        this.introduction = introduction;
    }
    @Column(name = "sort_no", nullable = true, insertable = true, updatable = true)
    public Integer getSortNo() {
        return sortNo;
    }
    public void setSortNo(Integer sortNo) {
        this.sortNo = sortNo;
    }
    @Column(name = "place", nullable = true, insertable = true, updatable = true)
    public String getPlace() {
        return place;
    }
    public void setPlace(String place) {
        this.place = place;
    }
    @Column(name = "py_code", nullable = true, insertable = true, updatable = true)
    public String getPyCode() {
        return pyCode;
    }
    public void setPyCode(String pyCode) {
        this.pyCode = pyCode;
    }
    @Column(name = "type_id", nullable = true, insertable = true, updatable = true)
    public Integer getTypeId() {
        return typeId;
    }
    public void setTypeId(Integer typeId) {
        this.typeId = typeId;
    }
    @Column(name = "insert_time", nullable = true, insertable = true, updatable = true)
    public Timestamp getInsertTime() {
        return insertTime;
    }
    public void setInsertTime(Timestamp insertTime) {
        this.insertTime = insertTime;
    }
    @Column(name = "update_time", nullable = true, insertable = true, updatable = true)
    public Timestamp getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Timestamp updateTime) {
        this.updateTime = updateTime;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        OrgDeptDetail that = (OrgDeptDetail) o;
        if (id != that.id) return false;
        if (deptId != that.deptId) return false;
        if (nationalDeptSn != null ? !nationalDeptSn.equals(that.nationalDeptSn) : that.nationalDeptSn != null)
            return false;
        if (code != null ? !code.equals(that.code) : that.code != null) return false;
        if (name != null ? !name.equals(that.name) : that.name != null) return false;
        if (phone != null ? !phone.equals(that.phone) : that.phone != null) return false;
        if (displayStatus != null ? !displayStatus.equals(that.displayStatus) : that.displayStatus != null)
            return false;
        if (gloryId != null ? !gloryId.equals(that.gloryId) : that.gloryId != null) return false;
        if (orgId != null ? !orgId.equals(that.orgId) : that.orgId != null) return false;
        if (introduction != null ? !introduction.equals(that.introduction) : that.introduction != null) return false;
        if (sortNo != null ? !sortNo.equals(that.sortNo) : that.sortNo != null) return false;
        if (place != null ? !place.equals(that.place) : that.place != null) return false;
        if (pyCode != null ? !pyCode.equals(that.pyCode) : that.pyCode != null) return false;
        if (typeId != null ? !typeId.equals(that.typeId) : that.typeId != null) return false;
        if (insertTime != null ? !insertTime.equals(that.insertTime) : that.insertTime != null) return false;
        if (updateTime != null ? !updateTime.equals(that.updateTime) : that.updateTime != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + deptId;
        result = 31 * result + (nationalDeptSn != null ? nationalDeptSn.hashCode() : 0);
        result = 31 * result + (code != null ? code.hashCode() : 0);
        result = 31 * result + (name != null ? name.hashCode() : 0);
        result = 31 * result + (phone != null ? phone.hashCode() : 0);
        result = 31 * result + (displayStatus != null ? displayStatus.hashCode() : 0);
        result = 31 * result + (gloryId != null ? gloryId.hashCode() : 0);
        result = 31 * result + (orgId != null ? orgId.hashCode() : 0);
        result = 31 * result + (introduction != null ? introduction.hashCode() : 0);
        result = 31 * result + (sortNo != null ? sortNo.hashCode() : 0);
        result = 31 * result + (place != null ? place.hashCode() : 0);
        result = 31 * result + (pyCode != null ? pyCode.hashCode() : 0);
        result = 31 * result + (typeId != null ? typeId.hashCode() : 0);
        result = 31 * result + (insertTime != null ? insertTime.hashCode() : 0);
        result = 31 * result + (updateTime != null ? updateTime.hashCode() : 0);
        return result;
    }
}

+ 95 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgHealthCategory.java

@ -0,0 +1,95 @@
package com.yihu.jw.entity.ehr.org;
import com.yihu.jw.entity.BaseIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.List;
/**
 * 卫生机构类别 Entity
 *
 * @author 张进军
 * @date 2017/12/21 12:00
 */
@Entity
@Table(name = "org_health_category")
public class OrgHealthCategory extends BaseIdentityEntity {
    public Long pid; // 父级主键
    public Long topPid; // 顶级主键
    public String code; // 卫生机构类别编码
    public String name; // 卫生机构类别名称
    public String remark; // 备注
    // 临时字段
    private String text; // 名称,树形下拉框使用
    private List<OrgHealthCategory> children = new ArrayList<>(); // 子节点
    @Column(name = "pid")
    public Long getPid() {
        return pid;
    }
    public void setPid(Long pid) {
        this.pid = pid;
    }
    @Column(name = "top_pid")
    public Long getTopPid() {
        return topPid;
    }
    public void setTopPid(Long topPid) {
        this.topPid = topPid;
    }
    @Column(name = "code", nullable = false, unique = true)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "name", nullable = false, unique = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Transient
    public String getText() {
        return this.name;
    }
    public void setText(String text) {
        this.text = text;
    }
    @Transient
    public List<OrgHealthCategory> getChildren() {
        return children;
    }
    public void setChildren(List<OrgHealthCategory> children) {
        this.children = children;
    }
}

+ 247 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgMemberRelation.java

@ -0,0 +1,247 @@
package com.yihu.jw.entity.ehr.org;
import javax.persistence.*;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "org_member_relation", schema = "", catalog = "healtharchive")
public class OrgMemberRelation {
    private int id;
    private String orgId;
    private String orgName;
    private Integer parentDeptId;
    private String parentDeptName;
    private Integer deptId;
    private String deptName;
    private String dutyName;
    private String userId;
    private String userName;
    private String parentUserId;
    private String parentUserName;
    private String remark;
    private Integer status;
    private String jkzlDoctorUid; // 总部的医生uid
    private String jkzlUserId; // 总部的医生userid
    private String jkzlDoctorSn; // 总部的坐诊sn
    private String jkzlHosDeptId; // 总部的科室Id
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", nullable = false)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Column(name = "org_id", nullable = true, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Column(name = "org_name", nullable = true)
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "parent_dept_id", nullable = true, insertable = true, updatable = true)
    public Integer getParentDeptId() {
        return parentDeptId;
    }
    public void setParentDeptId(Integer parentDeptId) {
        this.parentDeptId = parentDeptId;
    }
    @Column(name = "parent_dept_name", nullable = true)
    public String getParentDeptName() {
        return parentDeptName;
    }
    public void setParentDeptName(String parentDeptName) {
        this.parentDeptName = parentDeptName;
    }
    @Column(name = "dept_id", nullable = true, insertable = true, updatable = true)
    public Integer getDeptId() {
        return deptId;
    }
    public void setDeptId(Integer deptId) {
        this.deptId = deptId;
    }
    @Column(name = "dept_name", nullable = true)
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    @Column(name = "duty_name", nullable = true)
    public String getDutyName() {
        return dutyName;
    }
    public void setDutyName(String dutyName) {
        this.dutyName = dutyName;
    }
    @Column(name = "user_id", nullable = true, insertable = true, updatable = true)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Column(name = "user_name", nullable = true)
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    @Column(name = "parent_user_id", nullable = true, insertable = true, updatable = true)
    public String getParentUserId() {
        return parentUserId;
    }
    public void setParentUserId(String parentUserId) {
        this.parentUserId = parentUserId;
    }
    @Column(name = "parent_user_name", nullable = true)
    public String getParentUserName() {
        return parentUserName;
    }
    public void setParentUserName(String parentUserName) {
        this.parentUserName = parentUserName;
    }
    @Column(name = "remark", nullable = true)
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "status", nullable = true)
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "jkzl_doctor_uid")
    public String getJkzlDoctorUid() {
        return jkzlDoctorUid;
    }
    public void setJkzlDoctorUid(String jkzlDoctorUid) {
        this.jkzlDoctorUid = jkzlDoctorUid;
    }
    @Column(name = "jkzl_user_id")
    public String getJkzlUserId() {
        return jkzlUserId;
    }
    public void setJkzlUserId(String jkzlUserId) {
        this.jkzlUserId = jkzlUserId;
    }
    @Column(name = "jkzl_doctor_sn")
    public String getJkzlDoctorSn() {
        return jkzlDoctorSn;
    }
    public void setJkzlDoctorSn(String jkzlDoctorSn) {
        this.jkzlDoctorSn = jkzlDoctorSn;
    }
    @Column(name = "jkzl_hos_dept_id")
    public String getJkzlHosDeptId() {
        return jkzlHosDeptId;
    }
    public void setJkzlHosDeptId(String jkzlHosDeptId) {
        this.jkzlHosDeptId = jkzlHosDeptId;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        OrgMemberRelation that = (OrgMemberRelation) o;
        if (id != that.id) return false;
        if (orgId != null ? !orgId.equals(that.orgId) : that.orgId != null) return false;
        if (orgName != null ? !orgName.equals(that.orgName) : that.orgName != null) return false;
        if (parentDeptId != null ? !parentDeptId.equals(that.parentDeptId) : that.parentDeptId != null) return false;
        if (parentDeptName != null ? !parentDeptName.equals(that.parentDeptName) : that.parentDeptName != null)
            return false;
        if (deptId != null ? !deptId.equals(that.deptId) : that.deptId != null) return false;
        if (deptName != null ? !deptName.equals(that.deptName) : that.deptName != null) return false;
        if (dutyName != null ? !dutyName.equals(that.dutyName) : that.dutyName != null) return false;
        if (userId != null ? !userId.equals(that.userId) : that.userId != null) return false;
        if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
        if (parentUserId != null ? !parentUserId.equals(that.parentUserId) : that.parentUserId != null) return false;
        if (parentUserName != null ? !parentUserName.equals(that.parentUserName) : that.parentUserName != null)
            return false;
        if (remark != null ? !remark.equals(that.remark) : that.remark != null) return false;
        if (status != null ? !status.equals(that.status) : that.status != null) return false;
        if (jkzlDoctorUid != null ? !jkzlDoctorUid.equals(that.jkzlDoctorUid) : that.jkzlDoctorUid != null) return false;
        if (jkzlUserId != null ? !jkzlUserId.equals(that.jkzlUserId) : that.jkzlUserId != null) return false;
        if (jkzlDoctorSn != null ? !jkzlDoctorSn.equals(that.jkzlDoctorSn) : that.jkzlDoctorSn != null) return false;
        if (jkzlHosDeptId != null ? !jkzlHosDeptId.equals(that.jkzlHosDeptId) : that.jkzlHosDeptId != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (orgId != null ? orgId.hashCode() : 0);
        result = 31 * result + (orgName != null ? orgName.hashCode() : 0);
        result = 31 * result + (parentDeptId != null ? parentDeptId.hashCode() : 0);
        result = 31 * result + (parentDeptName != null ? parentDeptName.hashCode() : 0);
        result = 31 * result + (deptId != null ? deptId.hashCode() : 0);
        result = 31 * result + (deptName != null ? deptName.hashCode() : 0);
        result = 31 * result + (dutyName != null ? dutyName.hashCode() : 0);
        result = 31 * result + (userId != null ? userId.hashCode() : 0);
        result = 31 * result + (userName != null ? userName.hashCode() : 0);
        result = 31 * result + (parentUserId != null ? parentUserId.hashCode() : 0);
        result = 31 * result + (parentUserName != null ? parentUserName.hashCode() : 0);
        result = 31 * result + (remark != null ? remark.hashCode() : 0);
        result = 31 * result + (status != null ? status.hashCode() : 0);
        result = 31 * result + (jkzlDoctorUid != null ? jkzlDoctorUid.hashCode() : 0);
        result = 31 * result + (jkzlUserId != null ? jkzlUserId.hashCode() : 0);
        result = 31 * result + (jkzlDoctorSn != null ? jkzlDoctorSn.hashCode() : 0);
        result = 31 * result + (jkzlHosDeptId != null ? jkzlHosDeptId.hashCode() : 0);
        return result;
    }
}

+ 65 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/OrgSaas.java

@ -0,0 +1,65 @@
package com.yihu.jw.entity.ehr.org;
import javax.persistence.*;
/**
 * 机构Saas授权
 * Created by hzp on 2017/05/15.
 */
@Entity
@Table(name="org_saas")
public class OrgSaas {
    protected Long id; // 非业务主键
    private String orgCode; //机构代码
    private String type;// 授权类型 1区域 2机构
    private String saasCode;//区域代码或者机构代码
    private String saasName;//区域名称或者机构名称
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "saas_code")
    public String getSaasCode() {
        return saasCode;
    }
    public void setSaasCode(String saasCode) {
        this.saasCode = saasCode;
    }
    @Column(name = "saas_name")
    public String getSaasName() {
        return saasName;
    }
    public void setSaasName(String saasName) {
        this.saasName = saasName;
    }
}

+ 875 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/org/Organization.java

@ -0,0 +1,875 @@
package com.yihu.jw.entity.ehr.org;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
 * 机构,由 XOrgManager 创建并维护.
 *
 * @author Sand
 * @version 1.0
 * @updated 21-5月-2015 10:51:30
 */
@Entity
@Table(name = "organizations")
@Access(value = AccessType.FIELD)
public class Organization  {
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "assigned")
    @Column(name = "org_code", unique = true, nullable = false)
    private String orgCode;         // 机构代码,对医院编码属性需要调研
    @Column(name = "admin",  nullable = true)
    private String admin;            // 机构管理员
    @Column(name = "settled",  nullable = true)
    private Boolean settled;        // 是否已接入,对第三方平台有效.
    @Column(name = "settled_way",  nullable = true)
    private String settledWay;    // 接入方式:直连/平台接入
    @Column(name = "full_name",  nullable = true)
    private String fullName;        // 全名
    @Column(name = "org_type",  nullable = true)
    private String orgType;        // 机构类型,如:行政\科研等
    @Column(name = "py_code",  nullable = true)
    private String pyCode;            // 拼音码
    @Column(name = "short_name",  nullable = true)
    private String shortName;        // 简称
    //private Set<String> tags;        // 标签
    @Column(name = "tel",  nullable = true)
    private String tel;                // 机构电话
    @Column(name = "create_date",  nullable = true)
    private Date createDate;        // 创建日期
    @Column(name = "location",  nullable = true)
    private String location;        // 地址
    @Column(name = "activity_flag", unique = true, nullable = true)
    private Integer activityFlag;
    @Column(name = "tags",  nullable = true)
    private String tags;
    @Column(name = "img_remote_path",nullable = true)
    private String imgRemotePath;
    @Column(name = "img_local_path",nullable = true)
    private String imgLocalPath;
    @Column(name = "administrative_division",nullable = true)
    private Integer administrativeDivision;
    @Column(name = "id",nullable = true)
    private Long id;
    @Column(name = "code",nullable = true)
    private String code;
    @Column(name = "traffic",nullable = true)
    private String traffic;
    @Column(name = "province_id",nullable = true)
    private Integer provinceId;
    @Column(name = "province_name",nullable = true)
    private String provinceName;
    @Column(name = "city_id",nullable = true)
    private Integer cityId;
    @Column(name = "city_name",nullable = true)
    private String cityName;
    @Column(name = "area_id",nullable = true)
    private Integer areaId;
    @Column(name = "area_name",nullable = true)
    private String areaName;
    @Column(name = "photo",nullable = true)
    private String photo;
    @Column(name = "hos_type_id",nullable = true)
    private String hosTypeId;
    @Column(name = "url",nullable = true)
    private String url;
    @Column(name = "ascription_type",nullable = true)
    private Integer ascriptionType;
    @Column(name = "phone",nullable = true)
    private String phone;
    @Column(name = "introduction",nullable = true)
    private String introduction;
    @Column(name = "legal_person",nullable = true)
    private String legalPerson;
    @Column(name = "level_id",nullable = true)
    private String levelId;
    @Column(name = "logo_url",nullable = true)
    private String logoUrl;
    @Column(name = "sort_no",nullable = true)
    private Integer sortNo;
    @Column(name = "parent_hos_id",nullable = true)
    private Integer parentHosId;
    @Column(name = "hos_photo",nullable = true)
    private String hosPhoto;
    @Column(name = "zxy",nullable = true)
    private Integer zxy;
    @Column(name = "ing",nullable = true)
    private String ing;
    @Column(name = "lat",nullable = true)
    private String lat;
    @Column(name = "update_time",nullable = true)
    private Date updateTime;
    @Column(name = "berth",nullable = true)
    private Integer berth;  //核定床位
    @Column(name = "hos_hierarchy", nullable = true)
    private String hosHierarchy;//医院等次 :1:特等、2:甲等、3:乙等、4:丙等、9:未评
    @Column(name = "hos_economic", nullable = true)
    private String hosEconomic;//经济类型代码 与 资源字典对应
    @Column(name = "classification", nullable = true)
    private String classification;//卫生机构分类,值参考系统字典卫生机构分类
    @Column(name = "big_classification", nullable = true)
    private String bigClassification;//卫生机构大分类,值参考系统字典卫生机构大分类
    @Column(name = "nature", nullable = true)
    private String nature;//机构性质1,1公立、2民营
    @Column(name = "branch_type", nullable = true)
    private String branchType;//机构性质Ⅱ,1总院、2分院
    @Column(name = "display_status", nullable = true)
    private String displayStatus;//与总部同步数据补充字段是否开放显示:0:不显示 1:显示
    @Column(name = "jkzl_org_id", nullable = true)
    private String jkzlOrgId;//总部机构id-同步数据使用
    @Column(name = "host_unit", nullable = true)
    private String hostUnit;     //	主办单位
    @Column(name = "hos_manage_type", nullable = true)
    private String hosManageType;     //	机构分类管理代码
    @Column(name = "basic_unit_flag", nullable = true)
    private String basicUnitFlag;     //	是否基层单位
    @Column(name = "org_changes", nullable = true)
    private String orgChanges;         //	机构变动情况
    @Column(name = "hos_type_name", nullable = true)
    private String hosTypeName;     // 机构类别代码名称
    @Column(name = "street_id", nullable = true)
    private String streetId;     // 街道/乡镇代码
    @Column(name = "discharge_patient_flag", nullable = true)
    private String dischargePatientFlag;    //	是否填报出院病人表
    @Column(name = "reporting_clinic_flag", nullable = true)
    private String reportingClinicFlag;    //	是否代报诊所
    @Column(name = "reporting_village_clinic_flag", nullable = true)
    private String reportingVillageClinicFlag;    //	是否代报村卫生室
    @Column(name = "reporting_org", nullable = true)
    private String reportingOrg;        // 诊所、村卫生室所属代报机构
    @Column(name = "founding_time", nullable = true)
    private String foundingTime;    //	单位开业/成立时间
    @Column(name = "registered_capital", nullable = true)
    private String registeredCapital;    //	注册资金(万元)
    @Column(name = "branch_org_flag", nullable = true)
    private String branchOrgFlag;        // 是否分支机构
    @Column(name = "postalcode", nullable = true)
    private String postalcode;    //	邮政编码
    @Column(name = "email", nullable = true)
    private String email;        // 电子邮箱
    @Column(name = "domain_name", nullable = true)
    private String domainName;        // 单位网站域名
    @Column(name = "registration_number", nullable = true)
    private String registrationNumber;    //	批准文号/注册号
    @Column(name = "registration_ratification_agency", nullable = true)
    private String registrationRatificationAgency;    //	登记批准机构
    @Column(name = "certificate_date", nullable = true)
    private String certificateDate;    //	办证日期
    @Column(name = "operator", nullable = true)
    private String operator;    //	经办人
    @Column(name = "entry_staff", nullable = true)
    private String entryStaff;     //	录入人
    @Column(name = "create_time", nullable = true)
    private String createTime;     //	新增机构创建时间
    @Column(name = "cancel_time", nullable = true)
    private String cancelTime;    //	作废日期
    @Column(name = "term_validity_start", nullable = true)
    private String termValidityStart;    //	有效期起
    @Column(name = "term_validity_end", nullable = true)
    private String termValidityEnd;    //	有效期止
    public Organization() {
        //tags = new HashSet<>();
    }
    public Integer getAscriptionType() {
        return ascriptionType;
    }
    public void setAscriptionType(Integer ascriptionType) {
        this.ascriptionType = ascriptionType;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getAdmin() {
        return admin;
    }
    public void setAdmin(String admin) {
        this.admin = admin;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    public String getFullName() {
        return fullName;
    }
    public void setFullName(String fullName) {
        this.fullName = fullName;
    }
    public String getLocation() {
        return location;
    }
    public void setLocation(String location) {
        this.location = location;
    }
    public String getPyCode() {
        return pyCode;
    }
    public void setPyCode(String pyCode) {
        this.pyCode = pyCode;
    }
    public String getSettledWay() {
        return settledWay;
    }
    public void setSettledWay(String settledWay) {
        this.settledWay = settledWay;
    }
    public String getShortName() {
        return shortName;
    }
    public void setShortName(String shortName) {
        this.shortName = shortName;
    }
    public String getTel() {
        return tel;
    }
    public void setTel(String tel) {
        this.tel = tel;
    }
    public String getOrgType() {
        return orgType;
    }
    public void setOrgType(String orgType) {
        this.orgType = orgType;
    }
    public Boolean isSettled() {
        return settled;
    }
    public void setSettled(Boolean settled) {
        this.settled = settled;
    }
    public Integer getActivityFlag() {
        return activityFlag;
    }
    public void setActivityFlag(Integer activityFlag) {
        this.activityFlag = activityFlag;
    }
    public String getImgRemotePath() {
        return imgRemotePath;
    }
    public void setImgRemotePath(String imgRemotePath) {
        this.imgRemotePath = imgRemotePath;
    }
    public String getImgLocalPath() {
        return imgLocalPath;
    }
    public void setImgLocalPath(String imgLocalPath) {
        this.imgLocalPath = imgLocalPath;
    }
    public Integer getAdministrativeDivision() {
        return administrativeDivision;
    }
    public void setAdministrativeDivision(Integer administrativeDivision) {
        this.administrativeDivision = administrativeDivision;
    }
    public List<String> getTags() {
        List<String> list = new ArrayList<>();
        if(org.springframework.util.StringUtils.isEmpty(tags)){
        }else {
            String[] arr = tags.split(";|;");
            list = Arrays.asList(arr);
        }
        return list;
    }
    public void setTags(List<String> tags) {
        if(tags.size()>0){
            this.tags = StringUtils.join(tags.toArray(),";");
        }else {
            this.tags = "";
        }
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTraffic() {
        return traffic;
    }
    public void setTraffic(String traffic) {
        this.traffic = traffic;
    }
    public Integer getProvinceId() {
        return provinceId;
    }
    public void setProvinceId(Integer provinceId) {
        this.provinceId = provinceId;
    }
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    public Integer getCityId() {
        return cityId;
    }
    public void setCityId(Integer cityId) {
        this.cityId = cityId;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public Integer getAreaId() {
        return areaId;
    }
    public void setAreaId(Integer areaId) {
        this.areaId = areaId;
    }
    public String getAreaName() {
        return areaName;
    }
    public void setAreaName(String areaName) {
        this.areaName = areaName;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    public String getHosTypeId() {
        return hosTypeId;
    }
    public void setHosTypeId(String hosTypeId) {
        this.hosTypeId = hosTypeId;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    public String getIntroduction() {
        return introduction;
    }
    public void setIntroduction(String introduction) {
        this.introduction = introduction;
    }
    public String getLegalPerson() {
        return legalPerson;
    }
    public void setLegalPerson(String legalPerson) {
        this.legalPerson = legalPerson;
    }
    public String getLevelId() {
        return levelId;
    }
    public void setLevelId(String levelId) {
        this.levelId = levelId;
    }
    public String getLogoUrl() {
        return logoUrl;
    }
    public void setLogoUrl(String logoUrl) {
        this.logoUrl = logoUrl;
    }
    public Integer getSortNo() {
        return sortNo;
    }
    public void setSortNo(Integer sortNo) {
        this.sortNo = sortNo;
    }
    public Integer getParentHosId() {
        return parentHosId;
    }
    public void setParentHosId(Integer parentHosId) {
        this.parentHosId = parentHosId;
    }
    public String getHosPhoto() {
        return hosPhoto;
    }
    public void setHosPhoto(String hosPhoto) {
        this.hosPhoto = hosPhoto;
    }
    public Integer getZxy() {
        return zxy;
    }
    public void setZxy(Integer zxy) {
        this.zxy = zxy;
    }
    public String getIng() {
        return ing;
    }
    public void setIng(String ing) {
        this.ing = ing;
    }
    public String getLat() {
        return lat;
    }
    public void setLat(String lat) {
        this.lat = lat;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public Integer getBerth() {
        return berth;
    }
    public void setBerth(Integer berth) {
        this.berth = berth;
    }
    public String getHosHierarchy() {
        return hosHierarchy;
    }
    public void setHosHierarchy(String hosHierarchy) {
        this.hosHierarchy = hosHierarchy;
    }
    public String getHosEconomic() {
        return hosEconomic;
    }
    public void setHosEconomic(String hosEconomic) {
        this.hosEconomic = hosEconomic;
    }
    public String getClassification() {
        return classification;
    }
    public void setClassification(String classification) {
        this.classification = classification;
    }
    public String getBigClassification() {
        return bigClassification;
    }
    public void setBigClassification(String bigClassification) {
        this.bigClassification = bigClassification;
    }
    public String getNature() {
        return nature;
    }
    public void setNature(String nature) {
        this.nature = nature;
    }
    public String getBranchType() {
        return branchType;
    }
    public void setBranchType(String branchType) {
        this.branchType = branchType;
    }
    public String getDisplayStatus() {
        return displayStatus;
    }
    public void setDisplayStatus(String displayStatus) {
        this.displayStatus = displayStatus;
    }
    public String getJkzlOrgId() {
        return jkzlOrgId;
    }
    public void setJkzlOrgId(String jkzlOrgId) {
        this.jkzlOrgId = jkzlOrgId;
    }
    public String getHostUnit() {
        return hostUnit;
    }
    public void setHostUnit(String hostUnit) {
        this.hostUnit = hostUnit;
    }
    public String getHosManageType() {
        return hosManageType;
    }
    public void setHosManageType(String hosManageType) {
        this.hosManageType = hosManageType;
    }
    public String getBasicUnitFlag() {
        return basicUnitFlag;
    }
    public void setBasicUnitFlag(String basicUnitFlag) {
        this.basicUnitFlag = basicUnitFlag;
    }
    public String getOrgChanges() {
        return orgChanges;
    }
    public void setOrgChanges(String orgChanges) {
        this.orgChanges = orgChanges;
    }
    public String getHosTypeName() {
        return hosTypeName;
    }
    public void setHosTypeName(String hosTypeName) {
        this.hosTypeName = hosTypeName;
    }
    public String getStreetId() {
        return streetId;
    }
    public void setStreetId(String streetId) {
        this.streetId = streetId;
    }
    public String getDischargePatientFlag() {
        return dischargePatientFlag;
    }
    public void setDischargePatientFlag(String dischargePatientFlag) {
        this.dischargePatientFlag = dischargePatientFlag;
    }
    public String getReportingClinicFlag() {
        return reportingClinicFlag;
    }
    public void setReportingClinicFlag(String reportingClinicFlag) {
        this.reportingClinicFlag = reportingClinicFlag;
    }
    public String getReportingVillageClinicFlag() {
        return reportingVillageClinicFlag;
    }
    public void setReportingVillageClinicFlag(String reportingVillageClinicFlag) {
        this.reportingVillageClinicFlag = reportingVillageClinicFlag;
    }
    public String getReportingOrg() {
        return reportingOrg;
    }
    public void setReportingOrg(String reportingOrg) {
        this.reportingOrg = reportingOrg;
    }
    public String getFoundingTime() {
        return foundingTime;
    }
    public void setFoundingTime(String foundingTime) {
        this.foundingTime = foundingTime;
    }
    public String getRegisteredCapital() {
        return registeredCapital;
    }
    public void setRegisteredCapital(String registeredCapital) {
        this.registeredCapital = registeredCapital;
    }
    public String getBranchOrgFlag() {
        return branchOrgFlag;
    }
    public void setBranchOrgFlag(String branchOrgFlag) {
        this.branchOrgFlag = branchOrgFlag;
    }
    public String getPostalcode() {
        return postalcode;
    }
    public void setPostalcode(String postalcode) {
        this.postalcode = postalcode;
    }
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    public String getDomainName() {
        return domainName;
    }
    public void setDomainName(String domainName) {
        this.domainName = domainName;
    }
    public String getRegistrationNumber() {
        return registrationNumber;
    }
    public void setRegistrationNumber(String registrationNumber) {
        this.registrationNumber = registrationNumber;
    }
    public String getRegistrationRatificationAgency() {
        return registrationRatificationAgency;
    }
    public void setRegistrationRatificationAgency(String registrationRatificationAgency) {
        this.registrationRatificationAgency = registrationRatificationAgency;
    }
    public String getCertificateDate() {
        return certificateDate;
    }
    public void setCertificateDate(String certificateDate) {
        this.certificateDate = certificateDate;
    }
    public String getOperator() {
        return operator;
    }
    public void setOperator(String operator) {
        this.operator = operator;
    }
    public String getEntryStaff() {
        return entryStaff;
    }
    public void setEntryStaff(String entryStaff) {
        this.entryStaff = entryStaff;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    public String getCancelTime() {
        return cancelTime;
    }
    public void setCancelTime(String cancelTime) {
        this.cancelTime = cancelTime;
    }
    public String getTermValidityStart() {
        return termValidityStart;
    }
    public void setTermValidityStart(String termValidityStart) {
        this.termValidityStart = termValidityStart;
    }
    public String getTermValidityEnd() {
        return termValidityEnd;
    }
    public void setTermValidityEnd(String termValidityEnd) {
        this.termValidityEnd = termValidityEnd;
    }
}

+ 169 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/AbstractCard.java

@ -0,0 +1,169 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 卡抽象类,仅作为继承时的数据成员使用
 * @author Witness
 * @version 1.0
 * @updated 11-6月-2015 9:51:15
 */
public class AbstractCard {
	String id;				    // 卡ID
	String number;				// 卡号
	String ownerName;			// 持有人姓名
	String status;			// 状态 CardStatus
    String cardType;				// 类型 CardType
	String description;			// 描述
	Date createDate;				// 创建日期
	String idCardNo;
	String DType;
    //特殊字段
    String platform;
    String local;				// 发行地/归属地
    String releaseOrg;				// 发行机构
	Date releaseDate;			// 发行时间
	Date validityDateBegin;		// 有效期起始时间
	Date validityDateEnd;		// 有效期结束时间
	public AbstractCard(){
	}
//	public boolean checkIsVirtualCard(){
//		if(this.getCardType().equals("VirtualCard")){
//			return true;
//		}else{
//			return false;
//		}
//	}
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getNumber() {
        return number;
    }
    public void setNumber(String number) {
        this.number = number;
    }
    public String getOwnerName() {
        return ownerName;
    }
    public void setOwnerName(String ownerName) {
        this.ownerName = ownerName;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    public String getDType() {
        return DType;
    }
    public void setDType(String DType) {
        this.DType = DType;
    }
    public String getPlatform() {
        return platform;
    }
    public void setPlatform(String platform) {
        this.platform = platform;
    }
    public String getLocal() {
        return local;
    }
    public void setLocal(String local) {
        this.local = local;
    }
    public String getReleaseOrg() {
        return releaseOrg;
    }
    public void setReleaseOrg(String releaseOrg) {
        this.releaseOrg = releaseOrg;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReleaseDate() {
        return releaseDate;
    }
    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateBegin() {
        return validityDateBegin;
    }
    public void setValidityDateBegin(Date validityDateBegin) {
        this.validityDateBegin = validityDateBegin;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateEnd() {
        return validityDateEnd;
    }
    public void setValidityDateEnd(Date validityDateEnd) {
        this.validityDateEnd = validityDateEnd;
    }
}

+ 185 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/ArchiveApply.java

@ -0,0 +1,185 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 档案认领申请列表
 * Created by hzp on 2017/04/05.
 */
@Entity
@Table(name="archive_apply")
public class ArchiveApply  {
    protected Long id; // 非业务主键
    private String userId;
    private String name;//'申请人姓名',
    private String idCard;//申请人身份证号',
    private Date applyDate;//申请时间',
    private String status;//审核状态',
    private Date auditDate;//审核时间',
    private String auditReason;//不通过原因',
    private String auditor;//审核人',
    private Date visDate;//就诊时间',
    private String visOrg;//就诊机构',
    private String visDoctor;//就诊医生',
    private String cardNo;//医疗卡号',
    private String diagnosedResult;//诊断结果',
    private String diagnosedProject;//检查项目',
    private String medicines;//诊断开药',
    private String memo;//备注',
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Column(name = "user_id")
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "id_card")
    public String getIdCard() {
        return idCard;
    }
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    }
    @Column(name = "apply_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getApplyDate() {
        return applyDate;
    }
    public void setApplyDate(Date applyDate) {
        this.applyDate = applyDate;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(name = "audit_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAuditDate() {
        return auditDate;
    }
    public void setAuditDate(Date auditDate) {
        this.auditDate = auditDate;
    }
    @Column(name = "audit_reason")
    public String getAuditReason() {
        return auditReason;
    }
    public void setAuditReason(String auditReason) {
        this.auditReason = auditReason;
    }
    public String getAuditor() {
        return auditor;
    }
    public void setAuditor(String auditor) {
        this.auditor = auditor;
    }
    @Column(name = "vis_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getVisDate() {
        return visDate;
    }
    public void setVisDate(Date visDate) {
        this.visDate = visDate;
    }
    @Column(name = "vis_org")
    public String getVisOrg() {
        return visOrg;
    }
    public void setVisOrg(String visOrg) {
        this.visOrg = visOrg;
    }
    @Column(name = "vis_doctor")
    public String getVisDoctor() {
        return visDoctor;
    }
    public void setVisDoctor(String visDoctor) {
        this.visDoctor = visDoctor;
    }
    @Column(name = "card_no")
    public String getCardNo() {
        return cardNo;
    }
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    @Column(name = "diagnosed_result")
    public String getDiagnosedResult() {
        return diagnosedResult;
    }
    public void setDiagnosedResult(String diagnosedResult) {
        this.diagnosedResult = diagnosedResult;
    }
    @Column(name = "diagnosed_project")
    public String getDiagnosedProject() {
        return diagnosedProject;
    }
    public void setDiagnosedProject(String diagnosedProject) {
        this.diagnosedProject = diagnosedProject;
    }
    public String getMedicines() {
        return medicines;
    }
    public void setMedicines(String medicines) {
        this.medicines = medicines;
    }
    public String getMemo() {
        return memo;
    }
    public void setMemo(String memo) {
        this.memo = memo;
    }
}

+ 189 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/ArchiveRelation.java

@ -0,0 +1,189 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 档案认领申请列表
 * Created by hzp on 2017/04/05.
 */
@Entity
@Table(name="archive_relation")
public class ArchiveRelation {
    protected Long id; // 非业务主键
    private String name;//姓名
    private String orgCode;//机构代码
    private String orgName;//机构名称
    private String idCardNo;//身份证号码
    private String cardType;//就诊卡类型
    private String cardNo;//就诊卡号
    private String eventNo;//就诊事件号
    private Date eventDate;//就诊时间
    private String eventType;//就诊类型 0门诊 1住院 2体检
    private String profileId;//关联档案号
    private String status;//关联状态 0未关联 1已关联
    private Date relationDate;//关联时间
    private Date createDate;//创建时间
    private Long applyId;//关联档案申请id
    private Long cardId;//申领卡ID
    private String identifyFlag;//身份识别标识 0不可识别 1可以识别
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "id_card_no")
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    @Column(name = "card_no")
    public String getCardNo() {
        return cardNo;
    }
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "event_no")
    public String getEventNo() {
        return eventNo;
    }
    public void setEventNo(String eventNo) {
        this.eventNo = eventNo;
    }
    @Column(name = "event_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventDate() {
        return eventDate;
    }
    public void setEventDate(Date eventDate) {
        this.eventDate = eventDate;
    }
    @Column(name = "event_type")
    public String getEventType() {
        return eventType;
    }
    public void setEventType(String eventType) {
        this.eventType = eventType;
    }
    @Column(name = "profile_id")
    public String getProfileId() {
        return profileId;
    }
    public void setProfileId(String profileId) {
        this.profileId = profileId;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(name = "relation_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getRelationDate() {
        return relationDate;
    }
    public void setRelationDate(Date relationDate) {
        this.relationDate = relationDate;
    }
    @Column(name = "create_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    @Column(name = "apply_id")
    public Long getApplyId() {
        return applyId;
    }
    public void setApplyId(Long applyId) {
        this.applyId = applyId;
    }
    @Column(name = "card_id")
    public Long getCardId() {
        return cardId;
    }
    public void setCardId(Long cardId) {
        this.cardId = cardId;
    }
    @Column(name = "identify_flag")
    public String getIdentifyFlag() {
        return identifyFlag;
    }
    public void setIdentifyFlag(String identifyFlag) {
        this.identifyFlag = identifyFlag;
    }
}

+ 146 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/Authentication.java

@ -0,0 +1,146 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * @author lincl
 * @version 1.0
 * @created 2016/6/22
 */
@Entity
@Table(name = "authentication")
public class Authentication {
    private int id;                       //编号
    private String name;                 //  申请人姓名
    private String idCard;                // 申请人身份证号
    private Date applyDate;               // 申请时间
    private String status;                   // 审核状态
    private Date auditDate;              //审核时间
    private String auditReason;           //不通过原因
    private String auditor;              //审核人
    private String idCardEffective;         // 申请人身份证有效日期
    private String telephone;                //电话
    private String medicalCardType;       //医疗卡类型
    private String medicalCardNo;          //医疗卡卡号
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "increment")
    @Column(name = "id", nullable = false)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Column(name = "name", nullable = false)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "id_card", nullable = false)
    public String getIdCard() {
        return idCard;
    }
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    }
    @Column(name = "apply_date", nullable = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getApplyDate() {
        return applyDate;
    }
    public void setApplyDate(Date applyDate) {
        this.applyDate = applyDate;
    }
    @Column(name = "status", nullable = false)
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(name = "audit_date", nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAuditDate() {
        return auditDate;
    }
    public void setAuditDate(Date auditDate) {
        this.auditDate = auditDate;
    }
    @Column(name = "audit_reason", nullable = true)
    public String getAuditReason() {
        return auditReason;
    }
    public void setAuditReason(String auditReason) {
        this.auditReason = auditReason;
    }
    @Column(name = "auditor", nullable = true)
    public String getAuditor() {
        return auditor;
    }
    public void setAuditor(String auditor) {
        this.auditor = auditor;
    }
    @Column(name = "telephone", nullable = true)
    public String getTelephone() {
        return telephone;
    }
    public void setTelephone(String telephone) {
        this.telephone = telephone;
    }
    @Column(name = "medical_card_type", nullable = true)
    public String getMedicalCardType() {
        return medicalCardType;
    }
    public void setMedicalCardType(String medicalCardType) {
        this.medicalCardType = medicalCardType;
    }
    @Column(name = "medical_card_no", nullable = true)
    public String getMedicalCardNo() {
        return medicalCardNo;
    }
    public void setMedicalCardNo(String medicalCardNo) {
        this.medicalCardNo = medicalCardNo;
    }
    @Column(name = "id_card_effective", nullable = true)
    public String getIdCardEffective() {
        return idCardEffective;
    }
    public void setIdCardEffective(String idCardEffective) {
        this.idCardEffective = idCardEffective;
    }
}

+ 66 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/DemographicId.java

@ -0,0 +1,66 @@
package com.yihu.jw.entity.ehr.patient;
import java.io.Serializable;
import java.util.Objects;
/**
 * 人口学ID. 作为人口学标识, 若此人有户口, 则此号码为身份证号码, 若是新生儿或没有户口的情况, 此号码为系统生成的一个标记.
 * 这时候这些病人的
 *
 * @author Sand
 * @version 1.0
 * @created 2015.06.10 17:51
 */
public class DemographicId implements Serializable {
	public String idCardNo;	// 身份证号码
	public String getIdCardNo() {
		return idCardNo;
	}
	public void setIdCardNo(String idCardNo) {
		this.idCardNo = idCardNo;
	}
	public DemographicId(){}
	public DemographicId(String idCardNo){
		this.idCardNo = idCardNo == null ? "" : idCardNo;
	}
	public boolean idAvailable(){
		return idCardNo != null && idCardNo.length() > 0;
	}
	@Override
	public boolean equals(Object obj) {
		if(obj instanceof DemographicId){
			DemographicId pk = (DemographicId)obj;
			if(this.idCardNo==pk.getIdCardNo()){
				return true;
			}
		}
		return false;
	}
	@Override
	public int hashCode() {
		return Objects.hash(idCardNo);
	}
//	public boolean equals(Object o) {
//		if (this == o) return true;
//		if (o == null || getClass() != o.getClass()) return false;
//
//		DemographicId demId = (DemographicId) o;
//		return Objects.equals(idCardNo, demId.idCardNo);
//	}
//
//	@Override
//	public int hashCode() {
//		return Objects.hash(idCardNo);
//	}
//	public String toString(){
//		return idCardNo;
//	}
}

+ 183 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/DemographicInfo.java

@ -0,0 +1,183 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 人口学信息接口实现类.
 *
 * @author Sand
 * @version 1.0
 * @updated 25-5月-2015 19:58:12
 */
@Entity
@Table(name = "demographics")
@Access(value = AccessType.PROPERTY)
public class DemographicInfo {
    private String idCardNo;                       // 身份证
    private Date birthday;                                // 出生日期
    private String birthPlace;                    // 出生地
    private String nativePlace;                    // 籍贯
    private String email;                            // 邮箱
    private String gender;                            // 性别
    private String name;                            // 姓名
    private String martialStatus;                  // 婚姻情况
    private String nation;                            // 民族
    private String residenceType;                  // 户口性质(农村、城镇)
    private String workAddress;                    // 工作地址
    private String homeAddress;                    // 家庭地址
    private String password;                        //密码
    private String telephoneNo ;                     // 电话号码,之前是个电话号码列表
    private String picPath = "";
    private String localPath = "";
    private Date registerTime;                      //注册时间
    public DemographicInfo() {
    }
    @Id
    @Column(name = "id", unique = true, nullable = false)
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    @Column(name = "birthday", nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getBirthday() {
        return birthday;
    }
    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }
    @Column(name = "birth_place", nullable = true)
    public String getBirthPlace() {
        return birthPlace;
    }
    public void setBirthPlace(String birthPlace) {
        this.birthPlace = birthPlace;
    }
    @Column(name = "native_place", nullable = true)
    public String getNativePlace() {
        return nativePlace;
    }
    public void setNativePlace(String nativePlace) {
        this.nativePlace = nativePlace;
    }
    @Column(name = "email", nullable = true)
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(name = "gender",nullable = true)
    public String getGender() {
        return gender;
    }
    public void setGender(String gender) {
        this.gender = gender;
    }
    @Column(name = "name", nullable = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "martial_status", nullable = true)
    public String getMartialStatus() {
        return martialStatus;
    }
    public void setMartialStatus(String martialStatus) {
        this.martialStatus = martialStatus;
    }
    @Column(name = "nation",  nullable = true)
    public String getNation() {
        return nation;
    }
    public void setNation(String nation) {
        this.nation = nation;
    }
    @Column(name = "residence_type", nullable = true)
    public String getResidenceType() {
        return residenceType;
    }
    public void setResidenceType(String residenceType) {
        this.residenceType = residenceType;
    }
    @Column(name = "work_address",  nullable = true)
    public String getWorkAddress() {
        return workAddress;
    }
    public void setWorkAddress(String workAddress) {
        this.workAddress = workAddress;
    }
    @Column(name = "home_address",  nullable = true)
    public String getHomeAddress() {
        return homeAddress;
    }
    public void setHomeAddress(String homeAddress) {
        this.homeAddress = homeAddress;
    }
    @Column(name = "password", nullable = true)
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    @Column(name = "telphone_number",  nullable = true)
    public String getTelephoneNo() {
        return telephoneNo;
    }
    public void setTelephoneNo(String telephoneNo) {
        this.telephoneNo = telephoneNo;
    }
    @Column(name = "pic_path",  nullable = true)
    public String getPicPath() {
        return picPath;
    }
    public void setPicPath(String picPath) {
        this.picPath = picPath;
    }
    @Column(name = "local_path",  nullable = true)
    public String getLocalPath() {
        return localPath;
    }
    public void setLocalPath(String localPath) {
        this.localPath = localPath;
    }
    @Column(name = "register_time",  nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getRegisterTime() {
        return registerTime;
    }
    public void setRegisterTime(Date registerTime) {
        this.registerTime = registerTime;
    }
}

+ 84 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/Families.java

@ -0,0 +1,84 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * @author Sand
 * @version 1.0
 * @updated 02-6月-2015 20:25:02
 */
@Entity
@Table(name = "families")
@Access(value = AccessType.PROPERTY)
public class Families {
    private String id;
    private String addressId;
    private String creator;
    private Date createDate;
    private String householderIdCardNo;
    private int status;
    private String telephone;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(name = "address",  nullable = true)
    public String getAddressId() {
        return addressId;
    }
    public void setAddressId(String addressId) {
        this.addressId = addressId;
    }
    @Column(name = "creator",  nullable = true)
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    @Column(name = "create_date",  nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    @Column(name = "householder_id_card_no",  nullable = false)
    public String getHouseholderIdCardNo() {
        return householderIdCardNo;
    }
    public void setHouseholderIdCardNo(String householderIdCardNo) {
        this.householderIdCardNo = householderIdCardNo;
    }
    @Column(name = "status",  nullable = false)
    public int getStatus() {
        return status;
    }
    public void setStatus(int status) {
        this.status = status;
    }
    @Column(name = "telephone",  nullable = true)
    public String getTelephone() {
        return telephone;
    }
    public void setTelephone(String telephone) {
        this.telephone = telephone;
    }
}

+ 149 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/MedicalCards.java

@ -0,0 +1,149 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 就诊卡
 * Created by cws on 2017/04/14.
 */
@Entity
@Table(name="medical_cards")
public class MedicalCards {
    protected Long id; // 非业务主键
    private String cardType;//'卡类别【字典】',
    private String cardNo;//'就诊卡号',
    private String releaseOrg;//发卡机构',
    private Date releaseDate;//发卡时间',
    private Date validityDateBegin;//'有效期起始时间',
    private Date validityDateEnd;//有效期截止时间',
    private String description;//描述',
    private String status;//卡状态 0无效 1有效',
    private Date createDate;//'创建时间',
    private String creater;//创建者',
    private Date updateDate;//修改时间',
    private String updater;//修改者'
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "card_no")
    public String getCardNo() {
        return cardNo;
    }
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    @Column(name = "release_org")
    public String getReleaseOrg() {
        return releaseOrg;
    }
    public void setReleaseOrg(String releaseOrg) {
        this.releaseOrg = releaseOrg;
    }
    @Column(name = "release_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReleaseDate() {
        return releaseDate;
    }
    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }
    @Column(name = "validity_date_begin")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateBegin() {
        return validityDateBegin;
    }
    public void setValidityDateBegin(Date validityDateBegin) {
        this.validityDateBegin = validityDateBegin;
    }
    @Column(name = "validity_date_end")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateEnd() {
        return validityDateEnd;
    }
    public void setValidityDateEnd(Date validityDateEnd) {
        this.validityDateEnd = validityDateEnd;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Column(name = "status")
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(name = "create_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    public String getCreater() {
        return creater;
    }
    public void setCreater(String creater) {
        this.creater = creater;
    }
    @Column(name = "update_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getUpdateDate() {
        return updateDate;
    }
    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }
    public String getUpdater() {
        return updater;
    }
    public void setUpdater(String updater) {
        this.updater = updater;
    }
}

+ 67 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/Members.java

@ -0,0 +1,67 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * @author Sand
 * @version 1.0
 * @updated 02-6月-2015 20:25:02
 */
@Entity
@Table(name = "members")
@Access(value = AccessType.PROPERTY)
public class Members {
    private String id;
    private String familyId;
    private String idCardNo;
    private String familyRelation;
    private Date createDate;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(name = "family_id",  nullable = false)
    public String getFamilyId() {
        return familyId;
    }
    public void setFamilyId(String familyId) {
        this.familyId = familyId;
    }
    @Column(name = "id_card_no",  nullable = false)
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    @Column(name = "family_relation",  nullable = false)
    public String getFamilyRelation() {
        return familyRelation;
    }
    public void setFamilyRelation(String familyRelation) {
        this.familyRelation = familyRelation;
    }
    @Column(name="create_date",nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate(){
        return createDate;
    }
    public void setCreateDate(Date createDate){
        this.createDate = createDate;
    }
}

+ 162 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/PhysicalCard.java

@ -0,0 +1,162 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.UUID;
/**
 * 卡抽象类,仅作为继承时的数据成员使用
 * @author Witness
 * @version 1.0
 * @created 25-5月-2015 17:47:13
 */
@Entity
@Table(name = "physical_cards")
@Access(value = AccessType.PROPERTY)
public class PhysicalCard extends AbstractCard implements Serializable {
	  String id;				    // 卡ID
	  String number;				// 卡号
	  String ownerName;			// 持有人姓名
	  String status;			// 状态 CardStatus
	  String cardType;				// 类型 CardType
	  String description;			// 描述
	  Date createDate;				// 创建日期
	  String idCardNo;          //身份证号
	  String DType;
	  //特殊字段
	  String local;				// 发行地/归属地
	  String releaseOrg;				// 发行机构
	  Date releaseDate;			// 发行时间
	  Date validityDateBegin;		// 有效期起始时间
	  Date validityDateEnd;		// 有效期结束时间
	public PhysicalCard() {
		id  = UUID.randomUUID().toString().replace("-","");
	}
	@Id
	@GeneratedValue(generator = "Generator")
	@GenericGenerator(name = "Generator", strategy = "assigned")
	@Column(name = "id", unique = true, nullable = false)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(name = "number",nullable = false )
	public String getNumber() {
		return number;
	}
	public void setNumber(String number) {
		this.number = number;
	}
	@Column(name = "owner_name", nullable = true)
	public String getOwnerName() {
		return ownerName;
	}
	public void setOwnerName(String ownerName) {
		this.ownerName = ownerName;
	}
	@Column(name = "card_status", nullable = true)
	public String getStatus() {
		return status;
	}
	public void setStatus(String status) {
		this.status = status;
	}
	@Column(name = "card_type", nullable = true)
	public String getCardType() {
		return cardType;
	}
	public void setCardType(String cardType) {
		this.cardType = cardType;
	}
	@Column(name = "description", nullable = true)
	public String getDescription() {
		return description;
	}
	public void setDescription(String description) {
		this.description = description;
	}
	@Column(name = "create_date", nullable = true)
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	public Date getCreateDate() {
		return createDate;
	}
	public void setCreateDate(Date createDate) {
		this.createDate = createDate;
	}
	@Column(name = "id_card_no", nullable = true)
	public String getIdCardNo() {
		return idCardNo;
	}
	public void setIdCardNo(String idCardNo) {
		this.idCardNo = idCardNo;
	}
	@Column(name = "DType", nullable = true)
	public String getDType() {
		return DType;
	}
	public void setDType(String DType) {
		this.DType = DType;
	}
	@Column(name = "local", nullable = true)
	public String getLocal() {
		return local;
	}
	public void setLocal(String local) {
		this.local = local;
	}
	@Column(name = "release_org", nullable = true)
	public String getReleaseOrg() {
		return releaseOrg;
	}
	public void setReleaseOrg(String releaseOrg) {
		this.releaseOrg = releaseOrg;
	}
	@Column(name = "release_date", nullable = true)
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	public Date getReleaseDate() {
		return releaseDate;
	}
	public void setReleaseDate(Date releaseDate) {
		this.releaseDate = releaseDate;
	}
	@Column(name = "validity_date_begin", nullable = true)
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	public Date getValidityDateBegin() {
		return validityDateBegin;
	}
	public void setValidityDateBegin(Date validityDateBegin) {
		this.validityDateBegin = validityDateBegin;
	}
	@Column(name = "validity_date_end", nullable = true)
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	public Date getValidityDateEnd() {
		return validityDateEnd;
	}
	public void setValidityDateEnd(Date validityDateEnd) {
		this.validityDateEnd = validityDateEnd;
	}
}

+ 246 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/UserCards.java

@ -0,0 +1,246 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 用户关联卡
 * Created by hzp on 2017/04/05.
 */
@Entity
@Table(name="user_cards")
public class UserCards {
    protected Long id; // 非业务主键
    private String userId;//'关联用户id',
    private String cardType;//'卡类别【字典】',
    private String cardNo;//'就诊卡号',
    private String local;//'归属地',
    private String ownerName;//'	持卡人姓名',
    private String ownerIdcard;// '	持卡人身份证',
    private String ownerPhone;//持卡人绑定手机',
    private String releaseOrg;//发卡机构',
    private Date releaseDate;//发卡时间',
    private Date validityDateBegin;//'有效期起始时间',
    private Date validityDateEnd;//有效期截止时间',
    private String description;//描述',
    private String openid;//第三方授权码',
    private String status;//卡状态 0无效 1有效',
    private Date createDate;//'创建时间',
    private String creater;//创建者',
    private Date updateDate;//修改时间',
    private String updater;//修改者',
    private Date auditDate;//审核时间
    private String auditor;//审核者
    private String auditStatus;//审核状态 0未审核  1 通过 2 拒绝
    private String auditReason;//审核不通过原因
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Column(name = "user_id")
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "card_no")
    public String getCardNo() {
        return cardNo;
    }
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    public String getLocal() {
        return local;
    }
    public void setLocal(String local) {
        this.local = local;
    }
    @Column(name = "owner_name")
    public String getOwnerName() {
        return ownerName;
    }
    public void setOwnerName(String ownerName) {
        this.ownerName = ownerName;
    }
    @Column(name = "owner_idcard")
    public String getOwnerIdcard() {
        return ownerIdcard;
    }
    public void setOwnerIdcard(String ownerIdcard) {
        this.ownerIdcard = ownerIdcard;
    }
    @Column(name = "owner_phone")
    public String getOwnerPhone() {
        return ownerPhone;
    }
    public void setOwnerPhone(String ownerPhone) {
        this.ownerPhone = ownerPhone;
    }
    @Column(name = "release_org")
    public String getReleaseOrg() {
        return releaseOrg;
    }
    public void setReleaseOrg(String releaseOrg) {
        this.releaseOrg = releaseOrg;
    }
    @Column(name = "release_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReleaseDate() {
        return releaseDate;
    }
    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }
    @Column(name = "validity_date_begin")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateBegin() {
        return validityDateBegin;
    }
    public void setValidityDateBegin(Date validityDateBegin) {
        this.validityDateBegin = validityDateBegin;
    }
    @Column(name = "validity_date_end")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateEnd() {
        return validityDateEnd;
    }
    public void setValidityDateEnd(Date validityDateEnd) {
        this.validityDateEnd = validityDateEnd;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getOpenid() {
        return openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(name = "create_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    public String getCreater() {
        return creater;
    }
    public void setCreater(String creater) {
        this.creater = creater;
    }
    @Column(name = "update_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getUpdateDate() {
        return updateDate;
    }
    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }
    public String getUpdater() {
        return updater;
    }
    public void setUpdater(String updater) {
        this.updater = updater;
    }
    @Column(name = "audit_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAuditDate() {
        return auditDate;
    }
    public void setAuditDate(Date auditDate) {
        this.auditDate = auditDate;
    }
    public String getAuditor() {
        return auditor;
    }
    public void setAuditor(String auditor) {
        this.auditor = auditor;
    }
    @Column(name = "audit_status")
    public String getAuditStatus() {
        return auditStatus;
    }
    public void setAuditStatus(String auditStatus) {
        this.auditStatus = auditStatus;
    }
    @Column(name = "audit_reason")
    public String getAuditReason() {
        return auditReason;
    }
    public void setAuditReason(String auditReason) {
        this.auditReason = auditReason;
    }
}

+ 123 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/patient/VirtualCard.java

@ -0,0 +1,123 @@
package com.yihu.jw.entity.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * 抽象虚拟卡
 * @author Sand
 * @version 1.0
 * @updated 11-6月-2015 9:52:03
 */
@Entity
@Table(name = "virtual_cards")
@Access(value = AccessType.PROPERTY)
public class VirtualCard extends AbstractCard {
	String id;				    // 卡ID
	String number;				// 卡号
	String ownerName;			// 持有人姓名
	String status;			// 状态 CardStatus
	String cardType;				// 类型 CardType
	String description;			// 描述
	Date createDate;				// 创建日期
	String idCardNo;          //身份证号
	String DType;
	String platform;
	public VirtualCard() {
//		id  = UUID.randomUUID().toString().replace("-","");
	}
	@Id
	@GeneratedValue(generator = "Generator")
	@GenericGenerator(name = "Generator", strategy = "assigned")
	@Column(name = "id", unique = true, nullable = false)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(name = "number", nullable = false)
	public String getNumber() {
		return number;
	}
	public void setNumber(String number) {
		this.number = number;
	}
	@Column(name = "owner_name",  nullable = true)
	public String getOwnerName() {
		return ownerName;
	}
	public void setOwnerName(String ownerName) {
		this.ownerName = ownerName;
	}
	@Column(name = "card_status", nullable = true)
	public String getStatus() {
		return status;
	}
	public void setStatus(String status) {
		this.status = status;
	}
	@Column(name = "card_type",  nullable = true)
	public String getCardType() {
		return cardType;
	}
	public void setCardType(String cardType) {
		this.cardType = cardType;
	}
	@Column(name = "description",  nullable = true)
	public String getDescription() {
		return description;
	}
	public void setDescription(String description) {
		this.description = description;
	}
	@Column(name = "create_date",  nullable = true)
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	public Date getCreateDate() {
		return createDate;
	}
	public void setCreateDate(Date createDate) {
		this.createDate = createDate;
	}
	@Column(name = "id_card_no", nullable = true)
	public String getIdCardNo() {
		return idCardNo;
	}
	public void setIdCardNo(String idCardNo) {
		this.idCardNo = idCardNo;
	}
	@Column(name = "DType",  nullable = true )
	public String getDType() {
		return DType;
	}
	public void setDType(String DType) {
		this.DType = DType;
	}
	@Column(name = "platform",  nullable = false )
	public String getPlatform() {
		return platform;
	}
	public void setPlatform(String platform) {
		this.platform = platform;
	}
}

+ 145 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResource.java

@ -0,0 +1,145 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "it_resource", schema = "", catalog = "healtharchive")
public class ItResource {
    private int id;
    private String name;
    private String version;
    private String platformType;
    private String packageType;
    private String description;
    private String developLan;
    private String validateType;
    private Integer status;
    private String url;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Column(name = "name", nullable = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "version", nullable = true)
    public String getVersion() {
        return version;
    }
    public void setVersion(String version) {
        this.version = version;
    }
    @Column(name = "platform_type", nullable = true)
    public String getPlatformType() {
        return platformType;
    }
    public void setPlatformType(String platformType) {
        this.platformType = platformType;
    }
    @Column(name = "package_type", nullable = true)
    public String getPackageType() {
        return packageType;
    }
    public void setPackageType(String packageType) {
        this.packageType = packageType;
    }
    @Column(name = "description", nullable = true)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Column(name = "develop_lan", nullable = true)
    public String getDevelopLan() {
        return developLan;
    }
    public void setDevelopLan(String developLan) {
        this.developLan = developLan;
    }
    @Column(name = "validate_type", nullable = true)
    public String getValidateType() {
        return validateType;
    }
    public void setValidateType(String validateType) {
        this.validateType = validateType;
    }
    @Column(name = "status", nullable = true)
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "url", nullable = true)
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        ItResource that = (ItResource) o;
        if (id != that.id) return false;
        if (name != null ? !name.equals(that.name) : that.name != null) return false;
        if (version != null ? !version.equals(that.version) : that.version != null) return false;
        if (platformType != null ? !platformType.equals(that.platformType) : that.platformType != null) return false;
        if (packageType != null ? !packageType.equals(that.packageType) : that.packageType != null) return false;
        if (description != null ? !description.equals(that.description) : that.description != null) return false;
        if (developLan != null ? !developLan.equals(that.developLan) : that.developLan != null) return false;
        if (validateType != null ? !validateType.equals(that.validateType) : that.validateType != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (name != null ? name.hashCode() : 0);
        result = 31 * result + (version != null ? version.hashCode() : 0);
        result = 31 * result + (platformType != null ? platformType.hashCode() : 0);
        result = 31 * result + (packageType != null ? packageType.hashCode() : 0);
        result = 31 * result + (description != null ? description.hashCode() : 0);
        result = 31 * result + (developLan != null ? developLan.hashCode() : 0);
        result = 31 * result + (validateType != null ? validateType.hashCode() : 0);
        return result;
    }
}

+ 114 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceDownload.java

@ -0,0 +1,114 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/3/11.
 */
@Entity
@Table(name = "it_resource_download", schema = "", catalog = "healtharchive")
public class ItResourceDownload {
    private Long id;
    private String name;
    private String version;
    private String platformType;
    private String pakageType;
    private String description;
    private String developLan;
    private String validateType;
    private String picUrl;
    private String url;
    private String iosQrCodeUrl;
    private String androidQrCodeUrl;
    private String uploadUser;
    private Date uploadTime;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public Long getId() {return id;}
    public void setId(Long id) {this.id = id;}
    @Basic
    @Column(name = "name", nullable = false, insertable = true, updatable = true)
    public String getName() {return name;}
    public void setName(String name) {this.name = name;}
    @Basic
    @Column(name = "version", nullable = false, insertable = true, updatable = true)
    public String getVersion() {return version;}
    public void setVersion(String version) {this.version = version;}
    @Basic
    @Column(name = "platform_type", nullable = true, insertable = true, updatable = true)
    public String getPlatformType() {return platformType;}
    public void setPlatformType(String platformType) {this.platformType = platformType;}
    @Basic
    @Column(name = "pakage_type", nullable = true, insertable = true, updatable = true)
    public String getPakageType() {return pakageType;}
    public void setPakageType(String pakageType) {this.pakageType = pakageType;}
    @Basic
    @Column(name = "description", nullable = true, insertable = true, updatable = true)
    public String getDescription() {return description;}
    public void setDescription(String description) {this.description = description;}
    @Basic
    @Column(name = "develop_lan", nullable = true, insertable = true, updatable = true)
    public String getDevelopLan() {return developLan;}
    public void setDevelopLan(String developLan) {this.developLan = developLan;}
    @Basic
    @Column(name = "validate_type", nullable = true, insertable = true, updatable = true)
    public String getValidateType() {return validateType;}
    public void setValidateType(String validateType) {this.validateType = validateType;}
    @Basic
    @Column(name = "pic_url", nullable = true, insertable = true, updatable = true)
    public String getPicUrl() {return picUrl;}
    public void setPicUrl(String picUrl) {this.picUrl = picUrl;}
    @Basic
    @Column(name = "url", nullable = true, insertable = true, updatable = true)
    public String getUrl() {return url;}
    public void setUrl(String url) {this.url = url;}
    @Basic
    @Column(name = "ios_qr_code_url", nullable = true, insertable = true, updatable = true)
    public String getIosQrCodeUrl() {return iosQrCodeUrl;}
    public void setIosQrCodeUrl(String iosQrCodeUrl) {this.iosQrCodeUrl = iosQrCodeUrl;}
    @Basic
    @Column(name = "android_qr_code_url", nullable = true, insertable = true, updatable = true)
    public String getAndroidQrCodeUrl() {return androidQrCodeUrl;}
    public void setAndroidQrCodeUrl(String androidQrCodeUrl) {this.androidQrCodeUrl = androidQrCodeUrl;}
    @Basic
    @Column(name = "upload_user", nullable = true, insertable = true, updatable = true)
    public String getUploadUser() {return uploadUser;}
    public void setUploadUser(String uploadUser) {this.uploadUser = uploadUser;}
    @Basic
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "upload_time")
    public Date getUploadTime() { return uploadTime;}
    public void setUploadTime(Date uploadTime) {this.uploadTime = uploadTime;}
}

+ 105 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareDb.java

@ -0,0 +1,105 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "it_resource_hardware_db", schema = "", catalog = "healtharchive")
public class ItResourceHardwareDb {
    private int id;
    private Integer masterId;
    private String purpose;
    private Integer applyQty;
    private String dbType;
    private Integer dataRise;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "master_id", nullable = true, insertable = true, updatable = true)
    public Integer getMasterId() {
        return masterId;
    }
    public void setMasterId(Integer masterId) {
        this.masterId = masterId;
    }
    @Basic
    @Column(name = "purpose", nullable = true, insertable = true, updatable = true)
    public String getPurpose() {
        return purpose;
    }
    public void setPurpose(String purpose) {
        this.purpose = purpose;
    }
    @Basic
    @Column(name = "apply_qty", nullable = true, insertable = true, updatable = true)
    public Integer getApplyQty() {
        return applyQty;
    }
    public void setApplyQty(Integer applyQty) {
        this.applyQty = applyQty;
    }
    @Basic
    @Column(name = "db_type", nullable = true, insertable = true, updatable = true)
    public String getDbType() {
        return dbType;
    }
    public void setDbType(String dbType) {
        this.dbType = dbType;
    }
    @Basic
    @Column(name = "data_rise", nullable = true, insertable = true, updatable = true)
    public Integer getDataRise() {
        return dataRise;
    }
    public void setDataRise(Integer dataRise) {
        this.dataRise = dataRise;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        ItResourceHardwareDb that = (ItResourceHardwareDb) o;
        if (id != that.id) return false;
        if (masterId != null ? !masterId.equals(that.masterId) : that.masterId != null) return false;
        if (purpose != null ? !purpose.equals(that.purpose) : that.purpose != null) return false;
        if (applyQty != null ? !applyQty.equals(that.applyQty) : that.applyQty != null) return false;
        if (dbType != null ? !dbType.equals(that.dbType) : that.dbType != null) return false;
        if (dataRise != null ? !dataRise.equals(that.dataRise) : that.dataRise != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (masterId != null ? masterId.hashCode() : 0);
        result = 31 * result + (purpose != null ? purpose.hashCode() : 0);
        result = 31 * result + (applyQty != null ? applyQty.hashCode() : 0);
        result = 31 * result + (dbType != null ? dbType.hashCode() : 0);
        result = 31 * result + (dataRise != null ? dataRise.hashCode() : 0);
        return result;
    }
}

+ 172 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareMaster.java

@ -0,0 +1,172 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "it_resource_hardware_master", schema = "", catalog = "healtharchive")
public class ItResourceHardwareMaster {
    private int id;
    private String applyUserId;
    private String applyUserName;
    private String orgId;
    private String applyAppId;
    private Timestamp applyDate;
    private Integer resourceType;
    private Integer applyStatus;
    private String description;
    private String approver;
    private Timestamp approvalTime;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "apply_user_id", nullable = true, insertable = true, updatable = true)
    public String getApplyUserId() {
        return applyUserId;
    }
    public void setApplyUserId(String applyUserId) {
        this.applyUserId = applyUserId;
    }
    @Basic
    @Column(name = "apply_user_name", nullable = true, insertable = true, updatable = true)
    public String getApplyUserName() {
        return applyUserName;
    }
    public void setApplyUserName(String applyUserName) {
        this.applyUserName = applyUserName;
    }
    @Basic
    @Column(name = "org_id", nullable = true, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Basic
    @Column(name = "apply_app_id", nullable = true, insertable = true, updatable = true)
    public String getApplyAppId() {
        return applyAppId;
    }
    public void setApplyAppId(String applyAppId) {
        this.applyAppId = applyAppId;
    }
    @Basic
    @Column(name = "apply_date", nullable = true, insertable = true, updatable = true)
    public Timestamp getApplyDate() {
        return applyDate;
    }
    public void setApplyDate(Timestamp applyDate) {
        this.applyDate = applyDate;
    }
    @Basic
    @Column(name = "resource_type", nullable = true, insertable = true, updatable = true)
    public Integer getResourceType() {
        return resourceType;
    }
    public void setResourceType(Integer resourceType) {
        this.resourceType = resourceType;
    }
    @Basic
    @Column(name = "apply_status", nullable = true, insertable = true, updatable = true)
    public Integer getApplyStatus() {
        return applyStatus;
    }
    public void setApplyStatus(Integer applyStatus) {
        this.applyStatus = applyStatus;
    }
    @Basic
    @Column(name = "description", nullable = true, insertable = true, updatable = true)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Basic
    @Column(name = "approver", nullable = true, insertable = true, updatable = true)
    public String getApprover() {
        return approver;
    }
    public void setApprover(String approver) {
        this.approver = approver;
    }
    @Basic
    @Column(name = "approval_time", nullable = true, insertable = true, updatable = true)
    public Timestamp getApprovalTime() {
        return approvalTime;
    }
    public void setApprovalTime(Timestamp approvalTime) {
        this.approvalTime = approvalTime;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        ItResourceHardwareMaster that = (ItResourceHardwareMaster) o;
        if (id != that.id) return false;
        if (applyUserId != null ? !applyUserId.equals(that.applyUserId) : that.applyUserId != null) return false;
        if (applyUserName != null ? !applyUserName.equals(that.applyUserName) : that.applyUserName != null)
            return false;
        if (orgId != null ? !orgId.equals(that.orgId) : that.orgId != null) return false;
        if (applyAppId != null ? !applyAppId.equals(that.applyAppId) : that.applyAppId != null) return false;
        if (applyDate != null ? !applyDate.equals(that.applyDate) : that.applyDate != null) return false;
        if (resourceType != null ? !resourceType.equals(that.resourceType) : that.resourceType != null) return false;
        if (applyStatus != null ? !applyStatus.equals(that.applyStatus) : that.applyStatus != null) return false;
        if (description != null ? !description.equals(that.description) : that.description != null) return false;
        if (approver != null ? !approver.equals(that.approver) : that.approver != null) return false;
        if (approvalTime != null ? !approvalTime.equals(that.approvalTime) : that.approvalTime != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (applyUserId != null ? applyUserId.hashCode() : 0);
        result = 31 * result + (applyUserName != null ? applyUserName.hashCode() : 0);
        result = 31 * result + (orgId != null ? orgId.hashCode() : 0);
        result = 31 * result + (applyAppId != null ? applyAppId.hashCode() : 0);
        result = 31 * result + (applyDate != null ? applyDate.hashCode() : 0);
        result = 31 * result + (resourceType != null ? resourceType.hashCode() : 0);
        result = 31 * result + (applyStatus != null ? applyStatus.hashCode() : 0);
        result = 31 * result + (description != null ? description.hashCode() : 0);
        result = 31 * result + (approver != null ? approver.hashCode() : 0);
        result = 31 * result + (approvalTime != null ? approvalTime.hashCode() : 0);
        return result;
    }
}

+ 394 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareResult.java

@ -0,0 +1,394 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "it_resource_hardware_result", schema = "", catalog = "healtharchive")
public class ItResourceHardwareResult {
    private int id;
    private Integer masterId;
    private Integer detailId;
    private String orgId;
    private String orgName;
    private String appId;
    private String appName;
    private String description;
    private String purpose;
    private String applyUserId;
    private String applyUserName;
    private String applyPhone;
    private String publicIp;
    private String publicPort;
    private String privateIp;
    private String privatePort;
    private String domain;
    private Integer cpu;
    private Integer memory;
    private Integer hardware;
    private Integer bandWidty;
    private String system;
    private String preInstalledSoftware;
    private String loginCode;
    private String loginPw;
    private Integer activityFlag;
    private Timestamp insertTime;
    private String remark;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "master_id", nullable = true, insertable = true, updatable = true)
    public Integer getMasterId() {
        return masterId;
    }
    public void setMasterId(Integer masterId) {
        this.masterId = masterId;
    }
    @Basic
    @Column(name = "detail_id", nullable = true, insertable = true, updatable = true)
    public Integer getDetailId() {
        return detailId;
    }
    public void setDetailId(Integer detailId) {
        this.detailId = detailId;
    }
    @Basic
    @Column(name = "org_id", nullable = true, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Basic
    @Column(name = "org_name", nullable = true, insertable = true, updatable = true)
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Basic
    @Column(name = "app_id", nullable = true, insertable = true, updatable = true)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    @Basic
    @Column(name = "app_name", nullable = true, insertable = true, updatable = true)
    public String getAppName() {
        return appName;
    }
    public void setAppName(String appName) {
        this.appName = appName;
    }
    @Basic
    @Column(name = "description", nullable = true, insertable = true, updatable = true)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Basic
    @Column(name = "purpose", nullable = true, insertable = true, updatable = true)
    public String getPurpose() {
        return purpose;
    }
    public void setPurpose(String purpose) {
        this.purpose = purpose;
    }
    @Basic
    @Column(name = "apply_user_id", nullable = true, insertable = true, updatable = true)
    public String getApplyUserId() {
        return applyUserId;
    }
    public void setApplyUserId(String applyUserId) {
        this.applyUserId = applyUserId;
    }
    @Basic
    @Column(name = "apply_user_name", nullable = true, insertable = true, updatable = true)
    public String getApplyUserName() {
        return applyUserName;
    }
    public void setApplyUserName(String applyUserName) {
        this.applyUserName = applyUserName;
    }
    @Basic
    @Column(name = "apply_phone", nullable = true, insertable = true, updatable = true)
    public String getApplyPhone() {
        return applyPhone;
    }
    public void setApplyPhone(String applyPhone) {
        this.applyPhone = applyPhone;
    }
    @Basic
    @Column(name = "public_ip", nullable = true, insertable = true, updatable = true)
    public String getPublicIp() {
        return publicIp;
    }
    public void setPublicIp(String publicIp) {
        this.publicIp = publicIp;
    }
    @Basic
    @Column(name = "public_port", nullable = true, insertable = true, updatable = true)
    public String getPublicPort() {
        return publicPort;
    }
    public void setPublicPort(String publicPort) {
        this.publicPort = publicPort;
    }
    @Basic
    @Column(name = "private_ip", nullable = true, insertable = true, updatable = true)
    public String getPrivateIp() {
        return privateIp;
    }
    public void setPrivateIp(String privateIp) {
        this.privateIp = privateIp;
    }
    @Basic
    @Column(name = "private_port", nullable = true, insertable = true, updatable = true)
    public String getPrivatePort() {
        return privatePort;
    }
    public void setPrivatePort(String privatePort) {
        this.privatePort = privatePort;
    }
    @Basic
    @Column(name = "domain", nullable = true, insertable = true, updatable = true)
    public String getDomain() {
        return domain;
    }
    public void setDomain(String domain) {
        this.domain = domain;
    }
    @Basic
    @Column(name = "cpu", nullable = true, insertable = true, updatable = true)
    public Integer getCpu() {
        return cpu;
    }
    public void setCpu(Integer cpu) {
        this.cpu = cpu;
    }
    @Basic
    @Column(name = "memory", nullable = true, insertable = true, updatable = true)
    public Integer getMemory() {
        return memory;
    }
    public void setMemory(Integer memory) {
        this.memory = memory;
    }
    @Basic
    @Column(name = "hardware", nullable = true, insertable = true, updatable = true)
    public Integer getHardware() {
        return hardware;
    }
    public void setHardware(Integer hardware) {
        this.hardware = hardware;
    }
    @Basic
    @Column(name = "band_widty", nullable = true, insertable = true, updatable = true)
    public Integer getBandWidty() {
        return bandWidty;
    }
    public void setBandWidty(Integer bandWidty) {
        this.bandWidty = bandWidty;
    }
    @Basic
    @Column(name = "system", nullable = true, insertable = true, updatable = true)
    public String getSystem() {
        return system;
    }
    public void setSystem(String system) {
        this.system = system;
    }
    @Basic
    @Column(name = "pre_installed_software", nullable = true, insertable = true, updatable = true)
    public String getPreInstalledSoftware() {
        return preInstalledSoftware;
    }
    public void setPreInstalledSoftware(String preInstalledSoftware) {
        this.preInstalledSoftware = preInstalledSoftware;
    }
    @Basic
    @Column(name = "login_code", nullable = true, insertable = true, updatable = true)
    public String getLoginCode() {
        return loginCode;
    }
    public void setLoginCode(String loginCode) {
        this.loginCode = loginCode;
    }
    @Basic
    @Column(name = "login_pw", nullable = true, insertable = true, updatable = true)
    public String getLoginPw() {
        return loginPw;
    }
    public void setLoginPw(String loginPw) {
        this.loginPw = loginPw;
    }
    @Basic
    @Column(name = "activity_flag", nullable = true, insertable = true, updatable = true)
    public Integer getActivityFlag() {
        return activityFlag;
    }
    public void setActivityFlag(Integer activityFlag) {
        this.activityFlag = activityFlag;
    }
    @Basic
    @Column(name = "insert_time", nullable = true, insertable = true, updatable = true)
    public Timestamp getInsertTime() {
        return insertTime;
    }
    public void setInsertTime(Timestamp insertTime) {
        this.insertTime = insertTime;
    }
    @Basic
    @Column(name = "remark", nullable = true, insertable = true, updatable = true)
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        ItResourceHardwareResult that = (ItResourceHardwareResult) o;
        if (id != that.id) return false;
        if (masterId != null ? !masterId.equals(that.masterId) : that.masterId != null) return false;
        if (detailId != null ? !detailId.equals(that.detailId) : that.detailId != null) return false;
        if (orgId != null ? !orgId.equals(that.orgId) : that.orgId != null) return false;
        if (orgName != null ? !orgName.equals(that.orgName) : that.orgName != null) return false;
        if (appId != null ? !appId.equals(that.appId) : that.appId != null) return false;
        if (appName != null ? !appName.equals(that.appName) : that.appName != null) return false;
        if (description != null ? !description.equals(that.description) : that.description != null) return false;
        if (purpose != null ? !purpose.equals(that.purpose) : that.purpose != null) return false;
        if (applyUserId != null ? !applyUserId.equals(that.applyUserId) : that.applyUserId != null) return false;
        if (applyUserName != null ? !applyUserName.equals(that.applyUserName) : that.applyUserName != null)
            return false;
        if (applyPhone != null ? !applyPhone.equals(that.applyPhone) : that.applyPhone != null) return false;
        if (publicIp != null ? !publicIp.equals(that.publicIp) : that.publicIp != null) return false;
        if (publicPort != null ? !publicPort.equals(that.publicPort) : that.publicPort != null) return false;
        if (privateIp != null ? !privateIp.equals(that.privateIp) : that.privateIp != null) return false;
        if (privatePort != null ? !privatePort.equals(that.privatePort) : that.privatePort != null) return false;
        if (domain != null ? !domain.equals(that.domain) : that.domain != null) return false;
        if (cpu != null ? !cpu.equals(that.cpu) : that.cpu != null) return false;
        if (memory != null ? !memory.equals(that.memory) : that.memory != null) return false;
        if (hardware != null ? !hardware.equals(that.hardware) : that.hardware != null) return false;
        if (bandWidty != null ? !bandWidty.equals(that.bandWidty) : that.bandWidty != null) return false;
        if (system != null ? !system.equals(that.system) : that.system != null) return false;
        if (preInstalledSoftware != null ? !preInstalledSoftware.equals(that.preInstalledSoftware) : that.preInstalledSoftware != null)
            return false;
        if (loginCode != null ? !loginCode.equals(that.loginCode) : that.loginCode != null) return false;
        if (loginPw != null ? !loginPw.equals(that.loginPw) : that.loginPw != null) return false;
        if (activityFlag != null ? !activityFlag.equals(that.activityFlag) : that.activityFlag != null) return false;
        if (insertTime != null ? !insertTime.equals(that.insertTime) : that.insertTime != null) return false;
        if (remark != null ? !remark.equals(that.remark) : that.remark != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (masterId != null ? masterId.hashCode() : 0);
        result = 31 * result + (detailId != null ? detailId.hashCode() : 0);
        result = 31 * result + (orgId != null ? orgId.hashCode() : 0);
        result = 31 * result + (orgName != null ? orgName.hashCode() : 0);
        result = 31 * result + (appId != null ? appId.hashCode() : 0);
        result = 31 * result + (appName != null ? appName.hashCode() : 0);
        result = 31 * result + (description != null ? description.hashCode() : 0);
        result = 31 * result + (purpose != null ? purpose.hashCode() : 0);
        result = 31 * result + (applyUserId != null ? applyUserId.hashCode() : 0);
        result = 31 * result + (applyUserName != null ? applyUserName.hashCode() : 0);
        result = 31 * result + (applyPhone != null ? applyPhone.hashCode() : 0);
        result = 31 * result + (publicIp != null ? publicIp.hashCode() : 0);
        result = 31 * result + (publicPort != null ? publicPort.hashCode() : 0);
        result = 31 * result + (privateIp != null ? privateIp.hashCode() : 0);
        result = 31 * result + (privatePort != null ? privatePort.hashCode() : 0);
        result = 31 * result + (domain != null ? domain.hashCode() : 0);
        result = 31 * result + (cpu != null ? cpu.hashCode() : 0);
        result = 31 * result + (memory != null ? memory.hashCode() : 0);
        result = 31 * result + (hardware != null ? hardware.hashCode() : 0);
        result = 31 * result + (bandWidty != null ? bandWidty.hashCode() : 0);
        result = 31 * result + (system != null ? system.hashCode() : 0);
        result = 31 * result + (preInstalledSoftware != null ? preInstalledSoftware.hashCode() : 0);
        result = 31 * result + (loginCode != null ? loginCode.hashCode() : 0);
        result = 31 * result + (loginPw != null ? loginPw.hashCode() : 0);
        result = 31 * result + (activityFlag != null ? activityFlag.hashCode() : 0);
        result = 31 * result + (insertTime != null ? insertTime.hashCode() : 0);
        result = 31 * result + (remark != null ? remark.hashCode() : 0);
        return result;
    }
}

+ 197 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceHardwareServer.java

@ -0,0 +1,197 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "it_resource_hardware_server", schema = "", catalog = "healtharchive")
public class ItResourceHardwareServer {
    private int id;
    private Integer masterId;
    private Integer cpu;
    private Integer memory;
    private Integer hardware;
    private String purpose;
    private Integer applyQty;
    private Integer bandWidty;
    private String port;
    private String system;
    private String preInstalledSoftware;
    private String domain;
    private Integer status;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "master_id", nullable = true, insertable = true, updatable = true)
    public Integer getMasterId() {
        return masterId;
    }
    public void setMasterId(Integer masterId) {
        this.masterId = masterId;
    }
    @Basic
    @Column(name = "cpu", nullable = true, insertable = true, updatable = true)
    public Integer getCpu() {
        return cpu;
    }
    public void setCpu(Integer cpu) {
        this.cpu = cpu;
    }
    @Basic
    @Column(name = "memory", nullable = true, insertable = true, updatable = true)
    public Integer getMemory() {
        return memory;
    }
    public void setMemory(Integer memory) {
        this.memory = memory;
    }
    @Basic
    @Column(name = "hardware", nullable = true, insertable = true, updatable = true)
    public Integer getHardware() {
        return hardware;
    }
    public void setHardware(Integer hardware) {
        this.hardware = hardware;
    }
    @Basic
    @Column(name = "purpose", nullable = true, insertable = true, updatable = true)
    public String getPurpose() {
        return purpose;
    }
    public void setPurpose(String purpose) {
        this.purpose = purpose;
    }
    @Basic
    @Column(name = "apply_qty", nullable = true, insertable = true, updatable = true)
    public Integer getApplyQty() {
        return applyQty;
    }
    public void setApplyQty(Integer applyQty) {
        this.applyQty = applyQty;
    }
    @Basic
    @Column(name = "band_widty", nullable = true, insertable = true, updatable = true)
    public Integer getBandWidty() {
        return bandWidty;
    }
    public void setBandWidty(Integer bandWidty) {
        this.bandWidty = bandWidty;
    }
    @Basic
    @Column(name = "port", nullable = true, insertable = true, updatable = true)
    public String getPort() {
        return port;
    }
    public void setPort(String port) {
        this.port = port;
    }
    @Basic
    @Column(name = "system", nullable = true, insertable = true, updatable = true)
    public String getSystem() {
        return system;
    }
    public void setSystem(String system) {
        this.system = system;
    }
    @Basic
    @Column(name = "pre_installed_software", nullable = true, insertable = true, updatable = true)
    public String getPreInstalledSoftware() {
        return preInstalledSoftware;
    }
    public void setPreInstalledSoftware(String preInstalledSoftware) {
        this.preInstalledSoftware = preInstalledSoftware;
    }
    @Basic
    @Column(name = "domain", nullable = true, insertable = true, updatable = true)
    public String getDomain() {
        return domain;
    }
    public void setDomain(String domain) {
        this.domain = domain;
    }
    @Basic
    @Column(name = "status", nullable = true, insertable = true, updatable = true)
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        ItResourceHardwareServer that = (ItResourceHardwareServer) o;
        if (id != that.id) return false;
        if (masterId != null ? !masterId.equals(that.masterId) : that.masterId != null) return false;
        if (cpu != null ? !cpu.equals(that.cpu) : that.cpu != null) return false;
        if (memory != null ? !memory.equals(that.memory) : that.memory != null) return false;
        if (hardware != null ? !hardware.equals(that.hardware) : that.hardware != null) return false;
        if (purpose != null ? !purpose.equals(that.purpose) : that.purpose != null) return false;
        if (applyQty != null ? !applyQty.equals(that.applyQty) : that.applyQty != null) return false;
        if (bandWidty != null ? !bandWidty.equals(that.bandWidty) : that.bandWidty != null) return false;
        if (port != null ? !port.equals(that.port) : that.port != null) return false;
        if (system != null ? !system.equals(that.system) : that.system != null) return false;
        if (preInstalledSoftware != null ? !preInstalledSoftware.equals(that.preInstalledSoftware) : that.preInstalledSoftware != null)
            return false;
        if (domain != null ? !domain.equals(that.domain) : that.domain != null) return false;
        if (status != null ? !status.equals(that.status) : that.status != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (masterId != null ? masterId.hashCode() : 0);
        result = 31 * result + (cpu != null ? cpu.hashCode() : 0);
        result = 31 * result + (memory != null ? memory.hashCode() : 0);
        result = 31 * result + (hardware != null ? hardware.hashCode() : 0);
        result = 31 * result + (purpose != null ? purpose.hashCode() : 0);
        result = 31 * result + (applyQty != null ? applyQty.hashCode() : 0);
        result = 31 * result + (bandWidty != null ? bandWidty.hashCode() : 0);
        result = 31 * result + (port != null ? port.hashCode() : 0);
        result = 31 * result + (system != null ? system.hashCode() : 0);
        result = 31 * result + (preInstalledSoftware != null ? preInstalledSoftware.hashCode() : 0);
        result = 31 * result + (domain != null ? domain.hashCode() : 0);
        result = 31 * result + (status != null ? status.hashCode() : 0);
        return result;
    }
}

+ 172 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceSoftwareMaster.java

@ -0,0 +1,172 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "it_resource_software_master", schema = "", catalog = "healtharchive")
public class ItResourceSoftwareMaster {
    private int id;
    private String applyUserId;
    private String applyUserName;
    private String orgId;
    private String applyAppId;
    private Integer applyType;
    private String namespace;
    private Integer applyStatus;
    private String description;
    private String approver;
    private Timestamp approvalTime;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "apply_user_id", nullable = true, insertable = true, updatable = true)
    public String getApplyUserId() {
        return applyUserId;
    }
    public void setApplyUserId(String applyUserId) {
        this.applyUserId = applyUserId;
    }
    @Basic
    @Column(name = "apply_user_name", nullable = true, insertable = true, updatable = true)
    public String getApplyUserName() {
        return applyUserName;
    }
    public void setApplyUserName(String applyUserName) {
        this.applyUserName = applyUserName;
    }
    @Basic
    @Column(name = "org_id", nullable = true, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Basic
    @Column(name = "apply_app_id", nullable = true, insertable = true, updatable = true)
    public String getApplyAppId() {
        return applyAppId;
    }
    public void setApplyAppId(String applyAppId) {
        this.applyAppId = applyAppId;
    }
    @Basic
    @Column(name = "apply_type", nullable = true, insertable = true, updatable = true)
    public Integer getApplyType() {
        return applyType;
    }
    public void setApplyType(Integer applyType) {
        this.applyType = applyType;
    }
    @Basic
    @Column(name = "namespace", nullable = true, insertable = true, updatable = true)
    public String getNamespace() {
        return namespace;
    }
    public void setNamespace(String namespace) {
        this.namespace = namespace;
    }
    @Basic
    @Column(name = "apply_status", nullable = true, insertable = true, updatable = true)
    public Integer getApplyStatus() {
        return applyStatus;
    }
    public void setApplyStatus(Integer applyStatus) {
        this.applyStatus = applyStatus;
    }
    @Basic
    @Column(name = "description", nullable = true, insertable = true, updatable = true)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Basic
    @Column(name = "approver", nullable = true, insertable = true, updatable = true)
    public String getApprover() {
        return approver;
    }
    public void setApprover(String approver) {
        this.approver = approver;
    }
    @Basic
    @Column(name = "approval_time", nullable = true, insertable = true, updatable = true)
    public Timestamp getApprovalTime() {
        return approvalTime;
    }
    public void setApprovalTime(Timestamp approvalTime) {
        this.approvalTime = approvalTime;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        ItResourceSoftwareMaster that = (ItResourceSoftwareMaster) o;
        if (id != that.id) return false;
        if (applyUserId != null ? !applyUserId.equals(that.applyUserId) : that.applyUserId != null) return false;
        if (applyUserName != null ? !applyUserName.equals(that.applyUserName) : that.applyUserName != null)
            return false;
        if (orgId != null ? !orgId.equals(that.orgId) : that.orgId != null) return false;
        if (applyAppId != null ? !applyAppId.equals(that.applyAppId) : that.applyAppId != null) return false;
        if (applyType != null ? !applyType.equals(that.applyType) : that.applyType != null) return false;
        if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) return false;
        if (applyStatus != null ? !applyStatus.equals(that.applyStatus) : that.applyStatus != null) return false;
        if (description != null ? !description.equals(that.description) : that.description != null) return false;
        if (approver != null ? !approver.equals(that.approver) : that.approver != null) return false;
        if (approvalTime != null ? !approvalTime.equals(that.approvalTime) : that.approvalTime != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (applyUserId != null ? applyUserId.hashCode() : 0);
        result = 31 * result + (applyUserName != null ? applyUserName.hashCode() : 0);
        result = 31 * result + (orgId != null ? orgId.hashCode() : 0);
        result = 31 * result + (applyAppId != null ? applyAppId.hashCode() : 0);
        result = 31 * result + (applyType != null ? applyType.hashCode() : 0);
        result = 31 * result + (namespace != null ? namespace.hashCode() : 0);
        result = 31 * result + (applyStatus != null ? applyStatus.hashCode() : 0);
        result = 31 * result + (description != null ? description.hashCode() : 0);
        result = 31 * result + (approver != null ? approver.hashCode() : 0);
        result = 31 * result + (approvalTime != null ? approvalTime.hashCode() : 0);
        return result;
    }
}

+ 341 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/ItResourceSoftwareResult.java

@ -0,0 +1,341 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "it_resource_software_result", schema = "", catalog = "healtharchive")
public class ItResourceSoftwareResult {
    private int id;
    private Integer masterId;
    private Integer detailId;
    private String orgId;
    private String orgName;
    private String appId;
    private String appName;
    private String description;
    private String purpose;
    private String applyUserId;
    private String applyUserName;
    private String applyPhone;
    private String publicIp;
    private String publicPort;
    private String privateIp;
    private String privatePort;
    private String domain;
    private String namespace;
    private String databaseName;
    private String loginCode;
    private String loginPw;
    private Integer activityFlag;
    private Timestamp insertTime;
    private String remark;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "master_id", nullable = true, insertable = true, updatable = true)
    public Integer getMasterId() {
        return masterId;
    }
    public void setMasterId(Integer masterId) {
        this.masterId = masterId;
    }
    @Basic
    @Column(name = "detail_id", nullable = true, insertable = true, updatable = true)
    public Integer getDetailId() {
        return detailId;
    }
    public void setDetailId(Integer detailId) {
        this.detailId = detailId;
    }
    @Basic
    @Column(name = "org_id", nullable = true, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Basic
    @Column(name = "org_name", nullable = true, insertable = true, updatable = true)
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Basic
    @Column(name = "app_id", nullable = true, insertable = true, updatable = true)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    @Basic
    @Column(name = "app_name", nullable = true, insertable = true, updatable = true)
    public String getAppName() {
        return appName;
    }
    public void setAppName(String appName) {
        this.appName = appName;
    }
    @Basic
    @Column(name = "description", nullable = true, insertable = true, updatable = true)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Basic
    @Column(name = "purpose", nullable = true, insertable = true, updatable = true)
    public String getPurpose() {
        return purpose;
    }
    public void setPurpose(String purpose) {
        this.purpose = purpose;
    }
    @Basic
    @Column(name = "apply_user_id", nullable = true, insertable = true, updatable = true)
    public String getApplyUserId() {
        return applyUserId;
    }
    public void setApplyUserId(String applyUserId) {
        this.applyUserId = applyUserId;
    }
    @Basic
    @Column(name = "apply_user_name", nullable = true, insertable = true, updatable = true)
    public String getApplyUserName() {
        return applyUserName;
    }
    public void setApplyUserName(String applyUserName) {
        this.applyUserName = applyUserName;
    }
    @Basic
    @Column(name = "apply_phone", nullable = true, insertable = true, updatable = true)
    public String getApplyPhone() {
        return applyPhone;
    }
    public void setApplyPhone(String applyPhone) {
        this.applyPhone = applyPhone;
    }
    @Basic
    @Column(name = "public_ip", nullable = true, insertable = true, updatable = true)
    public String getPublicIp() {
        return publicIp;
    }
    public void setPublicIp(String publicIp) {
        this.publicIp = publicIp;
    }
    @Basic
    @Column(name = "public_port", nullable = true, insertable = true, updatable = true)
    public String getPublicPort() {
        return publicPort;
    }
    public void setPublicPort(String publicPort) {
        this.publicPort = publicPort;
    }
    @Basic
    @Column(name = "private_ip", nullable = true, insertable = true, updatable = true)
    public String getPrivateIp() {
        return privateIp;
    }
    public void setPrivateIp(String privateIp) {
        this.privateIp = privateIp;
    }
    @Basic
    @Column(name = "private_port", nullable = true, insertable = true, updatable = true)
    public String getPrivatePort() {
        return privatePort;
    }
    public void setPrivatePort(String privatePort) {
        this.privatePort = privatePort;
    }
    @Basic
    @Column(name = "domain", nullable = true, insertable = true, updatable = true)
    public String getDomain() {
        return domain;
    }
    public void setDomain(String domain) {
        this.domain = domain;
    }
    @Basic
    @Column(name = "namespace", nullable = true, insertable = true, updatable = true)
    public String getNamespace() {
        return namespace;
    }
    public void setNamespace(String namespace) {
        this.namespace = namespace;
    }
    @Basic
    @Column(name = "database_name", nullable = true, insertable = true, updatable = true)
    public String getDatabaseName() {
        return databaseName;
    }
    public void setDatabaseName(String databaseName) {
        this.databaseName = databaseName;
    }
    @Basic
    @Column(name = "login_code", nullable = true, insertable = true, updatable = true)
    public String getLoginCode() {
        return loginCode;
    }
    public void setLoginCode(String loginCode) {
        this.loginCode = loginCode;
    }
    @Basic
    @Column(name = "login_pw", nullable = true, insertable = true, updatable = true)
    public String getLoginPw() {
        return loginPw;
    }
    public void setLoginPw(String loginPw) {
        this.loginPw = loginPw;
    }
    @Basic
    @Column(name = "activity_flag", nullable = true, insertable = true, updatable = true)
    public Integer getActivityFlag() {
        return activityFlag;
    }
    public void setActivityFlag(Integer activityFlag) {
        this.activityFlag = activityFlag;
    }
    @Basic
    @Column(name = "insert_time", nullable = true, insertable = true, updatable = true)
    public Timestamp getInsertTime() {
        return insertTime;
    }
    public void setInsertTime(Timestamp insertTime) {
        this.insertTime = insertTime;
    }
    @Basic
    @Column(name = "remark", nullable = true, insertable = true, updatable = true)
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        ItResourceSoftwareResult that = (ItResourceSoftwareResult) o;
        if (id != that.id) return false;
        if (masterId != null ? !masterId.equals(that.masterId) : that.masterId != null) return false;
        if (detailId != null ? !detailId.equals(that.detailId) : that.detailId != null) return false;
        if (orgId != null ? !orgId.equals(that.orgId) : that.orgId != null) return false;
        if (orgName != null ? !orgName.equals(that.orgName) : that.orgName != null) return false;
        if (appId != null ? !appId.equals(that.appId) : that.appId != null) return false;
        if (appName != null ? !appName.equals(that.appName) : that.appName != null) return false;
        if (description != null ? !description.equals(that.description) : that.description != null) return false;
        if (purpose != null ? !purpose.equals(that.purpose) : that.purpose != null) return false;
        if (applyUserId != null ? !applyUserId.equals(that.applyUserId) : that.applyUserId != null) return false;
        if (applyUserName != null ? !applyUserName.equals(that.applyUserName) : that.applyUserName != null)
            return false;
        if (applyPhone != null ? !applyPhone.equals(that.applyPhone) : that.applyPhone != null) return false;
        if (publicIp != null ? !publicIp.equals(that.publicIp) : that.publicIp != null) return false;
        if (publicPort != null ? !publicPort.equals(that.publicPort) : that.publicPort != null) return false;
        if (privateIp != null ? !privateIp.equals(that.privateIp) : that.privateIp != null) return false;
        if (privatePort != null ? !privatePort.equals(that.privatePort) : that.privatePort != null) return false;
        if (domain != null ? !domain.equals(that.domain) : that.domain != null) return false;
        if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) return false;
        if (databaseName != null ? !databaseName.equals(that.databaseName) : that.databaseName != null) return false;
        if (loginCode != null ? !loginCode.equals(that.loginCode) : that.loginCode != null) return false;
        if (loginPw != null ? !loginPw.equals(that.loginPw) : that.loginPw != null) return false;
        if (activityFlag != null ? !activityFlag.equals(that.activityFlag) : that.activityFlag != null) return false;
        if (insertTime != null ? !insertTime.equals(that.insertTime) : that.insertTime != null) return false;
        if (remark != null ? !remark.equals(that.remark) : that.remark != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (masterId != null ? masterId.hashCode() : 0);
        result = 31 * result + (detailId != null ? detailId.hashCode() : 0);
        result = 31 * result + (orgId != null ? orgId.hashCode() : 0);
        result = 31 * result + (orgName != null ? orgName.hashCode() : 0);
        result = 31 * result + (appId != null ? appId.hashCode() : 0);
        result = 31 * result + (appName != null ? appName.hashCode() : 0);
        result = 31 * result + (description != null ? description.hashCode() : 0);
        result = 31 * result + (purpose != null ? purpose.hashCode() : 0);
        result = 31 * result + (applyUserId != null ? applyUserId.hashCode() : 0);
        result = 31 * result + (applyUserName != null ? applyUserName.hashCode() : 0);
        result = 31 * result + (applyPhone != null ? applyPhone.hashCode() : 0);
        result = 31 * result + (publicIp != null ? publicIp.hashCode() : 0);
        result = 31 * result + (publicPort != null ? publicPort.hashCode() : 0);
        result = 31 * result + (privateIp != null ? privateIp.hashCode() : 0);
        result = 31 * result + (privatePort != null ? privatePort.hashCode() : 0);
        result = 31 * result + (domain != null ? domain.hashCode() : 0);
        result = 31 * result + (namespace != null ? namespace.hashCode() : 0);
        result = 31 * result + (databaseName != null ? databaseName.hashCode() : 0);
        result = 31 * result + (loginCode != null ? loginCode.hashCode() : 0);
        result = 31 * result + (loginPw != null ? loginPw.hashCode() : 0);
        result = 31 * result + (activityFlag != null ? activityFlag.hashCode() : 0);
        result = 31 * result + (insertTime != null ? insertTime.hashCode() : 0);
        result = 31 * result + (remark != null ? remark.hashCode() : 0);
        return result;
    }
}

+ 207 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalAccountRepresentation.java

@ -0,0 +1,207 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * BaseEmploy entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "portal_account_representation",schema = "",catalog = "healtharchive")
public class PortalAccountRepresentation implements Serializable {
	// Fields
	private Long id;
	private String code;
	private Integer status; //审批状态 0待审核1已审核
	private String eName; //名字
	private String eMobile; //手机号码
	private String eIdcard;//身份证
	private Integer type;//申述类型1手机号码变更 2重置密码 3其他
	private String typeContent;//问题说明
	private String photo;//图片,多个逗号隔开
	@CreatedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
	private Date createTime;
	@CreatedBy
	@Column(name = "create_user",updatable = false)
	private String createUser;
	@CreatedBy
	@Column(name = "create_user_name",updatable = false)
	private String createUserName;
	@LastModifiedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "update_time", nullable = false, length = 0)
	private Date updateTime;
	@LastModifiedBy
	@Column(name = "update_user")
	private String updateUser;
	@LastModifiedBy
	@Column(name = "update_user_name")
	private String updateUserName;
	// Constructors
	/** default constructor */
	public PortalAccountRepresentation() {
	}
	public PortalAccountRepresentation(String code, Integer status, String eName, String eMobile, String eIdcard, Integer type, String typeContent, String photo, Date createTime, String createUser, String createUserName, Date updateTime, String updateUser, String updateUserName) {
		this.code = code;
		this.status = status;
		this.eName = eName;
		this.eMobile = eMobile;
		this.eIdcard = eIdcard;
		this.type = type;
		this.typeContent = typeContent;
		this.photo = photo;
		this.createTime = createTime;
		this.createUser = createUser;
		this.createUserName = createUserName;
		this.updateTime = updateTime;
		this.updateUser = updateUser;
		this.updateUserName = updateUserName;
	}
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "status")
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Column(name = "e_name", length = 50)
	public String geteName() {
		return eName;
	}
	public void seteName(String eName) {
		this.eName = eName;
	}
	@Column(name = "e_mobile", length = 50)
	public String geteMobile() {
		return eMobile;
	}
	public void seteMobile(String eMobile) {
		this.eMobile = eMobile;
	}
	@Column(name = "e_idcard", length = 50)
	public String geteIdcard() {
		return eIdcard;
	}
	public void seteIdcard(String eIdcard) {
		this.eIdcard = eIdcard;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	@Column(name = "type_content", length = 300)
	public String getTypeContent() {
		return typeContent;
	}
	public void setTypeContent(String typeContent) {
		this.typeContent = typeContent;
	}
	@Column(name = "photo", length = 800)
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo1) {
		this.photo = photo;
	}
	public Date getCreateTime() {
		return createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	public String getCreateUser() {
		return createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	public String getCreateUserName() {
		return createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	public Date getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	public String getUpdateUser() {
		return updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	public String getUpdateUserName() {
		return updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
}

+ 106 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalDoctorShortcut.java

@ -0,0 +1,106 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "portal_doctor_shortcut", schema = "", catalog = "healtharchive")
public class PortalDoctorShortcut {
    private int id;
    private String userId;
    private String appId;
    private String workUri;
    private String workName;
    private Integer displayStatus;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "user_id", nullable = true, insertable = true, updatable = true)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Basic
    @Column(name = "app_id", nullable = true, insertable = true, updatable = true)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    @Basic
    @Column(name = "work_uri", nullable = true, insertable = true, updatable = true)
    public String getWorkUri() {
        return workUri;
    }
    public void setWorkUri(String workUri) {
        this.workUri = workUri;
    }
    @Basic
    @Column(name = "work_name", nullable = true, insertable = true, updatable = true)
    public String getWorkName() {
        return workName;
    }
    public void setWorkName(String workName) {
        this.workName = workName;
    }
    @Basic
    @Column(name = "display_status", nullable = true, insertable = true, updatable = true)
    public Integer getDisplayStatus() {
        return displayStatus;
    }
    public void setDisplayStatus(Integer displayStatus) {
        this.displayStatus = displayStatus;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        PortalDoctorShortcut that = (PortalDoctorShortcut) o;
        if (id != that.id) return false;
        if (userId != null ? !userId.equals(that.userId) : that.userId != null) return false;
        if (appId != null ? !appId.equals(that.appId) : that.appId != null) return false;
        if (workUri != null ? !workUri.equals(that.workUri) : that.workUri != null) return false;
        if (workName != null ? !workName.equals(that.workName) : that.workName != null) return false;
        if (displayStatus != null ? !displayStatus.equals(that.displayStatus) : that.displayStatus != null)
            return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (userId != null ? userId.hashCode() : 0);
        result = 31 * result + (appId != null ? appId.hashCode() : 0);
        result = 31 * result + (workUri != null ? workUri.hashCode() : 0);
        result = 31 * result + (workName != null ? workName.hashCode() : 0);
        result = 31 * result + (displayStatus != null ? displayStatus.hashCode() : 0);
        return result;
    }
}

+ 174 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalFeedback.java

@ -0,0 +1,174 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "portal_feedback", schema = "", catalog = "healtharchive")
public class PortalFeedback {
    private Long id;
    private String clientId;
    private String userId;
    private String content;
    private Date submitDate;
    private Integer flag;
    private String replyContent;
    private String replyUserId;
    private Date replyDate;
    private String feedBackType;//消息反馈类型(功能异常、功能优化、新功能建议、其他)
    private String tel;// 联系方式
    private String pigPath;//上传图片(多张图片地址,用逗号隔开)
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Basic
    @Column(name = "client_id", nullable = true, insertable = true, updatable = true)
    public String getClientId() {
        return clientId;
    }
    public void setClientId(String clientId) {
        this.clientId = clientId;
    }
    @Basic
    @Column(name = "user_id", nullable = true, insertable = true, updatable = true)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Basic
    @Column(name = "content", nullable = true, insertable = true, updatable = true)
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Basic
    @Column(name = "submit_date", nullable = true, insertable = true, updatable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getSubmitDate() {
        return submitDate;
    }
    public void setSubmitDate(Date submitDate) {
        this.submitDate = submitDate;
    }
    @Basic
    @Column(name = "flag", nullable = true, insertable = true, updatable = true)
    public Integer getFlag() {
        return flag;
    }
    public void setFlag(Integer flag) {
        this.flag = flag;
    }
    @Basic
    @Column(name = "reply_content", nullable = true, insertable = true, updatable = true)
    public String getReplyContent() {
        return replyContent;
    }
    public void setReplyContent(String replyContent) {
        this.replyContent = replyContent;
    }
    @Basic
    @Column(name = "reply_user_id", nullable = true, insertable = true, updatable = true)
    public String getReplyUserId() {
        return replyUserId;
    }
    public void setReplyUserId(String replyUserId) {
        this.replyUserId = replyUserId;
    }
    @Basic
    @Column(name = "reply_date", nullable = true, insertable = true, updatable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReplyDate() {
        return replyDate;
    }
    public void setReplyDate(Date replyDate) {
        this.replyDate = replyDate;
    }
    @Basic
    @Column(name = "feedbacktype", nullable = true, insertable = true, updatable = true)
    public String getFeedBackType() {
        return feedBackType;
    }
    public void setFeedBackType(String feedBackType) {
        this.feedBackType = feedBackType;
    }
    @Basic
    @Column(name = "tel", nullable = true, insertable = true, updatable = true)
    public String getTel() {
        return tel;
    }
    public void setTel(String tel) {
        this.tel = tel;
    }
    @Basic
    @Column(name = "pigpath", nullable = true, insertable = true, updatable = true)
    public String getPigPath() {
        return pigPath;
    }
    public void setPigPath(String pigPath) {
        this.pigPath = pigPath;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        PortalFeedback that = (PortalFeedback) o;
        if (id != that.id) return false;
        if (clientId != null ? !clientId.equals(that.clientId) : that.clientId != null) return false;
        if (userId != null ? !userId.equals(that.userId) : that.userId != null) return false;
        if (content != null ? !content.equals(that.content) : that.content != null) return false;
        if (submitDate != null ? !submitDate.equals(that.submitDate) : that.submitDate != null) return false;
        if (flag != null ? !flag.equals(that.flag) : that.flag != null) return false;
        if (replyContent != null ? !replyContent.equals(that.replyContent) : that.replyContent != null) return false;
        if (replyUserId != null ? !replyUserId.equals(that.replyUserId) : that.replyUserId != null) return false;
        if (replyDate != null ? !replyDate.equals(that.replyDate) : that.replyDate != null) return false;
        if (feedBackType != null ? !feedBackType.equals(that.feedBackType) : that.feedBackType != null) return false;
        if (tel != null ? !tel.equals(that.tel) : that.tel != null) return false;
        if (pigPath != null ? !pigPath.equals(that.pigPath) : that.pigPath != null) return false;
        return true;
    }
}

+ 3 - 3
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/PortalMessageTemplate.java

@ -1,10 +1,10 @@
package com.yihu.jw.entity.ehr.resource;
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * @author zdm
 * @since 2018.04.21
 * @author <a href="mailto:yhy23456@163.com">huiyang.yu</a>
 * @since 2018.03.21
 */
@Entity
@Table(name = "portal_message_template", schema = "", catalog = "healtharchive")

+ 120 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalNotices.java

@ -0,0 +1,120 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "portal_notices", schema = "", catalog = "healtharchive")
public class PortalNotices {
    private Long id;
    private Integer type;
    private Integer portalType;
    private String title;
    private String content;
    private String fileId;
    private String releaseAuthor;
    private Date releaseDate;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Basic
    @Column(name = "type", nullable = true, insertable = true, updatable = true)
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Basic
    @Column(name = "portal_type", nullable = true, insertable = true, updatable = true)
    public Integer getPortalType() {  return portalType;}
    public void setPortalType(Integer portalType) {this.portalType = portalType;}
    @Basic
    @Column(name = "title", nullable = true, insertable = true, updatable = true)
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Basic
    @Column(name = "content", nullable = true, insertable = true, updatable = true)
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Basic
    @Column(name = "file_id", nullable = true, insertable = true, updatable = true)
    public String getFileId() {
        return fileId;
    }
    public void setFileId(String fileId) {
        this.fileId = fileId;
    }
    @Basic
    @Column(name = "release_author", nullable = true, insertable = true, updatable = true)
    public String getReleaseAuthor() {
        return releaseAuthor;
    }
    public void setReleaseAuthor(String releaseAuthor) {
        this.releaseAuthor = releaseAuthor;
    }
    @Basic
    @Column(name = "release_date", nullable = true, insertable = true, updatable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReleaseDate() {
        return releaseDate;
    }
    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        PortalNotices that = (PortalNotices) o;
        if (id != that.id) return false;
        if (type != null ? !type.equals(that.type) : that.type != null) return false;
        if (content != null ? !content.equals(that.content) : that.content != null) return false;
        if (fileId != null ? !fileId.equals(that.fileId) : that.fileId != null) return false;
        if (releaseAuthor != null ? !releaseAuthor.equals(that.releaseAuthor) : that.releaseAuthor != null)
            return false;
        if (releaseDate != null ? !releaseDate.equals(that.releaseDate) : that.releaseDate != null) return false;
        return true;
    }
}

+ 120 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalSetting.java

@ -0,0 +1,120 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "portal_setting", schema = "", catalog = "healtharchive")
public class PortalSetting {
    private Long id;
    private String orgId;
    private String appId;
    private String columnUri;
    private String columnName;
    private Integer columnRequestType;
    private Integer appApiId;
    private String status;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Basic
    @Column(name = "org_id", nullable = true, insertable = true, updatable = true)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Basic
    @Column(name = "app_id", nullable = true, insertable = true, updatable = true)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    @Basic
    @Column(name = "column_uri", nullable = true, insertable = true, updatable = true)
    public String getColumnUri() {
        return columnUri;
    }
    public void setColumnUri(String columnUri) {
        this.columnUri = columnUri;
    }
    @Basic
    @Column(name = "column_name", nullable = true, insertable = true, updatable = true)
    public String getColumnName() {
        return columnName;
    }
    public void setColumnName(String columnName) {
        this.columnName = columnName;
    }
    @Basic
    @Column(name = "column_request_type", nullable = true, insertable = true, updatable = true)
    public Integer getColumnRequestType() {
        return columnRequestType;
    }
    public void setColumnRequestType(Integer columnRequestType) {
        this.columnRequestType = columnRequestType;
    }
    @Basic
    @Column(name = "app_api_id", nullable = true, insertable = true, updatable = true)
    public Integer getAppApiId() {
        return appApiId;
    }
    public void setAppApiId(Integer appApiId) {
        this.appApiId = appApiId;
    }
    @Basic
    @Column(name = "status", nullable = true, insertable = true, updatable = true)
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        PortalSetting that = (PortalSetting) o;
        if (id != that.id) return false;
        if (orgId != null ? !orgId.equals(that.orgId) : that.orgId != null) return false;
        if (appId != null ? !appId.equals(that.appId) : that.appId != null) return false;
        if (columnUri != null ? !columnUri.equals(that.columnUri) : that.columnUri != null) return false;
        if (columnName != null ? !columnName.equals(that.columnName) : that.columnName != null) return false;
        if (columnRequestType != null ? !columnRequestType.equals(that.columnRequestType) : that.columnRequestType != null)
            return false;
        if (appApiId != null ? !appApiId.equals(that.appApiId) : that.appApiId != null) return false;
        if (status != null ? !status.equals(that.status) : that.status != null) return false;
        return true;
    }
}

+ 113 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/PortalStandards.java

@ -0,0 +1,113 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "portal_standards", schema = "", catalog = "healtharchive")
public class PortalStandards {
    private Long id;
    private String name;
    private String mdfilePath;
    private Integer releaseFlag;
    private String version;
    private String releaseAuthor;
    private Date releaseDate;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Basic
    @Column(name = "name", nullable = true, insertable = true, updatable = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Basic
    @Column(name = "mdfile_path", nullable = true, insertable = true, updatable = true)
    public String getMdfilePath() {
        return mdfilePath;
    }
    public void setMdfilePath(String mdfilePath) {
        this.mdfilePath = mdfilePath;
    }
    @Basic
    @Column(name = "release_flag", nullable = true, insertable = true, updatable = true)
    public Integer getReleaseFlag() {
        return releaseFlag;
    }
    public void setReleaseFlag(Integer releaseFlag) {
        this.releaseFlag = releaseFlag;
    }
    @Basic
    @Column(name = "version", nullable = true, insertable = true, updatable = true)
    public String getVersion() {
        return version;
    }
    public void setVersion(String version) {
        this.version = version;
    }
    @Basic
    @Column(name = "release_author", nullable = true, insertable = true, updatable = true)
    public String getReleaseAuthor() {
        return releaseAuthor;
    }
    public void setReleaseAuthor(String releaseAuthor) {
        this.releaseAuthor = releaseAuthor;
    }
    @Basic
    @Column(name = "release_date", nullable = true, insertable = true, updatable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReleaseDate() {
        return releaseDate;
    }
    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        PortalStandards that = (PortalStandards) o;
        if (id != that.id) return false;
        if (name != null ? !name.equals(that.name) : that.name != null) return false;
        if (mdfilePath != null ? !mdfilePath.equals(that.mdfilePath) : that.mdfilePath != null) return false;
        if (releaseFlag != null ? !releaseFlag.equals(that.releaseFlag) : that.releaseFlag != null) return false;
        if (version != null ? !version.equals(that.version) : that.version != null) return false;
        if (releaseAuthor != null ? !releaseAuthor.equals(that.releaseAuthor) : that.releaseAuthor != null)
            return false;
        if (releaseDate != null ? !releaseDate.equals(that.releaseDate) : that.releaseDate != null) return false;
        return true;
    }
}

+ 6 - 4
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/ProtalMessageRemind.java

@ -1,4 +1,4 @@
package com.yihu.jw.entity.ehr.resource;
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -6,11 +6,11 @@ import javax.persistence.*;
import java.util.Date;
/**
 * 健康上饶app、公众健康服务平台-满意度调查
 * 消息提醒
 *
 * @author zdm
 * @author HZY
 * @vsrsion 1.0
 * Created at 2018/4/20.
 * Created at 2017/2/20.
 */
@Entity
@Table(name = "portal_message_remind", schema = "", catalog = "healtharchive")
@ -184,6 +184,7 @@ public class ProtalMessageRemind {
    public void setPortalMessagerTemplateType(String portalMessagerTemplateType) {
        this.portalMessagerTemplateType = portalMessagerTemplateType;
    }
    @Column(name = "appraise_flag", nullable = true, insertable = true, updatable = true)
    public String getAppraiseFlag() {
        return appraiseFlag;
@ -192,4 +193,5 @@ public class ProtalMessageRemind {
    public void setAppraiseFlag(String appraiseFlag) {
        this.appraiseFlag = appraiseFlag;
    }
}

+ 111 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyAnswers.java

@ -0,0 +1,111 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by zhangdan on 2018/04/14.
 */
@Entity
@Table(name = "portal_survey_answers",schema = "",catalog = "healtharchive")
public class SurveyAnswers implements Serializable {
    private Long id;
    //问答题答案编码
    private String code;
    //问卷编码
    private String surveyCode;
    //问答题题目编码
    private String questionCode;
    //问答题答案
    private String content;
    //创建时间
    private Date createTime;
    //用户表id
    private String userId;
    public SurveyAnswers() {
    }
    public SurveyAnswers(String code, String surveyCode, String questionCode, String content, Date createTime) {
        this.code = code;
        this.surveyCode = surveyCode;
        this.questionCode = questionCode;
        this.content = content;
        this.createTime = createTime;
    }
    public SurveyAnswers(String code, String surveyCode, String questionCode, String content, Date createTime, String userId) {
        this.code = code;
        this.surveyCode = surveyCode;
        this.questionCode = questionCode;
        this.content = content;
        this.createTime = createTime;
        this.userId = userId;
    }
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getSurveyCode() {
        return surveyCode;
    }
    public void setSurveyCode(String surveyCode) {
        this.surveyCode = surveyCode;
    }
    public String getQuestionCode() {
        return questionCode;
    }
    public void setQuestionCode(String questionCode) {
        this.questionCode = questionCode;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
}

+ 65 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyLabelInfo.java

@ -0,0 +1,65 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * 问卷调查标签信息表
 * Created by zhangdan on 2018/4/14.
 */
@Entity
@Table(name = "portal_survey_label_info",schema = "",catalog = "healtharchive")
public class SurveyLabelInfo {
    private static final long serialVersionUID = 1L;
    private Long id;
    private String code;
    private String relationCode;//关联编码
    private Integer useType;//关联编码类型(0模板 1问卷)
    private Integer label;//标签(1满意度、2糖尿病、3高血压、4生活日常)
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "relation_code")
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    @Column(name = "use_type")
    public Integer getUseType() {
        return useType;
    }
    public void setUseType(Integer useType) {
        this.useType = useType;
    }
    public Integer getLabel() {
        return label;
    }
    public void setLabel(Integer label) {
        this.label = label;
    }
}

+ 138 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyOptionAnswers.java

@ -0,0 +1,138 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by zhangdan on 2018/4/14.
 */
@Entity
@Table(name = "portal_survey_option_answers",schema = "",catalog = "healtharchive")
public class SurveyOptionAnswers implements Serializable {
    private Long id;
    //选择答案编码
    private String code;
    //问卷编码
    private String surveyCode;
    //选择题题目编码
    private String questionCode;
    //选项编码
    private String optionsCode;
    //选项说明(可为null)
    private String optionComment;
    //答案类型(0单选 1多选)
    private  int answerType;
    //创建时间
    private Date createTime;
    //用户表id
    private String userId;
    public SurveyOptionAnswers() {
    }
    public SurveyOptionAnswers(String code, String surveyCode, String questionCode, String optionsCode, String optionComment, int answerType, Date createTime) {
        this.code = code;
        this.surveyCode = surveyCode;
        this.questionCode = questionCode;
        this.optionsCode = optionsCode;
        this.optionComment = optionComment;
        this.answerType = answerType;
        this.createTime = createTime;
    }
    public SurveyOptionAnswers(String code, String surveyCode, String questionCode, String optionsCode, String optionComment, int answerType, Date createTime, String userId) {
        this.code = code;
        this.surveyCode = surveyCode;
        this.questionCode = questionCode;
        this.optionsCode = optionsCode;
        this.optionComment = optionComment;
        this.answerType = answerType;
        this.createTime = createTime;
        this.userId = userId;
    }
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getSurveyCode() {
        return surveyCode;
    }
    public void setSurveyCode(String surveyCode) {
        this.surveyCode = surveyCode;
    }
    public String getQuestionCode() {
        return questionCode;
    }
    public void setQuestionCode(String questionCode) {
        this.questionCode = questionCode;
    }
    public String getOptionsCode() {
        return optionsCode;
    }
    public void setOptionsCode(String optionsCode) {
        this.optionsCode = optionsCode;
    }
    public String getOptionComment() {
        return optionComment;
    }
    public void setOptionComment(String optionComment) {
        this.optionComment = optionComment;
    }
    public int getAnswerType() {
        return answerType;
    }
    public void setAnswerType(int answerType) {
        this.answerType = answerType;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
}

+ 128 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyQuestion.java

@ -0,0 +1,128 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 问卷调查题库题目表
 * Created by zhangdan on 2018/4/17.
 */
@Entity
@Table(name = "portal_survey_questions")
public class SurveyQuestion{
    private static final long serialVersionUID = 1L;
    private Long id;
    private String code;
    private String title;//标题
    private String comment;//问题说明
    private Integer questionType;//问题类型(0单选 1多选 2问答)
    private Integer isRequired;//是否必答(0否 1是)
    private Long minNum;//最小答案个数(多选有效)
    private Long maxNum;//最大答案个数(多选有效)
    private String del;//删除标志(1正常,0删除)
    private Date createTime;              //创建时间
    private Date updateTime;//修改时间
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Column(name = "question_comment")
    public String getComment() {
        return comment;
    }
    public void setComment(String comment) {
        this.comment = comment;
    }
    @Column(name = "question_type")
    public Integer getQuestionType() {
        return questionType;
    }
    public void setQuestionType(Integer questionType) {
        this.questionType = questionType;
    }
    @Column(name = "is_required")
    public Integer getIsRequired() {
        return isRequired;
    }
    public void setIsRequired(Integer isRequired) {
        this.isRequired = isRequired;
    }
    @Column(name = "min_num")
    public Long getMinNum() {
        return minNum;
    }
    public void setMinNum(Long minNum) {
        this.minNum = minNum;
    }
    @Column(name = "max_num")
    public Long getMaxNum() {
        return maxNum;
    }
    public void setMaxNum(Long maxNum) {
        this.maxNum = maxNum;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    @Column(name = "create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "update_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
}

+ 93 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyQuestionOption.java

@ -0,0 +1,93 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * 问卷调查题库选项表
 * Created by zhangdan on 2018/4/17.
 */
@Entity
@Table(name = "portal_survey_questions_options")
public class SurveyQuestionOption{
    private static final long serialVersionUID = 1L;
    private Long id;
    private String code;
    private Integer haveComment;//是否有选项说明(0没有 1有)
    private String questionCode;//问题编码
    private String content;//选项内容
    private Integer isRequired;//选项说明是否必填(0否 1是)
    private Integer sort;//单题内排序
    private String del;//删除标志(1正常,0删除)
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "have_comment")
    public Integer getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(Integer haveComment) {
        this.haveComment = haveComment;
    }
    @Column(name = "question_code")
    public String getQuestionCode() {
        return questionCode;
    }
    public void setQuestionCode(String questionCode) {
        this.questionCode = questionCode;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Column(name = "is_required")
    public Integer getIsRequired() {
        return isRequired;
    }
    public void setIsRequired(Integer isRequired) {
        this.isRequired = isRequired;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

+ 154 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyStatistics.java

@ -0,0 +1,154 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by zhangdan  on 2018/4/14.
 */
@Entity
@Table(name = "portal_survey_statistics",schema = "",catalog = "healtharchive")
public class SurveyStatistics implements Serializable{
    private Long id;
//    业务主键
    private String code;
//    问卷编码
    private String surveyCode;
//    题目编码
    private String questionCode;
//    题目名称
    private  String questionTitle;
//    选项编码
    private String optionsCode;
//    人数(加1)
   private Integer amount;
//   选项内容可为null
    private  String content;
//    是否有选项说明(0没有 1有)可为null
    private  Integer haveComment;
//    问题类型(0单选 1多选 2问答)
    private Integer type;
//    问题排序
    private  Integer qstSort;
//    选项排序可为null
    private  Integer optSort;
    public SurveyStatistics() {
    }
    public SurveyStatistics(String code, String surveyCode, String questionCode, String questionTitle, String optionsCode, Integer amount, String content, Integer haveComment, Integer type, Integer qstSort, Integer optSort) {
        this.code = code;
        this.surveyCode = surveyCode;
        this.questionCode = questionCode;
        this.questionTitle = questionTitle;
        this.optionsCode = optionsCode;
        this.amount = amount;
        this.content = content;
        this.haveComment = haveComment;
        this.type = type;
        this.qstSort = qstSort;
        this.optSort = optSort;
    }
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getSurveyCode() {
        return surveyCode;
    }
    public void setSurveyCode(String surveyCode) {
        this.surveyCode = surveyCode;
    }
    public String getQuestionCode() {
        return questionCode;
    }
    public void setQuestionCode(String questionCode) {
        this.questionCode = questionCode;
    }
    public String getQuestionTitle() {
        return questionTitle;
    }
    public void setQuestionTitle(String questionTitle) {
        this.questionTitle = questionTitle;
    }
    public String getOptionsCode() {
        return optionsCode;
    }
    public void setOptionsCode(String optionsCode) {
        this.optionsCode = optionsCode;
    }
    public Integer getAmount() {
        return amount;
    }
    public void setAmount(Integer amount) {
        this.amount = amount;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public Integer getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(Integer haveComment) {
        this.haveComment = haveComment;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getQstSort() {
        return qstSort;
    }
    public void setQstSort(Integer qstSort) {
        this.qstSort = qstSort;
    }
    public Integer getOptSort() {
        return optSort;
    }
    public void setOptSort(Integer optSort) {
        this.optSort = optSort;
    }
}

+ 95 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyTemplate.java

@ -0,0 +1,95 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by zhangdan on 2018/4/14.
 */
@Entity
@Table(name = "portal_survey_templates", schema = "", catalog = "healtharchive")
public class SurveyTemplate{
    private static final long serialVersionUID = 1L;
    private Long id;
    private String code;
    private String title;//标题
    private String comment;//模板说明
    private String creater;//创建人
    private String del;//删除标志(1正常,0删除)
    private Date createTime;              //创建时间
    private Date updateTime;//修改时间
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Column(name = "template_comment")
    public String getComment() {
        return comment;
    }
    public void setComment(String comment) {
        this.comment = comment;
    }
    public String getCreater() {
        return creater;
    }
    public void setCreater(String creater) {
        this.creater = creater;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    @Column(name = "create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "update_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
}

+ 120 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyTemplateOptions.java

@ -0,0 +1,120 @@
package com.yihu.jw.entity.ehr.portal;
import javax.persistence.*;
/**
 * 问卷调查模板选项表
 * Created by zhangdan on 2018/4/14.
 */
@Entity
@Table(name = "portal_survey_template_options", schema = "", catalog = "healtharchive")
public class SurveyTemplateOptions {
    private static final long serialVersionUID = 1L;
    private Long id;
    private String code;
    private Integer haveComment;//是否有选项说明(0没有 1有)
    private String questionCode;//问题编码
    private String templateCode;//模板编码
    private String content;//选项内容
    private String questionCodeNext;//下一题问题编码(问答题逻辑跳转)
    private String questionSortNext;
    private Integer isRequired;//选项说明是否必填(0否 1是)
    private Integer sort;//单题内排序
    private String del;//删除标志(1正常,0删除)
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "have_comment")
    public Integer getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(Integer haveComment) {
        this.haveComment = haveComment;
    }
    @Column(name = "template_question_code")
    public String getQuestionCode() {
        return questionCode;
    }
    public void setQuestionCode(String questionCode) {
        this.questionCode = questionCode;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Column(name = "is_required")
    public Integer getIsRequired() {
        return isRequired;
    }
    public void setIsRequired(Integer isRequired) {
        this.isRequired = isRequired;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    @Column(name = "template_code")
    public String getTemplateCode() {
        return templateCode;
    }
    public void setTemplateCode(String templateCode) {
        this.templateCode = templateCode;
    }
    public String getQuestionSortNext() {
        return questionSortNext;
    }
    public void setQuestionSortNext(String questionSortNext) {
        this.questionSortNext = questionSortNext;
    }
    @Column(name = "question_code_next")
    public String getQuestionCodeNext() {
        return questionCodeNext;
    }
    public void setQuestionCodeNext(String questionCodeNext) {
        this.questionCodeNext = questionCodeNext;
    }
}

+ 166 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/portal/SurveyTemplateQuestions.java

@ -0,0 +1,166 @@
package com.yihu.jw.entity.ehr.portal;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * 问卷调查模板题目表
 * Created by zhangdan on 2018/4/14.
 */
@Entity
@Table(name = "portal_survey_template_questions", schema = "", catalog = "healtharchive")
public class SurveyTemplateQuestions {
    private static final long serialVersionUID = 1L;
    private Long id;
    private String code;
    private String templateCode;//模板code
    private String title;//标题
    private String comment;//问题说明
    private Integer questionType;//问题类型(0单选 1多选 2问答)
    private Integer isRequired;//是否必答(0否 1是)
    private Long minNum;//最小答案个数(多选有效)
    private Long maxNum;//最大答案个数(多选有效)
    private String del;//删除标志(1正常,0删除)
    private String questionCodeNext;//下一题问题编码(问答题逻辑跳转)
    private String questionSortNext;
    private Long sort;//排序 分为模板内排序、问卷内排序、题库可不排序
    private Date createTime;              //创建时间
    private Date updateTime;//修改时间
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Column(name = "question_comment")
    public String getComment() {
        return comment;
    }
    public void setComment(String comment) {
        this.comment = comment;
    }
    @Column(name = "question_type")
    public Integer getQuestionType() {
        return questionType;
    }
    public void setQuestionType(Integer questionType) {
        this.questionType = questionType;
    }
    @Column(name = "is_required")
    public Integer getIsRequired() {
        return isRequired;
    }
    public void setIsRequired(Integer isRequired) {
        this.isRequired = isRequired;
    }
    @Column(name = "min_num")
    public Long getMinNum() {
        return minNum;
    }
    public void setMinNum(Long minNum) {
        this.minNum = minNum;
    }
    @Column(name = "max_num")
    public Long getMaxNum() {
        return maxNum;
    }
    public void setMaxNum(Long maxNum) {
        this.maxNum = maxNum;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    public Long getSort() {
        return sort;
    }
    public void setSort(Long sort) {
        this.sort = sort;
    }
    @Column(name = "template_code")
    public String getTemplateCode() {
        return templateCode;
    }
    public void setTemplateCode(String templateCode) {
        this.templateCode = templateCode;
    }
    @Column(name = "question_code_next")
    public String getQuestionCodeNext() {
        return questionCodeNext;
    }
    public void setQuestionCodeNext(String questionCodeNext) {
        this.questionCodeNext = questionCodeNext;
    }
    @Column(name = "create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "update_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getQuestionSortNext() {
        return questionSortNext;
    }
    public void setQuestionSortNext(String questionSortNext) {
        this.questionSortNext = questionSortNext;
    }
}

+ 198 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/JsonArchives.java

@ -0,0 +1,198 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;
/**
 * JSON档案包。
 *
 */
@Entity
@Table(name = "json_archives")
public class JsonArchives {
    public enum ArchiveStatus {
        // 0 已缓存
        Received,
        // 1 正在入库
        Acquired,
        // 2 入库失败
        Failed,
        // 3 已入库
        Finished
        // 4 未能入库的档案
        //LegacyIgnored;
    }
    private String id;
    private String pwd;
    private String remotePath;
    private String message;
    private String md5;
    private String orgCode;
    private String clientId;                            // 档案应用来源
    private Date receiveDate;
    private Date parseDate;
    private Date finishDate;
    private boolean resourced;                          // 是否已经资源化处理
    private ArchiveStatus archiveStatus;
    private String eventType;//就诊事件类型 0门诊 1住院 2体检',
    private String eventNo;//就诊事件no',
    private Date eventDate;//就诊时间',
    private String patientId;//医院患者ID'
    @Id
    @Column(name = "id", unique = true, nullable = false)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(name = "pwd", nullable = false)
    public String getPwd() {
        return pwd;
    }
    public void setPwd(String pwd) {
        this.pwd = pwd;
    }
    @Column(name = "remote_path")
    public String getRemotePath() {
        return remotePath;
    }
    public void setRemotePath(String remotePath) {
        this.remotePath = remotePath;
    }
    @Column(name = "receive_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReceiveDate() {
        return receiveDate;
    }
    public void setReceiveDate(Date date) {
        receiveDate = date;
    }
    @Column(name = "parse_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getParseDate() {
        return parseDate;
    }
    public void setParseDate(Date date) {
        this.parseDate = date;
    }
    @Column(name = "finish_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getFinishDate() {
        return finishDate;
    }
    public void setFinishDate(Date date) {
        this.finishDate = date;
    }
    @Column(name = "archive_status")
    public ArchiveStatus getArchiveStatus() {
        return archiveStatus;
    }
    public void setArchiveStatus(ArchiveStatus archiveStatus) {
        this.archiveStatus = archiveStatus;
    }
    @Column(name = "message")
    public String getMessage() {
        return message;
    }
    public void setMessage(String message) {
        this.message = message;
    }
    @Column(name = "md5_value")
    public String getMd5() {
        return md5;
    }
    public void setMd5(String md5) {
        this.md5 = md5;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "client_id")
    public String getClientId() {
        return clientId;
    }
    public void setClientId(String clientId) {
        this.clientId = clientId;
    }
    @Column(name = "resourced")
    public boolean isResourced() {
        return resourced;
    }
    public void setResourced(boolean resourced) {
        this.resourced = resourced;
    }
    @Column(name = "event_type")
    public String getEventType() {
        return eventType;
    }
    public void setEventType(String eventType) {
        this.eventType = eventType;
    }
    @Column(name = "event_no")
    public String getEventNo() {
        return eventNo;
    }
    public void setEventNo(String eventNo) {
        this.eventNo = eventNo;
    }
    @Column(name = "event_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventDate() {
        return eventDate;
    }
    public void setEventDate(Date eventDate) {
        this.eventDate = eventDate;
    }
    @Column(name = "patient_id")
    public String getPatientId() {
        return patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
}

+ 155 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/JsonReport.java

@ -0,0 +1,155 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * JSON日报包。
 *
 */
@Entity
@Table(name = "json_report")
public class JsonReport {
    public final static String pathSeparator = ":";
    private Integer id;
    private String pwd;
    private String remotePath;
    private Date receiveDate;
    private Date parseDate;
    private Date statisDate;
    private Date finishDate;
    private String message;
    private String md5;
    private String encryptPwd;
    private String orgCode;
    private Integer type;     // 1 质控包 2 日报包
    private Integer status;     //  0 未解析  1 已解析 2 已统计
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "pwd", nullable = false)
    public String getPwd() {
        return pwd;
    }
    public void setPwd(String pwd) {
        this.pwd = pwd;
    }
    @Column(name = "remote_path")
    public String getRemotePath() {
        return remotePath;
    }
    public void setRemotePath(String remotePath) {
        this.remotePath = remotePath;
    }
    @Column(name = "receive_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReceiveDate() {
        return receiveDate;
    }
    public void setReceiveDate(Date date) {
        receiveDate = date;
    }
    @Column(name = "parse_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getParseDate() {
        return parseDate;
    }
    public void setParseDate(Date date) {
        this.parseDate = date;
    }
    @Column(name = "finish_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getFinishDate() {
        return finishDate;
    }
    public void setFinishDate(Date date) {
        this.finishDate = date;
    }
    @Column(name = "message")
    public String getMessage() {
        return message;
    }
    public void setMessage(String message) {
        this.message = message;
    }
    @Column(name = "md5_value")
    public String getMd5() {
        return md5;
    }
    public void setMd5(String md5) {
        this.md5 = md5;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "encrypt_pwd")
    public String getEncryptPwd() {
        return encryptPwd;
    }
    public void setEncryptPwd(String encryptPwd) {
        this.encryptPwd = encryptPwd;
    }
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "statis_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getStatisDate() {
        return statisDate;
    }
    public void setStatisDate(Date statisDate) {
        this.statisDate = statisDate;
    }
}

+ 115 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReport.java

@ -0,0 +1,115 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/5/8.
 */
@Entity
@Table(name = "qc_daily_report", schema = "", catalog = "healtharchive")
public class QcDailyReport {
    private String id;
    private String orgCode;                 //机构编码
    private Date createDate;                //采集日期
    private String innerVersion;            //适配标准版本
    private Integer realOutpatientNum;            //门诊应收数
    private Integer totalHospitalNum;            //门诊实收数
    private Integer totalOutpatientNum;            //住院应收数
    private Integer realHospitalNum;            //住院实收数
    private Date addDate;                     //添加时间
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    @Column(name = "id", unique = true, nullable = false, length = 32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Basic
    @Column(name = "create_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    @Basic
    @Column(name = "inner_version")
    public String getInnerVersion() {
        return innerVersion;
    }
    public void setInnerVersion(String innerVersion) {
        this.innerVersion = innerVersion;
    }
    @Basic
    @Column(name = "real_outpatient_num")
    public Integer getRealOutpatientNum() {
        return realOutpatientNum;
    }
    public void setRealOutpatientNum(Integer realOutpatientNum) {
        this.realOutpatientNum = realOutpatientNum;
    }
    @Basic
    @Column(name = "total_hospital_num")
    public Integer getTotalHospitalNum() {
        return totalHospitalNum;
    }
    public void setTotalHospitalNum(Integer totalHospitalNum) {
        this.totalHospitalNum = totalHospitalNum;
    }
    @Basic
    @Column(name = "total_outpatient_num")
    public Integer getTotalOutpatientNum() {
        return totalOutpatientNum;
    }
    public void setTotalOutpatientNum(Integer totalOutpatientNum) {
        this.totalOutpatientNum = totalOutpatientNum;
    }
    @Basic
    @Column(name = "real_hospital_num")
    public Integer getRealHospitalNum() {
        return realHospitalNum;
    }
    public void setRealHospitalNum(Integer realHospitalNum) {
        this.realHospitalNum = realHospitalNum;
    }
    @Basic
    @Column(name = "add_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAddDate() {
        return addDate;
    }
    public void setAddDate(Date addDate) {
        this.addDate = addDate;
    }
}

+ 69 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportDataset.java

@ -0,0 +1,69 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/5/8.
 */
@Entity
@Table(name = "qc_daily_report_dataset", schema = "", catalog = "healtharchive")
public class QcDailyReportDataset {
    private String id;
    private String reportId;//关联ID
    private String dataset;//数据集code
    private Integer acqFlag;//采集状态  0 - 未采集  1 - 已采集(实收) 验证统计用
    private Date addDate;   //添加时间
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "report_id")
    public String getReportId() {
        return reportId;
    }
    public void setReportId(String reportId) {
        this.reportId = reportId;
    }
    @Basic
    @Column(name = "dataset")
    public String getDataset() {
        return dataset;
    }
    public void setDataset(String dataset) {
        this.dataset = dataset;
    }
    @Basic
    @Column(name = "acq_flag")
    public Integer getAcqFlag() {
        return acqFlag;
    }
    public void setAcqFlag(Integer acqFlag) {
        this.acqFlag = acqFlag;
    }
    @Basic
    @Column(name = "add_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAddDate() {
        return addDate;
    }
    public void setAddDate(Date addDate) {
        this.addDate = addDate;
    }
}

+ 105 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportDatasets.java

@ -0,0 +1,105 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/5/8.
 */
@Entity
@Table(name = "qc_daily_report_datasets", schema = "", catalog = "healtharchive")
public class QcDailyReportDatasets {
    private String id;
    private Date createDate;//采集日期
    private String orgCode;//机构编码
    private String innerVersion;//适配标准版本
    private Date eventTime;//事件时间
    private Integer totalNum;//数据集应收数
    private Integer realNum;//数据集实收数
    private Date addDate;   //添加时间
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "create_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    @Basic
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Basic
    @Column(name = "inner_version")
    public String getInnerVersion() {
        return innerVersion;
    }
    public void setInnerVersion(String innerVersion) {
        this.innerVersion = innerVersion;
    }
    @Basic
    @Column(name = "event_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventTime() {
        return eventTime;
    }
    public void setEventTime(Date eventTime) {
        this.eventTime = eventTime;
    }
    @Basic
    @Column(name = "total_num")
    public Integer getTotalNum() {
        return totalNum;
    }
    public void setTotalNum(Integer totalNum) {
        this.totalNum = totalNum;
    }
    @Basic
    @Column(name = "real_num")
    public Integer getRealNum() {
        return realNum;
    }
    public void setRealNum(Integer realNum) {
        this.realNum = realNum;
    }
    @Basic
    @Column(name = "add_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAddDate() {
        return addDate;
    }
    public void setAddDate(Date addDate) {
        this.addDate = addDate;
    }
}

+ 155 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportDetail.java

@ -0,0 +1,155 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/5/8.
 */
@Entity
@Table(name = "qc_daily_report_detail", schema = "", catalog = "healtharchive")
public class QcDailyReportDetail {
    private String id;
    private String reportId;
    private String archiveType;//档案分类  outpatient - 门诊    inpatient - 住院
    private String patientId;//病人id
    private String eventNo;//事件号
    private Date eventTime;//事件时间
    private Integer acqFlag;//采集状态  0 - 未采集  1 - 已采集(实收) 验证统计用
    private Integer timelyFlag;//及时状态 0 - 不及时  1 -及时,判断条件:采集时间 - 事件时间 > 2天 判断为不及时  不及时条件可以配置定义
    private Date addDate;   //添加时间
    private Date acqTime;   //  采集时间
    private Date storageTime;  //入库时间
    private Integer storageFlag;
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "report_id")
    public String getReportId() {
        return reportId;
    }
    public void setReportId(String reportId) {
        this.reportId = reportId;
    }
    @Basic
    @Column(name = "archive_type")
    public String getArchiveType() {
        return archiveType;
    }
    public void setArchiveType(String archiveType) {
        this.archiveType = archiveType;
    }
    @Basic
    @Column(name = "patient_id")
    public String getPatientId() {
        return patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
    @Basic
    @Column(name = "event_no")
    public String getEventNo() {
        return eventNo;
    }
    public void setEventNo(String eventNo) {
        this.eventNo = eventNo;
    }
    @Basic
    @Column(name = "event_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventTime() {
        return eventTime;
    }
    public void setEventTime(Date eventTime) {
        this.eventTime = eventTime;
    }
    @Basic
    @Column(name = "acq_flag")
    public Integer getAcqFlag() {
        return acqFlag;
    }
    public void setAcqFlag(Integer acqFlag) {
        this.acqFlag = acqFlag;
    }
    @Basic
    @Column(name = "timely_flag")
    public Integer getTimelyFlag() {
        return timelyFlag;
    }
    public void setTimelyFlag(Integer timelyFlag) {
        this.timelyFlag = timelyFlag;
    }
    @Basic
    @Column(name = "add_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAddDate() {
        return addDate;
    }
    public void setAddDate(Date addDate) {
        this.addDate = addDate;
    }
    @Basic
    @Column(name = "acq_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAcqTime() {
        return acqTime;
    }
    public void setAcqTime(Date acqTime) {
        this.acqTime = acqTime;
    }
    @Basic
    @Column(name = "storage_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getStorageTime() {
        return storageTime;
    }
    public void setStorageTime(Date storageTime) {
        this.storageTime = storageTime;
    }
    @Basic
    @Column(name = "storage_flag")
    public Integer getStorageFlag() {
        return storageFlag;
    }
    public void setStorageFlag(Integer storageFlag) {
        this.storageFlag = storageFlag;
    }
}

+ 164 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcDailyReportMetadata.java

@ -0,0 +1,164 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/5/8.
 */
@Entity
@Table(name = "qc_daily_report_metadata", schema = "", catalog = "healtharchive")
public class QcDailyReportMetadata {
    private String id;
    private String datasetId;//关联ID
    private String metadate;//数据元inner_code
    private String orgCode;//机构编码
    private Date eventTime;//事件时间
    private String innerVersion;//适配标准版本
    private String dataset;//数据集code
    private Date createDate;//采集日期
    private String totalQty;//应采数据元数量
    private Integer errorQty;//错误数据元数量
    private String errCode;//错误代码
    private Integer acqFlag;//采集状态  0 - 未采集  1 - 已采集(实收) 验证统计用
    private Date addDate;   //添加时间
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Basic
    @Column(name = "create_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    @Basic
    @Column(name = "inner_version")
    public String getInnerVersion() {
        return innerVersion;
    }
    public void setInnerVersion(String innerVersion) {
        this.innerVersion = innerVersion;
    }
    @Basic
    @Column(name = "dataset_id")
    public String getDatasetId() {
        return datasetId;
    }
    public void setDatasetId(String datasetId) {
        this.datasetId = datasetId;
    }
    @Basic
    @Column(name = "metadate")
    public String getMetadate() {
        return metadate;
    }
    public void setMetadate(String metadate) {
        this.metadate = metadate;
    }
    @Column(name = "event_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventTime() {
        return eventTime;
    }
    public void setEventTime(Date eventTime) {
        this.eventTime = eventTime;
    }
    @Basic
    @Column(name = "dataset")
    public String getDataset() {
        return dataset;
    }
    public void setDataset(String dataset) {
        this.dataset = dataset;
    }
    @Basic
    @Column(name = "total_qty")
    public String getTotalQty() {
        return totalQty;
    }
    public void setTotalQty(String totalQty) {
        this.totalQty = totalQty;
    }
    @Basic
    @Column(name = "error_qty")
    public Integer getErrorQty() {
        return errorQty;
    }
    public void setErrorQty(Integer errorQty) {
        this.errorQty = errorQty;
    }
    @Basic
    @Column(name = "err_code")
    public String getErrCode() {
        return errCode;
    }
    public void setErrCode(String errCode) {
        this.errCode = errCode;
    }
    @Basic
    @Column(name = "acq_flag")
    public Integer getAcqFlag() {
        return acqFlag;
    }
    public void setAcqFlag(Integer acqFlag) {
        this.acqFlag = acqFlag;
    }
    @Basic
    @Column(name = "add_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAddDate() {
        return addDate;
    }
    public void setAddDate(Date addDate) {
        this.addDate = addDate;
    }
}

+ 103 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaDict.java

@ -0,0 +1,103 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/5/8.
 */
@Entity
@Table(name = "qc_quota_dict", schema = "", catalog = "healtharchive")
public class QcQuotaDict {
    private Long id;
    private String code;        //指标编码
    private String name;         //指标名称
    private String desc;        //指标说明
    private String type;       //指标采集方式: 1 - 接口调用  2 - 日志解析 ,预留字段
    private Date createTime;    //创建时间
    private Date modifyTime;    //修改时间
    private String flag;         //1: 正常 0: 删除
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "id", unique = true, nullable = false, length = 11)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Basic
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Basic
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Basic
    @Column(name = "desc")
    public String getDesc() {
        return desc;
    }
    public void setDesc(String desc) {
        this.desc = desc;
    }
    @Basic
    @Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Basic
    @Column(name = "create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Basic
    @Column(name = "modify_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getModifyTime() {
        return modifyTime;
    }
    public void setModifyTime(Date modifyTime) {
        this.modifyTime = modifyTime;
    }
    public String getFlag() {
        return flag;
    }
    public void setFlag(String flag) {
        this.flag = flag;
    }
}

+ 214 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaResult.java

@ -0,0 +1,214 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by janseny on 2017/5/8.
 */
@Entity
@Table(name = "qc_quota_result", schema = "", catalog = "healtharchive")
public class QcQuotaResult {
    private String id;
    private Date quotaDate;    //统计时间(yyyy-mm-dd)
    private Long quotaId;       //指标ID
    private String quotaName;    //指标名称
    private String value;        //统计结果
    private String city;       //市级
    private String cityName; //市级名称
    private String town;        //区级
    private String townName;    //区级名称
    private String orgCode;    //机构code
    private String orgName;    //机构名称
    private Date receiveTime;    //采集日期
    private Date eventTime;    //事件时间
    private Integer totalNum;    //应收数
    private Integer realNum;    //实收数 (数据元的实收为 应收 - 错误数(标识为空的错误code))
    private Integer errorNum;    //错误数量(该字段只针对数据元的准确性统计)
    private Integer timelyNum;    //及时采集的档案数量
    private String an;    //同比:与去年的当天&周&月相比
    private String mom;    //环比:与前一天&周&月环比
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    @Column(name = "id", unique = true, nullable = false, length = 32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "quota_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getQuotaDate() {
        return quotaDate;
    }
    public void setQuotaDate(Date quotaDate) {
        this.quotaDate = quotaDate;
    }
    @Basic
    @Column(name = "quota_id")
    public Long getQuotaId() {
        return quotaId;
    }
    public void setQuotaId(Long quotaId) {
        this.quotaId = quotaId;
    }
    @Basic
    @Column(name = "quota_name")
    public String getQuotaName() {
        return quotaName;
    }
    public void setQuotaName(String quotaName) {
        this.quotaName = quotaName;
    }
    @Basic
    @Column(name = "value")
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    @Basic
    @Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    @Basic
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    @Basic
    @Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    @Basic
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    @Basic
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Basic
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Basic
    @Column(name = "receive_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReceiveTime() {
        return receiveTime;
    }
    public void setReceiveTime(Date receiveTime) {
        this.receiveTime = receiveTime;
    }
    @Basic
    @Column(name = "event_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventTime() {
        return eventTime;
    }
    public void setEventTime(Date eventTime) {
        this.eventTime = eventTime;
    }
    @Basic
    @Column(name = "total_num")
    public Integer getTotalNum() {
        return totalNum;
    }
    public void setTotalNum(Integer totalNum) {
        this.totalNum = totalNum;
    }
    @Basic
    @Column(name = "real_num")
    public Integer getRealNum() {
        return realNum;
    }
    public void setRealNum(Integer realNum) {
        this.realNum = realNum;
    }
    @Basic
    @Column(name = "error_num")
    public Integer getErrorNum() {
        return errorNum;
    }
    public void setErrorNum(Integer errorNum) {
        this.errorNum = errorNum;
    }
    @Basic
    @Column(name = "timely_num")
    public Integer getTimelyNum() {
        return timelyNum;
    }
    public void setTimelyNum(Integer timelyNum) {
        this.timelyNum = timelyNum;
    }
    @Basic
    @Column(name = "an")
    public String getAn() {
        return an;
    }
    public void setAn(String an) {
        this.an = an;
    }
    @Basic
    @Column(name = "mom")
    public String getMom() {
        return mom;
    }
    public void setMom(String mom) {
        this.mom = mom;
    }
}

+ 106 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaResultAnalyse.java

@ -0,0 +1,106 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by zdm on 2017/5/16.
 */
@Entity
@Table(name = "qc_quota_result", schema = "", catalog = "healtharchive")
public class QcQuotaResultAnalyse {
    private String id;
    private String city;       //市级
    private String cityName; //市级名称
    private String town;        //区级
    private String townName;    //区级名称
    private Date receiveTime;    //采集日期
    private Date eventTime;    //事件时间
    private String orgCode;    //机构code
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    @Column(name = "id", unique = true, nullable = false, length = 32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    @Basic
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    @Basic
    @Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    @Basic
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    @Basic
    @Column(name = "receive_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReceiveTime() {
        return receiveTime;
    }
    public void setReceiveTime(Date receiveTime) {
        this.receiveTime = receiveTime;
    }
    @Basic
    @Column(name = "event_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventTime() {
        return eventTime;
    }
    public void setEventTime(Date eventTime) {
        this.eventTime = eventTime;
    }
    @Basic
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
}

+ 186 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/report/QcQuotaResultDetail.java

@ -0,0 +1,186 @@
package com.yihu.jw.entity.ehr.report;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by zdm on 2017/5/16.
 */
@Entity
@Table(name = "qc_quota_result", schema = "", catalog = "healtharchive")
public class QcQuotaResultDetail {
    private String id;
    private String city;       //市级
    private String town;        //区级
    private String value;        //统计结果
    private Long quotaId;       //指标ID
    private String quotaName;    //指标名称
    private String orgCode;    //机构code
    private String orgName;    //机构名称
    private Date eventTime;    //事件时间
    private Integer totalNum;    //应收数
    private Integer realNum;    //实收数 (数据元的实收为 应收 - 错误数(标识为空的错误code))
    private Integer errorNum;    //错误数量(该字段只针对数据元的准确性统计)
    private Integer timelyNum;    //及时采集的档案数量
    private String an;    //同比:与去年的当天&周&月相比
    private String mom;    //环比:与前一天&周&月环比
    private String standard; //达标
    @Id
    @GenericGenerator(name="systemUUID",strategy="uuid")
    @GeneratedValue(generator="systemUUID")
    @Column(name = "id", unique = true, nullable = false, length = 32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Basic
    @Column(name = "quota_id")
    public Long getQuotaId() {
        return quotaId;
    }
    public void setQuotaId(Long quotaId) {
        this.quotaId = quotaId;
    }
    @Basic
    @Column(name = "quota_name")
    public String getQuotaName() {
        return quotaName;
    }
    public void setQuotaName(String quotaName) {
        this.quotaName = quotaName;
    }
    @Basic
    @Column(name = "value")
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    @Basic
    @Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    @Basic
    @Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    @Basic
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Basic
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Basic
    @Column(name = "event_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEventTime() {
        return eventTime;
    }
    public void setEventTime(Date eventTime) {
        this.eventTime = eventTime;
    }
    @Basic
    @Column(name = "total_num")
    public Integer getTotalNum() {
        return totalNum;
    }
    public void setTotalNum(Integer totalNum) {
        this.totalNum = totalNum;
    }
    @Basic
    @Column(name = "real_num")
    public Integer getRealNum() {
        return realNum;
    }
    public void setRealNum(Integer realNum) {
        this.realNum = realNum;
    }
    @Basic
    @Column(name = "error_num")
    public Integer getErrorNum() {
        return errorNum;
    }
    public void setErrorNum(Integer errorNum) {
        this.errorNum = errorNum;
    }
    @Basic
    @Column(name = "timely_num")
    public Integer getTimelyNum() {
        return timelyNum;
    }
    public void setTimelyNum(Integer timelyNum) {
        this.timelyNum = timelyNum;
    }
    @Basic
    @Column(name = "an")
    public String getAn() {
        return an;
    }
    public void setAn(String an) {
        this.an = an;
    }
    @Basic
    @Column(name = "mom")
    public String getMom() {
        return mom;
    }
    public void setMom(String mom) {
        this.mom = mom;
    }
    @Basic
    @Column(name = "standard")
    public String getStandard() {
        return standard;
    }
    public void setStandard(String standard) {
        this.standard = standard;
    }
}

+ 77 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/security/UserKey.java

@ -0,0 +1,77 @@
package com.yihu.jw.entity.ehr.security;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.id.ObjectId;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.beans.factory.annotation.Value;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 平台安全对象与公-私钥之间的关联关系。
 *
 * @author cws
 * @version 1.0
 * @created 02-6月-2015 17:38:05
 */
@Entity
@Table(name = "user_key")
@Access(value = AccessType.PROPERTY)
public class UserKey implements Serializable{
    @Value("${admin-region}")
    short adminRegion;
    public UserKey() {
        id = new ObjectId(adminRegion, BizObject.User).toString();
    }
    private String id;
    private String user;
    private String org;
    private String keyType;
    private String key;
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "assigned")
    @Column(name = "id", unique = true, nullable = false)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(name = "user_id",  nullable = true)
    public String getUser() {
        return user;
    }
    public void setUser(String user) {
        this.user = user;
    }
    @Column(name = "org_code",  nullable = true)
    public String getOrg() {
        return org;
    }
    public void setOrg(String org) {
        this.org = org;
    }
    @Column(name = "key_type",  nullable = true)
    public String getKeyType() {
        return keyType;
    }
    public void setKeyType(String keyType) {
        this.keyType = keyType;
    }
    @Column(name = "key_id",  nullable = true)
    public String getKey() {
        return key;
    }
    public void setKey(String key) {
        this.key = key;
    }
}

+ 90 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/security/UserSecurity.java

@ -0,0 +1,90 @@
package com.yihu.jw.entity.ehr.security;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.id.ObjectId;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.beans.factory.annotation.Value;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * 公-私钥。
 *
 * @author Sand
 * @version 1.0
 * @created 02-6月-2015 17:38:05
 */
@Entity
@Table(name = "user_security")
@Access(value = AccessType.PROPERTY)
public class UserSecurity implements Serializable {
	@Value("${admin-region}")
	short adminRegion;
	public UserSecurity() {
		id = new ObjectId(adminRegion, BizObject.User).toString();
	}
	private String id;
	private String privateKey;
	private String publicKey;
	private Date fromDate;
	private Date expiryDate;
	private Integer valid;
	@Id
	@GeneratedValue(generator = "Generator")
	@GenericGenerator(name = "Generator", strategy = "assigned")
	@Column(name = "id", unique = true, nullable = false)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(name = "private_key",  nullable = false)
	public String getPrivateKey() {
		return privateKey;
	}
	public void setPrivateKey(String privateKey) {
		this.privateKey = privateKey;
	}
	@Column(name = "public_key",  nullable = false)
	public String getPublicKey() {
		return publicKey;
	}
	public void setPublicKey(String publicKey) {
		this.publicKey = publicKey;
	}
	@Column(name = "from_date",  nullable = true)
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	public Date getFromDate() {
		return fromDate;
	}
	public void setFromDate(Date fromDate) {
		this.fromDate = fromDate;
	}
	@Column(name = "expiry_date",  nullable = true)
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
	public Date getExpiryDate() {
		return expiryDate;
	}
	public void setExpiryDate(Date expiryDate) {
		this.expiryDate = expiryDate;
	}
	@Column(name = "valid",  nullable = false)
	public Integer getValid() {
		return valid;
	}
	public void setValid(Integer valid) {
		this.valid = valid;
	}
}

+ 108 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/security/UserToken.java

@ -0,0 +1,108 @@
package com.yihu.jw.entity.ehr.security;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.ehr.id.BizObject;
import com.yihu.jw.entity.ehr.id.ObjectId;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.beans.factory.annotation.Value;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * Token。
 *
 * @author wq
 * @version 1.0
 * @created 02-6月-2015 17:38:05
 */
@Entity
@Table(name = "user_token")
@Access(value = AccessType.PROPERTY)
public class UserToken implements Serializable {
    @Value("${admin-region}")
    short adminRegion;
    private String tokenId;
    private String accessToken;
    private String refreshToken;
    private int expiresIn;
    private Date createDate;
    private Date updateDate;
    private String userId;
    private String appId;
    public UserToken() {
        tokenId = new ObjectId(adminRegion, BizObject.User).toString();
    }
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "assigned")
    @Column(name = "token_id", unique = true, nullable = false)
    public String getTokenId() {
        return tokenId;
    }
    public void setTokenId(String tokenId) {
        this.tokenId = tokenId;
    }
    @Column(name = "access_token",  nullable = true)
    public String getAccessToken() {
        return accessToken;
    }
    public void setAccessToken(String accessToken) {
        this.accessToken = accessToken;
    }
    @Column(name = "refresh_token",  nullable = true)
    public String getRefreshToken() {
        return refreshToken;
    }
    public void setRefreshToken(String refreshToken) {
        this.refreshToken = refreshToken;
    }
    @Column(name = "expires_in",  nullable = true)
    public int getExpiresIn() {
        return expiresIn;
    }
    public void setExpiresIn(int expiresIn) {
        this.expiresIn = expiresIn;
    }
    @Column(name = "create_date",  nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    @Column(name = "update_date",  nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getUpdateDate() {
        return updateDate;
    }
    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }
    @Column(name = "user_id",  nullable = true)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Column(name = "app_id",  nullable = true)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
}

+ 578 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/Doctors.java

@ -0,0 +1,578 @@
package com.yihu.jw.entity.ehr.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.Formula;
import javax.persistence.*;
import java.util.Date;
/**
 * 2017-02-04 add by hzp
 */
@Entity
@Table(name = "doctors")
@Access(value = AccessType.PROPERTY)
public class Doctors {
    private Long id;
    private String userId; // 云平台用户ID
    private String code; // 医生标识
    private String name; // 姓名
    private String pyCode; // 拼音首字母
    private String sex; // 性别(1男,2女)
    private String photo; // 医生头像
    private String skill; // 医生专长
    private String workPortal; // 医生门户首页
    private String email; // 邮箱
    private String phone; // 联系电话
    private String secondPhone; // 备用电话
    private String familyTel; // 家庭电话(固)
    private String officeTel; // 办公电话(固)
    private String introduction; // 简介
    private String jxzc; // 教学职称 变更为是否制证。参考系统字典 制证标识
    private String lczc; // 临床职称--改成技术职称,值参考系统字典 技术职称
    private String xlzc; // 学历职称
    private String xzzc; // 行政职称
    private String status; // 1生效,0失效
    private Date insertTime; // 创建时间
    private Date updateTime; // 更新时间
    private String idCardNo; // 身份证号码
    private String orgId; // 机构id
    private String orgCode; // 机构code
    private String orgFullName; // 机构名称
    private String roleType; // 参考系统字典 人员类别
    private String deptName; // 部门名称
    private String jobType; // 参考系统字典 执业类别
    private String jobLevel; // 参考系统字典 从事专业类别代码-执业级别
    private String jobScope; // 参考系统字典 执业范围
    private String jobState; // 参考系统字典 执业状态
    private String registerFlag; // 是否考试库连带注册-数据手动导入。默认0为是,1为否
    private String sfzjzl;    //身份证件种类 ,代码:身份证件类别
    private String csrq;    //出生日期 ,格式为:YYYYMMDD,例如:20131125
    private String mzdm;    //民族代码 ,代码:民族代码
    private String cjgzrq;    //参加工作日期 ,格式为:YYYYMMDD,例如:20131125
    private String szksdm;    //所在科室代码 ,代码:所在科室代码
    private String yszyzsbm;    //医师/卫生监督员执业证书编码 ,
    private String sfdddzyys;    //是否多地点执业医师 ,代码:是否不确定代码
    private String dezydwjglb;    //第2执业单位的机构类别 ,代码:多点执业单位的机构类别
    private String dszydwjglb;    //第3执业单位的机构类别 ,代码:多点执业单位的机构类别
    private String sfhdgjzs;    //是否获得国家住院医师规范化培训合格证书 ,代码:是否不确定代码
    private String zyyszsbm;    //住院医师规范化培训合格证书编码 ,填写证书编码
    private String zyjszwdm;    //专业技术职务(聘)代码 ,代码:聘任专业技术职务代码
    private String xldm;    //学历代码 ,代码:学历代码
    private String xwdm;    //学位代码 ,代码:学位代码
    private String szydm;    //所学专业代码 ,代码:所学专业代码
    private String zktc1;    //专科特长1
    private String zktc2;    //专科特长2
    private String zktc3;    //专科特长3
    private String nnryldqk;    //年内人员流动情况 ,代码:调动情况代码
    private String drdcsj;    //调入/调出时间 ,格式为:YYYYMMDD,例如:20131125
    private String bzqk;    //编制情况 ,代码:编制情况
    private String sfzcqkyx;    //是否注册为全科医学专业 ,代码:是否不确定代码
    private String qdhgzs;    //全科医生取得培训合格证书情况 ,代码:全科医生培训合格证书
    private String xzsqpzgz;    //是否由乡镇卫生院或社区卫生服务机构派驻村卫生室工作 ,代码:是否不确定代码
    private String sfcstjgz;    //是否从事统计信息化业务工作 ,代码:是否不确定代码
    private String tjxxhgz;    //统计信息化业务工作 ,代码: 统计信息化业务工作
    // 临时属性
    private String lczcName;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    @Column(name = "userId", nullable = true)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Column(name = "code", nullable = false)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getPyCode() {
        return pyCode;
    }
    public void setPyCode(String pyCode) {
        this.pyCode = pyCode;
    }
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    public String getSkill() {
        return skill;
    }
    public void setSkill(String skill) {
        this.skill = skill;
    }
    public String getWorkPortal() {
        return workPortal;
    }
    public void setWorkPortal(String workPortal) {
        this.workPortal = workPortal;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    public String getSecondPhone() {
        return secondPhone;
    }
    public void setSecondPhone(String secondPhone) {
        this.secondPhone = secondPhone;
    }
    public String getFamilyTel() {
        return familyTel;
    }
    public void setFamilyTel(String familyTel) {
        this.familyTel = familyTel;
    }
    public String getOfficeTel() {
        return officeTel;
    }
    public void setOfficeTel(String officeTel) {
        this.officeTel = officeTel;
    }
    public String getIntroduction() {
        return introduction;
    }
    public void setIntroduction(String introduction) {
        this.introduction = introduction;
    }
    public String getJxzc() {
        return jxzc;
    }
    public void setJxzc(String jxzc) {
        this.jxzc = jxzc;
    }
    public String getLczc() {
        return lczc;
    }
    public void setLczc(String lczc) {
        this.lczc = lczc;
    }
    public String getXlzc() {
        return xlzc;
    }
    public void setXlzc(String xlzc) {
        this.xlzc = xlzc;
    }
    public String getXzzc() {
        return xzzc;
    }
    public void setXzzc(String xzzc) {
        this.xzzc = xzzc;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getInsertTime() {
        return insertTime;
    }
    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "id_card_no", nullable = false)
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    @Column(name = "org_id")
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "org_full_name")
    public String getOrgFullName() {
        return orgFullName;
    }
    public void setOrgFullName(String orgFullName) {
        this.orgFullName = orgFullName;
    }
    @Column(name = "role_type")
    public String getRoleType() {
        return roleType;
    }
    public void setRoleType(String roleType) {
        this.roleType = roleType;
    }
    @Column(name = "dept_name")
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    @Column(name = "job_type")
    public String getJobType() {
        return jobType;
    }
    public void setJobType(String jobType) {
        this.jobType = jobType;
    }
    @Column(name = "job_level")
    public String getJobLevel() {
        return jobLevel;
    }
    public void setJobLevel(String jobLevel) {
        this.jobLevel = jobLevel;
    }
    @Column(name = "job_scope")
    public String getJobScope() {
        return jobScope;
    }
    public void setJobScope(String jobScope) {
        this.jobScope = jobScope;
    }
    @Column(name = "job_state")
    public String getJobState() {
        return jobState;
    }
    public void setJobState(String jobState) {
        this.jobState = jobState;
    }
    @Column(name = "register_flag")
    public String getRegisterFlag() {
        return registerFlag;
    }
    public void setRegisterFlag(String registerFlag) {
        this.registerFlag = registerFlag;
    }
    @Formula("( SELECT a.value FROM system_dict_entries a WHERE a.dict_id = 118 AND a.code = lczc )")
    public String getLczcName() {
        return lczcName;
    }
    public void setLczcName(String lczcName) {
        this.lczcName = lczcName;
    }
    @Column(name = "SFZJZL")
    public String getSfzjzl() {
        return sfzjzl;
    }
    public void setSfzjzl(String sfzjzl) {
        this.sfzjzl = sfzjzl;
    }
    @Column(name = "CSRQ")
    public String getCsrq() {
        return csrq;
    }
    public void setCsrq(String csrq) {
        this.csrq = csrq;
    }
    @Column(name = "MZDM")
    public String getMzdm() {
        return mzdm;
    }
    public void setMzdm(String mzdm) {
        this.mzdm = mzdm;
    }
    @Column(name = "CJGZRQ")
    public String getCjgzrq() {
        return cjgzrq;
    }
    public void setCjgzrq(String cjgzrq) {
        this.cjgzrq = cjgzrq;
    }
    @Column(name = "SZKSDM")
    public String getSzksdm() {
        return szksdm;
    }
    public void setSzksdm(String szksdm) {
        this.szksdm = szksdm;
    }
    @Column(name = "YSZYZSBM")
    public String getYszyzsbm() {
        return yszyzsbm;
    }
    public void setYszyzsbm(String yszyzsbm) {
        this.yszyzsbm = yszyzsbm;
    }
    @Column(name = "SFDDDZYYS")
    public String getSfdddzyys() {
        return sfdddzyys;
    }
    public void setSfdddzyys(String sfdddzyys) {
        this.sfdddzyys = sfdddzyys;
    }
    @Column(name = "DEZYDWJGLB")
    public String getDezydwjglb() {
        return dezydwjglb;
    }
    public void setDezydwjglb(String dezydwjglb) {
        this.dezydwjglb = dezydwjglb;
    }
    @Column(name = "DSZYDWJGLB")
    public String getDszydwjglb() {
        return dszydwjglb;
    }
    public void setDszydwjglb(String dszydwjglb) {
        this.dszydwjglb = dszydwjglb;
    }
    @Column(name = "SFHDGJZS")
    public String getSfhdgjzs() {
        return sfhdgjzs;
    }
    public void setSfhdgjzs(String sfhdgjzs) {
        this.sfhdgjzs = sfhdgjzs;
    }
    @Column(name = "ZYYSZSBM")
    public String getZyyszsbm() {
        return zyyszsbm;
    }
    public void setZyyszsbm(String zyyszsbm) {
        this.zyyszsbm = zyyszsbm;
    }
    @Column(name = "ZYJSZWDM")
    public String getZyjszwdm() {
        return zyjszwdm;
    }
    public void setZyjszwdm(String zyjszwdm) {
        this.zyjszwdm = zyjszwdm;
    }
    @Column(name = "XLDM")
    public String getXldm() {
        return xldm;
    }
    public void setXldm(String xldm) {
        this.xldm = xldm;
    }
    @Column(name = "XWDM")
    public String getXwdm() {
        return xwdm;
    }
    public void setXwdm(String xwdm) {
        this.xwdm = xwdm;
    }
    @Column(name = "SZYDM")
    public String getSzydm() {
        return szydm;
    }
    public void setSzydm(String szydm) {
        this.szydm = szydm;
    }
    @Column(name = "ZKTC1")
    public String getZktc1() {
        return zktc1;
    }
    public void setZktc1(String zktc1) {
        this.zktc1 = zktc1;
    }
    @Column(name = "ZKTC2")
    public String getZktc2() {
        return zktc2;
    }
    public void setZktc2(String zktc2) {
        this.zktc2 = zktc2;
    }
    @Column(name = "ZKTC3")
    public String getZktc3() {
        return zktc3;
    }
    public void setZktc3(String zktc3) {
        this.zktc3 = zktc3;
    }
    @Column(name = "NNRYLDQK")
    public String getNnryldqk() {
        return nnryldqk;
    }
    public void setNnryldqk(String nnryldqk) {
        this.nnryldqk = nnryldqk;
    }
    @Column(name = "DRDCSJ")
    public String getDrdcsj() {
        return drdcsj;
    }
    public void setDrdcsj(String drdcsj) {
        this.drdcsj = drdcsj;
    }
    @Column(name = "BZQK")
    public String getBzqk() {
        return bzqk;
    }
    public void setBzqk(String bzqk) {
        this.bzqk = bzqk;
    }
    @Column(name = "SFZCQKYX")
    public String getSfzcqkyx() {
        return sfzcqkyx;
    }
    public void setSfzcqkyx(String sfzcqkyx) {
        this.sfzcqkyx = sfzcqkyx;
    }
    @Column(name = "QDHGZS")
    public String getQdhgzs() {
        return qdhgzs;
    }
    public void setQdhgzs(String qdhgzs) {
        this.qdhgzs = qdhgzs;
    }
    @Column(name = "XZSQPZGZ")
    public String getXzsqpzgz() {
        return xzsqpzgz;
    }
    public void setXzsqpzgz(String xzsqpzgz) {
        this.xzsqpzgz = xzsqpzgz;
    }
    @Column(name = "SFCSTJGZ")
    public String getSfcstjgz() {
        return sfcstjgz;
    }
    public void setSfcstjgz(String sfcstjgz) {
        this.sfcstjgz = sfcstjgz;
    }
    @Column(name = "TJXXHGZ")
    public String getTjxxhgz() {
        return tjxxhgz;
    }
    public void setTjxxhgz(String tjxxhgz) {
        this.tjxxhgz = tjxxhgz;
    }
}

+ 44 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleApiRelation.java

@ -0,0 +1,44 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
/**
 * Created by yww on 2016/7/8.
 */
@Entity
@Table(name = "role_api_relation")
@Access(AccessType.PROPERTY)
public class RoleApiRelation {
    private long id;
    private long roleId;
    private long apiId;
    public RoleApiRelation() {
    }
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id",unique = true,nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "role_id",nullable = false)
    public long getRoleId() {
        return roleId;
    }
    public void setRoleId(long roleId) {
        this.roleId = roleId;
    }
    @Column(name = "app_api_id",nullable = false)
    public long getApiId() {
        return apiId;
    }
    public void setApiId(long apiId) {
        this.apiId = apiId;
    }
}

+ 43 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleAppRelation.java

@ -0,0 +1,43 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
/**
 * Created by yww on 2016/7/7.
 */
@Entity
@Table(name = "role_app_relation")
@Access(value = AccessType.PROPERTY)
public class RoleAppRelation {
    private long id;
    private long roleId;
    private String appId;
    public RoleAppRelation() {}
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id",unique = true,nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "role_id",nullable = false)
    public long getRoleId() {
        return roleId;
    }
    public void setRoleId(long roleId) {
        this.roleId = roleId;
    }
    @Column(name = "app_id",nullable = false)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
}

+ 43 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleFeatureRelation.java

@ -0,0 +1,43 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
/**
 * Created by yww on 2016/7/7.
 */
@Entity
@Table(name = "role_feature_relation")
@Access(value = AccessType.PROPERTY)
public class RoleFeatureRelation {
    private long id;
    private long roleId;
    private long featureId;
    public RoleFeatureRelation() {}
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id",unique = true,nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "role_id",nullable = false)
    public long getRoleId() {
        return roleId;
    }
    public void setRoleId(long roleId) {
        this.roleId = roleId;
    }
    @Column(name = "feature_id",nullable = false)
    public long getFeatureId() {
        return featureId;
    }
    public void setFeatureId(long featureId) {
        this.featureId = featureId;
    }
}

+ 44 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleOrg.java

@ -0,0 +1,44 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
/**
 * Created by janseny 2017年10月18日
 */
@Entity
@Table(name = "role_org")
@Access(value = AccessType.PROPERTY)
public class RoleOrg {
    private long id;
    private long roleId;
    private String orgCode;
    public RoleOrg() {}
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id",unique = true,nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "role_id",nullable = false)
    public long getRoleId() {
        return roleId;
    }
    public void setRoleId(long roleId) {
        this.roleId = roleId;
    }
    @Column(name = "org_code",nullable = false)
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
}

+ 45 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleReportRelation.java

@ -0,0 +1,45 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by wxw on 2017/8/22.
 */
@Entity
@Table(name = "role_report_relation")
@Access(value = AccessType.PROPERTY)
public class RoleReportRelation implements Serializable{
    private long id;
    private long roleId;
    private long rsReportId;
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "id",unique = true,nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "ROLE_ID",nullable = false)
    public long getRoleId() {
        return roleId;
    }
    public void setRoleId(long roleId) {
        this.roleId = roleId;
    }
    @Column(name = "RS_REPORT_ID",nullable = false)
    public long getRsReportId() {
        return rsReportId;
    }
    public void setRsReportId(long rsReportId) {
        this.rsReportId = rsReportId;
    }
}

+ 43 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/RoleUser.java

@ -0,0 +1,43 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
/**
 * Created by yww on 2016/7/7.
 */
@Entity
@Table(name = "role_user")
@Access(value = AccessType.PROPERTY)
public class RoleUser {
    private long id;
    private long roleId;
    private String userId;
    public RoleUser() {}
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id",unique = true,nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "role_id",nullable = false)
    public long getRoleId() {
        return roleId;
    }
    public void setRoleId(long roleId) {
        this.roleId = roleId;
    }
    @Column(name = "user_id",nullable = false)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
}

+ 81 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/Roles.java

@ -0,0 +1,81 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
/**
 * Created by yww on 2016/7/7.
 */
@Entity
@Table(name = "roles")
@Access(value = AccessType.PROPERTY)
public class Roles {
    private long id;
    private String code;
    private String name;
    private String description;
    private String appId;
    private String type; //0 - 应用角色 1 - 用户角色
    private String orgCode;
    public Roles(){}
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id",unique = true,nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "code",nullable = true)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "name",nullable = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "description",nullable = true)
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @Column(name = "app_id",nullable = true)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    @Column(name = "type",nullable = true)
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "org_code",nullable = true)
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
}

+ 421 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/User.java

@ -0,0 +1,421 @@
package com.yihu.jw.entity.ehr.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.BaseAssignedEntity;
import javax.persistence.*;
import java.util.Date;
/**
 * @author Sand
 * @version 1.0
 * @updated 02-6月-2015 20:25:02
 */
@Entity
@Table(name = "users")
@Access(value = AccessType.PROPERTY)
public class User  extends BaseAssignedEntity {
    private Date invalidDate;//失效时间
    private Date lastLoginTime;
    private String email;
    private String loginCode;
    private String realName;
    private String password;
    private Boolean activated;
    private String validateCode;
    private String userType;
    private String telephone;
    private String martialStatus;
    private String gender;
    private String idCardNo;
    private String organization;
    private String source;
    // 未绑定属性
	private String orgPost;
	private String privilege;
	private String role;
    //特殊属性
    private String major;
    private String medicalRole;
    private String techTitle;
    private String adminTitle;
    private String DType;
    private String imgRemotePath;
    private String imgLocalPath;
    private int fertilityStatus;
    private String secondPhone;
    private String birthday;
    private String micard;
    private String qq;
    private String ssid;
    private String familyPhone;
    private int provinceId;
    private String provinceName;
    private int cityId;
    private String cityName;
    private int areaId;
    private String areaName;
    private String street;
    private String demographicId;
    private String doctorId;
    private String realnameFlag;
    /**
     * 居民行业
     */
    private  String profession;
    public User() {
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "invalid_date",  nullable = true)
    public Date getInvalidDate() {
        return invalidDate;
    }
    public void setInvalidDate(Date invalidDate) {
        this.invalidDate = invalidDate;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "last_login_time",  nullable = true)
    public Date getLastLoginTime() {
        return lastLoginTime;
    }
    public void setLastLoginTime(Date lastLoginTime) {
        this.lastLoginTime = lastLoginTime;
    }
    @Column(name = "email",  nullable = true)
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(name = "login_code",  nullable = false)
    public String getLoginCode() {
        return loginCode;
    }
    public void setLoginCode(String loginCode) {
        this.loginCode = loginCode;
    }
    @Column(name = "real_name",  nullable = false)
    public String getRealName() {
        return realName;
    }
    public void setRealName(String realName) {
        this.realName = realName;
    }
    @Column(name = "password",  nullable = false)
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    @Column(name = "activated",  nullable = true)
    public Boolean getActivated() {
        return activated;
    }
    public void setActivated(Boolean activated) {
        this.activated = activated;
    }
    @Column(name = "validate_code",  nullable = true)
    public String getValidateCode() {
        return validateCode;
    }
    public void setValidateCode(String validateCode) {
        this.validateCode = validateCode;
    }
    @Column(name = "user_type",  nullable = true)
    public String getUserType() {
        return userType;
    }
    public void setUserType(String userType) {
        this.userType = userType;
    }
    @Column(name = "telephone",  nullable = true)
    public String getTelephone() {
        return telephone;
    }
    public void setTelephone(String telephone) {
        this.telephone = telephone;
    }
    @Column(name = "martial_status",  nullable = true)
    public String getMartialStatus() {
        return martialStatus;
    }
    public void setMartialStatus(String martialStatus) {
        this.martialStatus = martialStatus;
    }
    @Column(name = "gender",  nullable = true)
    public String getGender() {
        return gender;
    }
    public void setGender(String gender) {
        this.gender = gender;
    }
    @Column(name = "id_card_no",  nullable = true)
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    @Column(name = "source",  nullable = true)
    public String getSource() {
        return source;
    }
    public void setSource(String source) {
        this.source = source;
    }
    @Column(name = "organization",  nullable = true)
    public String getOrganization() {
        return organization;
    }
    public void setOrganization(String organization) {
        this.organization = organization;
    }
    @Column(name = "org_post",  nullable = true)
    public String getOrgPost() {
        return orgPost;
    }
    public void setOrgPost(String orgPost) {
        this.orgPost = orgPost;
    }
    @Column(name = "privilege",  nullable = true)
    public String getPrivilege() {
        return privilege;
    }
    public void setPrivilege(String privilege) {
        this.privilege = privilege;
    }
    @Column(name = "role",  nullable = true)
    public String getRole() {
        return role;
    }
    public void setRole(String role) {
        this.role = role;
    }
    @Column(name = "major",  nullable = true)
    public String getMajor() {
        return major;
    }
    public void setMajor(String major) {
        this.major = major;
    }
    @Column(name = "medical_role",  nullable = true)
    public String getMedicalRole() {
        return medicalRole;
    }
    public void setMedicalRole(String medicalRole) {
        this.medicalRole = medicalRole;
    }
    @Column(name = "tech_title",  nullable = true)
    public String getTechTitle() {
        return techTitle;
    }
    public void setTechTitle(String techTitle) {
        this.techTitle = techTitle;
    }
    @Column(name = "admin_title",  nullable = true)
    public String getAdminTitle() {
        return adminTitle;
    }
    public void setAdminTitle(String adminTitle) {
        this.adminTitle = adminTitle;
    }
    @Column(name = "DType",  nullable = true)
    public String getDType() {
        return DType;
    }
    public void setDType(String DType) {
        this.DType = DType;
    }
    @Column(name = "img_remote_path",  nullable = true)
    public String getImgRemotePath() {
        return imgRemotePath;
    }
    public void setImgRemotePath(String imgRemotePath) {
        this.imgRemotePath = imgRemotePath;
    }
    @Column(name = "img_local_path",  nullable = true)
    public String getImgLocalPath() {
        return imgLocalPath;
    }
    public void setImgLocalPath(String imgLocalPath) {
        this.imgLocalPath = imgLocalPath;
    }
    @Column(name = "fertility_status",  nullable = true)
    public int getFertilityStatus() {
        return fertilityStatus;
    }
    public void setFertilityStatus(int fertilityStatus) {
        this.fertilityStatus = fertilityStatus;
    }
    @Column(name = "second_phone",  nullable = true)
    public String getSecondPhone() {
        return secondPhone;
    }
    public void setSecondPhone(String secondPhone) {
        this.secondPhone = secondPhone;
    }
    @Column(name = "birthday",  nullable = true)
    public String getBirthday() {
        return birthday;
    }
    public void setBirthday(String birthday) {
        this.birthday = birthday;
    }
    @Column(name = "micard",  nullable = true)
    public String getMicard() {
        return micard;
    }
    public void setMicard(String micard) {
        this.micard = micard;
    }
    @Column(name = "qq",  nullable = true)
    public String getQq() {
        return qq;
    }
    public void setQq(String qq) {
        this.qq = qq;
    }
    @Column(name = "ssid",  nullable = true)
    public String getSsid() {
        return ssid;
    }
    public void setSsid(String ssid) {
        this.ssid = ssid;
    }
    @Column(name = "family_phone",  nullable = true)
    public String getFamilyPhone() {
        return familyPhone;
    }
    public void setFamilyPhone(String familyPhone) {
        this.familyPhone = familyPhone;
    }
    @Column(name = "province_id",  nullable = true)
    public int getProvinceId() {
        return provinceId;
    }
    public void setProvinceId(int provinceId) {
        this.provinceId = provinceId;
    }
    @Column(name = "province_name",  nullable = true)
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    @Column(name = "city_id",  nullable = true)
    public int getCityId() {
        return cityId;
    }
    public void setCityId(int cityId) {
        this.cityId = cityId;
    }
    @Column(name = "city_name",  nullable = true)
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    @Column(name = "area_id",  nullable = true)
    public int getAreaId() {
        return areaId;
    }
    public void setAreaId(int areaId) {
        this.areaId = areaId;
    }
    @Column(name = "area_name",  nullable = true)
    public String getAreaName() {
        return areaName;
    }
    public void setAreaName(String areaName) {
        this.areaName = areaName;
    }
    @Column(name = "demographic_id",  nullable = true)
    public String getDemographicId() {
        return demographicId;
    }
    public void setDemographicId(String demographicId) {
        this.demographicId = demographicId;
    }
    @Column(name = "doctor_id",  nullable = true)
    public String getDoctorId() {
        return doctorId;
    }
    public void setDoctorId(String doctorId) {
        this.doctorId = doctorId;
    }
    @Column(name = "realname_flag",  nullable = true)
    public String getRealnameFlag() {
        return realnameFlag;
    }
    public void setRealnameFlag(String realnameFlag) {
        this.realnameFlag = realnameFlag;
    }
    @Column(name = "street",  nullable = true)
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
    @Column(name = "profession",  nullable = true)
    public String getProfession() {
        return profession;
    }
    public void setProfession(String profession) {
        this.profession = profession;
    }
}

+ 94 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserLoginLog.java

@ -0,0 +1,94 @@
package com.yihu.jw.entity.ehr.user;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 * Created by Dell on 2017/2/13.
 */
@Entity
@Table(name = "user_login_log", schema = "", catalog = "healtharchive")
public class UserLoginLog {
    private int id;
    private String userId;
    private Timestamp loginTime;
    private String lastLoginTime;
    private String ip;
    @Id
    @Column(name = "id", nullable = false, insertable = true, updatable = true)
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    @Basic
    @Column(name = "user_id", nullable = false, insertable = true, updatable = true)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Basic
    @Column(name = "login_time", nullable = false, insertable = true, updatable = true)
    public Timestamp getLoginTime() {
        return loginTime;
    }
    public void setLoginTime(Timestamp loginTime) {
        this.loginTime = loginTime;
    }
    @Basic
    @Column(name = "last_login_time", nullable = false, insertable = true, updatable = true)
    public String getLastLoginTime() {
        return lastLoginTime;
    }
    public void setLastLoginTime(String lastLoginTime) {
        this.lastLoginTime = lastLoginTime;
    }
    @Basic
    @Column(name = "ip", nullable = true, insertable = true, updatable = true)
    public String getIp() {
        return ip;
    }
    public void setIp(String ip) {
        this.ip = ip;
    }
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        UserLoginLog that = (UserLoginLog) o;
        if (id != that.id) return false;
        if (userId != null ? !userId.equals(that.userId) : that.userId != null) return false;
        if (loginTime != null ? !loginTime.equals(that.loginTime) : that.loginTime != null) return false;
        if (lastLoginTime != null ? !lastLoginTime.equals(that.lastLoginTime) : that.lastLoginTime != null)
            return false;
        if (ip != null ? !ip.equals(that.ip) : that.ip != null) return false;
        return true;
    }
    @Override
    public int hashCode() {
        int result = id;
        result = 31 * result + (userId != null ? userId.hashCode() : 0);
        result = 31 * result + (loginTime != null ? loginTime.hashCode() : 0);
        result = 31 * result + (lastLoginTime != null ? lastLoginTime.hashCode() : 0);
        result = 31 * result + (ip != null ? ip.hashCode() : 0);
        return result;
    }
}

+ 79 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserTelVerification.java

@ -0,0 +1,79 @@
package com.yihu.jw.entity.ehr.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * 手机验证码表,用于通过短信验证码进行密码的更新
 *
 * @author cws
 * @version 1.0
 * @created 22-2月-2018
 */
@Entity
@Table(name = "user_tel_verification")
public class UserTelVerification implements Serializable{
    /** ID */
    private Integer id;
    /** 用于登录的手机号码 */
    private String telNo;
    /** 手机短信验证码 */
    private String verificationCode;
    /** 有效时间,当前时间+10分钟 */
    private Date effectivePeriod;
    /** 用于验证码的应用 */
    private String appId;
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "tel_no",  nullable = true)
    public String getTelNo() {
        return telNo;
    }
    public void setTelNo(String telNo) {
        this.telNo = telNo;
    }
    @Column(name = "verification_code",  nullable = true)
    public String getVerificationCode() {
        return verificationCode;
    }
    public void setVerificationCode(String verificationCode) {
        this.verificationCode =  verificationCode;
    }
    @Column(name = "effective_period",  nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEffectivePeriod() {
        return effectivePeriod;
    }
    public void setEffectivePeriod(Date effectivePeriod) {
        this.effectivePeriod = effectivePeriod;
    }
    @Column(name = "app_id",  nullable = true)
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
}

+ 52 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserType.java

@ -0,0 +1,52 @@
package com.yihu.jw.entity.ehr.user;
import com.yihu.jw.entity.BaseIdentityEntity;
import javax.persistence.*;
@Entity
@Table(name = "user_type")
@Access(value = AccessType.PROPERTY)
public class UserType extends BaseIdentityEntity {
    private String code;
    private String name;
    private String activeFlag;
    private String memo;
    public UserType() {
    }
    @Column(name = "code",  nullable = true)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "name",  nullable = true)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "active_flag",  nullable = true)
    public String getActiveFlag() {
        return activeFlag;
    }
    public void setActiveFlag(String activeFlag) {
        this.activeFlag = activeFlag;
    }
    @Column(name = "memo",  nullable = true)
    public String getMemo() {
        return memo;
    }
    public void setMemo(String memo) {
        this.memo = memo;
    }
}

+ 71 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/ehr/user/UserTypeRoles.java

@ -0,0 +1,71 @@
package com.yihu.jw.entity.ehr.user;
import com.yihu.jw.entity.BaseIdentityEntity;
import javax.persistence.*;
@Entity
@Table(name = "user_type_roles")
@Access(value = AccessType.PROPERTY)
public class UserTypeRoles extends BaseIdentityEntity {
    private Long typeId;
    private String typeName;
    private String clientId;
    private String clientName;
    private long roleId;
    private String roleName;
    public UserTypeRoles() {
    }
    @Column(name = "type_id",  nullable = true)
    public Long getTypeId() {
        return typeId;
    }
    public void setTypeId(Long typeId) {
        this.typeId = typeId;
    }
    @Column(name = "type_name",  nullable = true)
    public String getTypeName() {
        return typeName;
    }
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
    @Column(name = "client_id",  nullable = true)
    public String getClientId() {
        return clientId;
    }
    public void setClientId(String clientId) {
        this.clientId = clientId;
    }
    @Column(name = "client_name",  nullable = true)
    public String getClientName() {
        return clientName;
    }
    public void setClientName(String clientName) {
        this.clientName = clientName;
    }
    @Column(name = "role_id",  nullable = true)
    public long getRoleId() {
        return roleId;
    }
    public void setRoleId(long roleId) {
        this.roleId = roleId;
    }
    @Column(name = "role_name",  nullable = true)
    public String getRoleName() {
        return roleName;
    }
    public void setRoleName(String roleName) {
        this.roleName = roleName;
    }
}

+ 214 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MApp.java

@ -0,0 +1,214 @@
package com.yihu.jw.restmodel.ehr.app;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
 * APP Model。
 *
 * @author Sand
 * @version 1.0
 * @created 03_8月_2015 16:53:21
 */
public class MApp implements Serializable {
    private String id;
    private String name;
    private String secret;
    private String url;
    private String outUrl;
    private String creator;
    private String auditor;
    private Date createTime;
    private Date auditTime;
    private String catalog;
    private String status;
    private String description;
    private String tags;
    private String org;
    private String code;
    private int sourceType;
    private String icon;
    private int releaseFlag;
    private String manageType; // 管理类型,dictId=94
    private String roleType; // 是否授权,用于医疗云平台首页,授权状态控制 0 - 默认未授权, 1 - 已授权
    /**
     * 医生工作站的应用分类,与catalog并无父子关系,1、在线学习,2在线服务
     */
    private String doctorManageType;
    public MApp(){
    }
    public String getRoleType() {
        return roleType;
    }
    public void setRoleType(String roleType) {
        this.roleType = roleType;
    }
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getIcon() {
        return icon;
    }
    public void setIcon(String icon) {
        this.icon = icon;
    }
    public int getReleaseFlag() {
        return releaseFlag;
    }
    public void setReleaseFlag(int releaseFlag) {
        this.releaseFlag = releaseFlag;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public int getSourceType() {
        return sourceType;
    }
    public void setSourceType(int sourceType) {
        this.sourceType = sourceType;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getSecret() {
        return secret;
    }
    public void setSecret(String secret) {
        this.secret = secret;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getOutUrl() {
        return outUrl;
    }
    public void setOutUrl(String outUrl) {
        this.outUrl = outUrl;
    }
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    public String getAuditor() {
        return auditor;
    }
    public void setAuditor(String auditor) {
        this.auditor = auditor;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAuditTime() {
        return auditTime;
    }
    public void setAuditTime(Date auditTime) {
        this.auditTime = auditTime;
    }
    public String getCatalog() {
        return catalog;
    }
    public void setCatalog(String catalog) {
        this.catalog = catalog;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public List<String> getTags() {
        List<String> list = new ArrayList<>();
        if(StringUtils.isEmpty(tags)){
        }else {
            String[] arr = tags.split(";|;");
            list = Arrays.asList(arr);
        }
        return list;
    }
    public void setTags(List<String> tags) {
        if(tags.size()>0){
            this.tags = StringUtils.join(tags.toArray(),";");
        }else {
            this.tags = "";
        }
    }
    public String getOrg() {
        return org;
    }
    public void setOrg(String org) {
        this.org = org;
    }
    public String getManageType() {
        return manageType;
    }
    public void setManageType(String manageType) {
        this.manageType = manageType;
    }
    public String getDoctorManageType() {
        return doctorManageType;
    }
    public void setDoctorManageType(String doctorManageType) {
        this.doctorManageType = doctorManageType;
    }
}

+ 181 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApi.java

@ -0,0 +1,181 @@
package com.yihu.jw.restmodel.ehr.app;
import java.io.Serializable;
/**
 * APP_api对象。
 *
 * @author linzhuo
 * @version 1.0
 * @created 2016年7月7日17:45:30
 */
public class MAppApi implements Serializable {
    private int id;
    private String appId;
    private String name;
    private String description;
    private String type;
    private String method;
    private String protocol;
    private String version;
    private int parentId;
    private String parameterDemo;
    private String activityType;
    private String responseDemo;
    private String openLevel;
    private String auditLevel;
    private String methodName;
    private String microServiceUri;
    private String msMethodName;
    private String microServiceName;
    private Integer category;
    public String getMicroServiceUri() {
        return microServiceUri;
    }
    public void setMicroServiceUri(String microServiceUri) {
        this.microServiceUri = microServiceUri;
    }
    public String getMsMethodName() {
        return msMethodName;
    }
    public void setMsMethodName(String msMethodName) {
        this.msMethodName = msMethodName;
    }
    public String getMicroServiceName() {
        return microServiceName;
    }
    public void setMicroServiceName(String microServiceName) {
        this.microServiceName = microServiceName;
    }
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getMethod() {
        return method;
    }
    public void setMethod(String method) {
        this.method = method;
    }
    public String getProtocol() {
        return protocol;
    }
    public void setProtocol(String protocol) {
        this.protocol = protocol;
    }
    public String getVersion() {
        return version;
    }
    public void setVersion(String version) {
        this.version = version;
    }
    public int getParentId() {
        return parentId;
    }
    public void setParentId(int parentId) {
        this.parentId = parentId;
    }
    public String getParameterDemo() {
        return parameterDemo;
    }
    public void setParameterDemo(String parameterDemo) {
        this.parameterDemo = parameterDemo;
    }
    public String getActivityType() {
        return activityType;
    }
    public void setActivityType(String activityType) {
        this.activityType = activityType;
    }
    public String getResponseDemo() {
        return responseDemo;
    }
    public void setResponseDemo(String responseDemo) {
        this.responseDemo = responseDemo;
    }
    public String getOpenLevel() {
        return openLevel;
    }
    public void setOpenLevel(String openLevel) {
        this.openLevel = openLevel;
    }
    public String getAuditLevel() {
        return auditLevel;
    }
    public void setAuditLevel(String auditLevel) {
        this.auditLevel = auditLevel;
    }
    public String getMethodName() {
        return methodName;
    }
    public void setMethodName(String methodName) {
        this.methodName = methodName;
    }
    public Integer getCategory() {
        return category;
    }
    public void setCategory(Integer category) {
        this.category = category;
    }
}

+ 186 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApiDetail.java

@ -0,0 +1,186 @@
package com.yihu.jw.restmodel.ehr.app;
import java.io.Serializable;
import java.util.Collection;
/**
 * @author Airhead
 * @since 2017/3/16.
 */
public class MAppApiDetail implements Serializable {
    private int id;
    private String appId;
    private String name;
    private String description;
    private String type;
    private String method;
    private String protocol;
    private String version;
    private int parentId;
    private String parameterDemo;
    private String activityType;
    private String responseDemo;
    private String openLevel;
    private String auditLevel;
    private String methodName;
    private String microServiceUri;
    private String msMethodName;
    private String microServiceName;
    private Collection<MAppApiParameter> parameters;
    public MAppApiDetail() {
    }
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getMethod() {
        return method;
    }
    public void setMethod(String method) {
        this.method = method;
    }
    public String getProtocol() {
        return protocol;
    }
    public void setProtocol(String protocol) {
        this.protocol = protocol;
    }
    public String getVersion() {
        return version;
    }
    public void setVersion(String version) {
        this.version = version;
    }
    public int getParentId() {
        return parentId;
    }
    public void setParentId(int parentId) {
        this.parentId = parentId;
    }
    public String getParameterDemo() {
        return parameterDemo;
    }
    public void setParameterDemo(String parameterDemo) {
        this.parameterDemo = parameterDemo;
    }
    public String getActivityType() {
        return activityType;
    }
    public void setActivityType(String activityType) {
        this.activityType = activityType;
    }
    public String getResponseDemo() {
        return responseDemo;
    }
    public void setResponseDemo(String responseDemo) {
        this.responseDemo = responseDemo;
    }
    public String getOpenLevel() {
        return openLevel;
    }
    public void setOpenLevel(String openLevel) {
        this.openLevel = openLevel;
    }
    public String getAuditLevel() {
        return auditLevel;
    }
    public void setAuditLevel(String auditLevel) {
        this.auditLevel = auditLevel;
    }
    public String getMethodName() {
        return methodName;
    }
    public void setMethodName(String methodName) {
        this.methodName = methodName;
    }
    public String getMicroServiceUri() {
        return microServiceUri;
    }
    public void setMicroServiceUri(String microServiceUri) {
        this.microServiceUri = microServiceUri;
    }
    public String getMsMethodName() {
        return msMethodName;
    }
    public void setMsMethodName(String msMethodName) {
        this.msMethodName = msMethodName;
    }
    public String getMicroServiceName() {
        return microServiceName;
    }
    public void setMicroServiceName(String microServiceName) {
        this.microServiceName = microServiceName;
    }
    public Collection<MAppApiParameter> getParameters() {
        return parameters;
    }
    public void setParameters(Collection<MAppApiParameter> parameters) {
        this.parameters = parameters;
    }
}

+ 114 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApiParameter.java

@ -0,0 +1,114 @@
package com.yihu.jw.restmodel.ehr.app;
import java.io.Serializable;
/**
 * MAppApiParameter对象。
 *
 * @author linzhuo
 * @version 1.0
 * @created 2016年7月7日17:45:30
 */
public class MAppApiParameter implements Serializable {
    private int id;
    private String name;
    private String type;
    private String dataType;
    private String description;
    private String required;
    private int appApiId;
    private String memo;
    private String defaultValue;
    private Integer maxLength;
    private Integer sort;
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getDataType() {
        return dataType;
    }
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
    public String getRequired() {
        return required;
    }
    public void setRequired(String required) {
        this.required = required;
    }
    public int getAppApiId() {
        return appApiId;
    }
    public void setAppApiId(int appApiId) {
        this.appApiId = appApiId;
    }
    public String getMemo() {
        return memo;
    }
    public void setMemo(String memo) {
        this.memo = memo;
    }
    public String getDefaultValue() {
        return defaultValue;
    }
    public void setDefaultValue(String defaultValue) {
        this.defaultValue = defaultValue;
    }
    public Integer getMaxLength() {
        return maxLength;
    }
    public void setMaxLength(Integer maxLength) {
        this.maxLength = maxLength;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
}

+ 78 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppApiResponse.java

@ -0,0 +1,78 @@
package com.yihu.jw.restmodel.ehr.app;
import java.io.Serializable;
/**
 * MAppApiResponse对象。
 *
 * @author linzhuo
 * @version 1.0
 * @created 2016年7月7日17:45:30
 */
public class MAppApiResponse implements Serializable {
    private int id;
    private String name;
    private String dataType;
    private String description;
    private int appApiId;
    private String memo;
    private Integer sort;
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getDataType() {
        return dataType;
    }
    public void setDataType(String dataType) {
        this.dataType = dataType;
    }
    public int getAppApiId() {
        return appApiId;
    }
    public void setAppApiId(int appApiId) {
        this.appApiId = appApiId;
    }
    public String getMemo() {
        return memo;
    }
    public void setMemo(String memo) {
        this.memo = memo;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
}

+ 150 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MAppFeature.java

@ -0,0 +1,150 @@
package com.yihu.jw.restmodel.ehr.app;
import java.io.Serializable;
/**
 * MAppApiFeature对象。
 *
 * @author linzhuo
 * @version 1.0
 * @created 2016年7月7日17:45:30
 */
public class MAppFeature implements Serializable {
    private int id;
    private String code; // 菜单编码
    private String name; // 菜单名称
    private String description; // 菜单描述
    private String type; // 类型,1:模块,2:菜单,3:功能按钮。
    private int parentId; // 父菜单
    private String url; // 菜单访问路径。模块时没有值,菜单时有值,按钮时不一定有值。
    private String prefixUrl; // 菜单相对访问路径前缀,即JavaWeb上下文路径或站点+上下文路径。
    private String iconUrl; // 图标访问路径
    private String auditLevel; // 审计类型,0:不审计,1:审计。
    private String openLevel; // 开放级别,0:私有(不作为授权对象),1:公开(收费/免费)
    private String appId; // 应用ID
    private Integer sort; // 菜单排序
    private Integer level; // 菜单级别
    private String content; // 页面菜单拼接对象
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public int getParentId() {
        return parentId;
    }
    public void setParentId(int parentId) {
        this.parentId = parentId;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getPrefixUrl() {
        return prefixUrl;
    }
    public void setPrefixUrl(String prefixUrl) {
        this.prefixUrl = prefixUrl;
    }
    public String getIconUrl() {
        return iconUrl;
    }
    public void setIconUrl(String iconUrl) {
        this.iconUrl = iconUrl;
    }
    public String getAuditLevel() {
        return auditLevel;
    }
    public void setAuditLevel(String auditLevel) {
        this.auditLevel = auditLevel;
    }
    public String getOpenLevel() {
        return openLevel;
    }
    public void setOpenLevel(String openLevel) {
        this.openLevel = openLevel;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Integer getLevel() {
        return level;
    }
    public void setLevel(Integer level) {
        this.level = level;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
}

+ 97 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/MUserApp.java

@ -0,0 +1,97 @@
package com.yihu.jw.restmodel.ehr.app;
/**
 * Created by yeshijie on 2017/2/16.
 */
public class MUserApp {
    private int id;
    private String userId;
    private String userName;
    private String orgId;
    private String orgName;
    private String appId;
    private String appName;
    private Integer status;
    private String linkUrl;
    private Integer showFlag;
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public String getAppName() {
        return appName;
    }
    public void setAppName(String appName) {
        this.appName = appName;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getLinkUrl() {
        return linkUrl;
    }
    public void setLinkUrl(String linkUrl) {
        this.linkUrl = linkUrl;
    }
    public Integer getShowFlag() {
        return showFlag;
    }
    public void setShowFlag(Integer showFlag) {
        this.showFlag = showFlag;
    }
}

+ 181 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/app/OpenAppApi.java

@ -0,0 +1,181 @@
package com.yihu.jw.restmodel.ehr.app;
/**
 * model - 开放平台api信息
 * Created by progr1mmer on 2018/1/24.
 */
public class OpenAppApi {
    private int id;
    private String appId;
    private String name;
    private String description;
    private String type;
    private String method;
    private String protocol;
    private String version;
    private int parentId; //该字段弃用
    private String parameterDemo; //请求参数示例
    private String activityType;
    private String responseDemo; //返回结果示例
    private String openLevel;
    private String auditLevel;
    private String methodName; //对外网关接口方法名
    private String microServiceUri; //对外接口实际IP地址和端口
    private String msMethodName; //内部实际微服务中方法名
    private String microServiceName; //内部实际微服务名称
    private Integer category; //业务类别
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getAppId() {
        return appId;
    }
    public void setAppId(String appId) {
        this.appId = appId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getMethod() {
        return method;
    }
    public void setMethod(String method) {
        this.method = method;
    }
    public String getProtocol() {
        return protocol;
    }
    public void setProtocol(String protocol) {
        this.protocol = protocol;
    }
    public String getVersion() {
        return version;
    }
    public void setVersion(String version) {
        this.version = version;
    }
    public int getParentId() {
        return parentId;
    }
    public void setParentId(int parentId) {
        this.parentId = parentId;
    }
    public String getParameterDemo() {
        return parameterDemo;
    }
    public void setParameterDemo(String parameterDemo) {
        this.parameterDemo = parameterDemo;
    }
    public String getActivityType() {
        return activityType;
    }
    public void setActivityType(String activityType) {
        this.activityType = activityType;
    }
    public String getResponseDemo() {
        return responseDemo;
    }
    public void setResponseDemo(String responseDemo) {
        this.responseDemo = responseDemo;
    }
    public String getOpenLevel() {
        return openLevel;
    }
    public void setOpenLevel(String openLevel) {
        this.openLevel = openLevel;
    }
    public String getAuditLevel() {
        return auditLevel;
    }
    public void setAuditLevel(String auditLevel) {
        this.auditLevel = auditLevel;
    }
    public String getMethodName() {
        return methodName;
    }
    public void setMethodName(String methodName) {
        this.methodName = methodName;
    }
    public String getMicroServiceUri() {
        return microServiceUri;
    }
    public void setMicroServiceUri(String microServiceUri) {
        this.microServiceUri = microServiceUri;
    }
    public String getMsMethodName() {
        return msMethodName;
    }
    public void setMsMethodName(String msMethodName) {
        this.msMethodName = msMethodName;
    }
    public String getMicroServiceName() {
        return microServiceName;
    }
    public void setMicroServiceName(String microServiceName) {
        this.microServiceName = microServiceName;
    }
    public Integer getCategory() {
        return category;
    }
    public void setCategory(Integer category) {
        this.category = category;
    }
}

+ 88 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/MConventionalDict.java

@ -0,0 +1,88 @@
package com.yihu.jw.restmodel.ehr.dict;
/**
 * @author Sand
 * @version 1.0
 * @created 2015.07.30 14:43
 */
public class MConventionalDict {
    String code;
    long dictId;
    String value;
    Integer sort;
    String phoneticCode;
    String catalog;
    boolean checked; //是否已选中
    public MConventionalDict(){
    }
    public boolean checkIsVirtualCard(){
        if(this.getCatalog().equals("VirtualCard")){
            return true;
        }else{
            return false;
        }
    }
    public MConventionalDict(long dictId, String code, String value, Integer sort, String phoneticCode, String catalog){
        this.dictId = dictId;
        this.code = code;
        this.value = value;
        this.sort = sort;
        this.phoneticCode = phoneticCode;
        this.catalog = catalog;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public long getDictId() {
        return dictId;
    }
    public void setDictId(long dictId) {
        this.dictId = dictId;
    }
    public String getCatalog() {
        return catalog;
    }
    public void setCatalog(String catalog) {
        this.catalog = catalog;
    }
    public String getPhoneticCode() {
        return phoneticCode;
    }
    public void setPhoneticCode(String phoneticCode) {
        this.phoneticCode = phoneticCode;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    public boolean isChecked() {
        return checked;
    }
    public void setChecked(boolean checked) {
        this.checked = checked;
    }
}

+ 63 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/MDictionaryEntry.java

@ -0,0 +1,63 @@
package com.yihu.jw.restmodel.ehr.dict;
/**
 * @author Sand
 * @version 1.0
 * @created 2016.02.03 15:26
 */
public class MDictionaryEntry {
    String code;
    long dictId;
    String value;
    Integer sort;
    String phoneticCode;
    String catalog;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public long getDictId() {
        return dictId;
    }
    public void setDictId(long dictId) {
        this.dictId = dictId;
    }
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getPhoneticCode() {
        return phoneticCode;
    }
    public void setPhoneticCode(String phoneticCode) {
        this.phoneticCode = phoneticCode;
    }
    public String getCatalog() {
        return catalog;
    }
    public void setCatalog(String catalog) {
        this.catalog = catalog;
    }
}

+ 77 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/MSystemDict.java

@ -0,0 +1,77 @@
package com.yihu.jw.restmodel.ehr.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * @author Sand
 * @version 1.0
 * @created 2016.02.02 19:21
 */
public class MSystemDict {
    private long id;
    private String name;
    private String reference;
    private String authorId;
    private String phoneticCode;
    private String code;
    Date createDate;
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getReference() {
        return reference;
    }
    public void setReference(String reference) {
        this.reference = reference;
    }
    public String getAuthorId() {
        return authorId;
    }
    public void setAuthorId(String authorId) {
        this.authorId = authorId;
    }
    public String getPhoneticCode() {
        return phoneticCode;
    }
    public void setPhoneticCode(String phoneticCode) {
        this.phoneticCode = phoneticCode;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
}

+ 12 - 13
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/tj/MapDataModel.java

@ -1,20 +1,11 @@
package com.yihu.jw.restmodel.tj;
package com.yihu.jw.restmodel.ehr.dict;
/**
 * Created by janseny
 * Created by janseny on 2017/12/14.
 */
public class MapDataModel {
public class MapDict {
    private String name;
    private String value;
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    private Integer value;
    public String getName() {
        return name;
@ -23,4 +14,12 @@ public class MapDataModel {
    public void setName(String name) {
        this.name = name;
    }
    public Integer getValue() {
        return value;
    }
    public void setValue(Integer value) {
        this.value = value;
    }
}

+ 82 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/dict/SystemDictEntryAppModel.java

@ -0,0 +1,82 @@
package com.yihu.jw.restmodel.ehr.dict;
import com.yihu.jw.restmodel.ehr.app.MApp;
import java.util.List;
/**
 * Created by progr1mmer on 2018/4/8.
 */
public class SystemDictEntryAppModel {
    private long dictId;
    private String code;
    private String value;
    private Integer sort;
    private String catalog;
    private String phoneticCode;
    private List<MApp> children;
    public long getDictId() {
        return dictId;
    }
    public void setDictId(long dictId) {
        this.dictId = dictId;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getCatalog() {
        return catalog;
    }
    public void setCatalog(String catalog) {
        this.catalog = catalog;
    }
    public String getPhoneticCode() {
        return phoneticCode;
    }
    public void setPhoneticCode(String phoneticCode) {
        this.phoneticCode = phoneticCode;
    }
    public List<MApp> getChildren() {
        return children;
    }
    public void setChildren(List<MApp> children) {
        this.children = children;
    }
}

+ 71 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/family/MFamilies.java

@ -0,0 +1,71 @@
package com.yihu.jw.restmodel.ehr.family;// default package
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * @author lyr
 * @version 1.0
 * @updated 21-4月-2016 09:50:02
 */
public class MFamilies {
    private String id;
    private String addressId;
    private String creator;
    private Date createDate;
    private String householderIdCardNo;
    private int status;
    private String telephone;
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getAddressId() {
        return addressId;
    }
    public void setAddressId(String addressId) {
        this.addressId = addressId;
    }
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    public String getHouseholderIdCardNo() {
        return householderIdCardNo;
    }
    public void setHouseholderIdCardNo(String householderIdCardNo) {
        this.householderIdCardNo = householderIdCardNo;
    }
    public int getStatus() {
        return status;
    }
    public void setStatus(int status) {
        this.status = status;
    }
    public String getTelephone() {
        return telephone;
    }
    public void setTelephone(String telephone) {
        this.telephone = telephone;
    }
}

+ 55 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/family/MMembers.java

@ -0,0 +1,55 @@
package com.yihu.jw.restmodel.ehr.family;// default package
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * @author Sand
 * @version 1.0
 * @updated 02-6月-2015 20:25:02
 */
public class MMembers {
    private String id;
    private String familyId;
    private String idCardNo;
    private String familyRelation;
    private Date createDate;
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getFamilyId() {
        return familyId;
    }
    public void setFamilyId(String familyId) {
        this.familyId = familyId;
    }
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    public String getFamilyRelation() {
        return familyRelation;
    }
    public void setFamilyRelation(String familyRelation) {
        this.familyRelation = familyRelation;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate(){
        return createDate;
    }
    public void setCreateDate(Date createDate){
        this.createDate = createDate;
    }
}

+ 142 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/geography/MGeography.java

@ -0,0 +1,142 @@
package com.yihu.jw.restmodel.ehr.geography;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
/**
 * @author Sand
 * @version 1.0
 * @updated 25-05-2015 19:56:00
 */
public class MGeography implements Serializable {
    private String id;
    private String country;
    private String province;
    private String city;
    private String district;
    private String town;
    private String street;
    private String extra;
    private String postalCode;
    public MGeography() {
    }
    public MGeography(String province,String city,String district,String town,String street) {
        this.province = province;
        this.city = city;
        this.district = district;
        this.town = town;
        this.province = province;
        this.street = street;
    }
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getCountry() {
        return country;
    }
    public void setCountry(String country) {
        this.country = country;
    }
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    public String getDistrict() {
        return district;
    }
    public void setDistrict(String district) {
        this.district = district;
    }
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
    public String getExtra() {
        return extra;
    }
    public void setExtra(String extra) {
        this.extra = extra;
    }
    public String getPostalCode() {
        return postalCode;
    }
    public void setPostalCode(String postalCode) {
        this.postalCode = postalCode;
    }
    public String fullAddress() {
        String addressStr="";
        if (!StringUtils.isEmpty(province)){
            addressStr += province;
            if (!StringUtils.isEmpty(city)
                    && !province.equals(city)) {
                addressStr += city;
            }
        }
        if (!StringUtils.isEmpty(district)){
            addressStr += district;
        }
        if (!StringUtils.isEmpty(town)){
            addressStr += town;
        }
        if (!StringUtils.isEmpty(street)){
            addressStr += street;
        }
        if (!StringUtils.isEmpty(extra)){
            addressStr += extra;
        }
        return addressStr;
    }
    public boolean nullAddress() {
        return
                StringUtils.isEmpty(province)
                        && StringUtils.isEmpty(city)
                        && StringUtils.isEmpty(district)
                        && StringUtils.isEmpty(town)
                        && StringUtils.isEmpty(street)
                        && StringUtils.isEmpty(extra);
    }
}

+ 71 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/geography/MGeographyDict.java

@ -0,0 +1,71 @@
package com.yihu.jw.restmodel.ehr.geography;
/**
 * Created by AndyCai on 2016/2/16.
 */
public class MGeographyDict {
    private int id;   //序号
    private String abbreviation;    //简称
    private int level;  //级别 //1 省  2 市 3 区县
    private String name;  //名字
    private int pid; //上级序号
    private String postCode;  //邮政编码
    public MGeographyDict(){
        //id  = Integer.parseInt(UUID.randomUUID().toString());
    }
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getAbbreviation() {
        return abbreviation;
    }
    public void setAbbreviation(String abbreviation) {
        this.abbreviation = abbreviation;
    }
    public int getLevel() {
        return level;
    }
    public void setLevel(int level) {
        this.level = level;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public int getPid() {
        return pid;
    }
    public void setPid(int pid) {
        this.pid = pid;
    }
    public String getPostCode() {
        return postCode;
    }
    public void setPostCode(String postCode) {
        this.postCode = postCode;
    }
}

+ 158 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MAbstractCard.java

@ -0,0 +1,158 @@
package com.yihu.jw.restmodel.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 卡抽象类,仅作为继承时的数据成员使用
 *
 * @author Witness
 * @version 1.0
 * @updated 11-6月-2015 9:51:15
 */
public class MAbstractCard {
    String id;                    // 卡ID
    String number;                // 卡号
    String ownerName;            // 持有人姓名
    String status;            // 状态 CardStatus
    String cardType;                // 类型 CardType
    String description;            // 描述
    Date createDate;                // 创建日期
    String idCardNo;
    String DType;
    //特殊字段
    String local;                // 发行地/归属地
    String releaseOrg;                // 发行机构
    Date releaseDate;            // 发行时间
    Date validityDateBegin;        // 有效期起始时间
    Date validityDateEnd;        // 有效期结束时间
    public MAbstractCard() {
    }
    public boolean checkIsVirtualCard() {
        if (this.getCardType().equals("VirtualCard")) {
            return true;
        } else {
            return false;
        }
    }
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getNumber() {
        return number;
    }
    public void setNumber(String number) {
        this.number = number;
    }
    public String getOwnerName() {
        return ownerName;
    }
    public void setOwnerName(String ownerName) {
        this.ownerName = ownerName;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    public String getIdCardNo() {
        return idCardNo;
    }
    public void setIdCardNo(String idCardNo) {
        this.idCardNo = idCardNo;
    }
    public String getDType() {
        return DType;
    }
    public void setDType(String DType) {
        this.DType = DType;
    }
    public String getLocal() {
        return local;
    }
    public void setLocal(String local) {
        this.local = local;
    }
    public String getReleaseOrg() {
        return releaseOrg;
    }
    public void setReleaseOrg(String releaseOrg) {
        this.releaseOrg = releaseOrg;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getReleaseDate() {
        return releaseDate;
    }
    public void setReleaseDate(Date releaseDate) {
        this.releaseDate = releaseDate;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateBegin() {
        return validityDateBegin;
    }
    public void setValidityDateBegin(Date validityDateBegin) {
        this.validityDateBegin = validityDateBegin;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getValidityDateEnd() {
        return validityDateEnd;
    }
    public void setValidityDateEnd(Date validityDateEnd) {
        this.validityDateEnd = validityDateEnd;
    }
}

+ 160 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MArApply.java

@ -0,0 +1,160 @@
package com.yihu.jw.restmodel.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * @author lincl
 * @version 1.0
 * @created 2016/6/22
 */
public class MArApply {
    private int id;                       //编号
    private String name;                 // 申请时间
    private String idCard;                //申请人姓名
    private Date applyDate;               //申请人身份证号
    private String status;                   // 审核状态
    private Date auditDate;              //审核时间
    private String auditReason;           //不通过原因
    private String auditor;              //审核人
    private String visDate;                //就诊时间
    private String visOrg;                //就诊机构
    private String visDoctor;           //就诊医生
    private String cardNo;                //卡号
    private String diagnosedResult;   //诊断结果
    private String diagnosedProject;  //检查项目
    private String medicines;          //诊断开药
    private String memo;                //备注
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getIdCard() {
        return idCard;
    }
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getApplyDate() {
        return applyDate;
    }
    public void setApplyDate(Date applyDate) {
        this.applyDate = applyDate;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getAuditDate() {
        return auditDate;
    }
    public void setAuditDate(Date auditDate) {
        this.auditDate = auditDate;
    }
    public String getAuditReason() {
        return auditReason;
    }
    public void setAuditReason(String auditReason) {
        this.auditReason = auditReason;
    }
    public String getAuditor() {
        return auditor;
    }
    public void setAuditor(String auditor) {
        this.auditor = auditor;
    }
    public String getVisDate() {
        return visDate;
    }
    public void setVisDate(String visDate) {
        this.visDate = visDate;
    }
    public String getVisOrg() {
        return visOrg;
    }
    public void setVisOrg(String visOrg) {
        this.visOrg = visOrg;
    }
    public String getVisDoctor() {
        return visDoctor;
    }
    public void setVisDoctor(String visDoctor) {
        this.visDoctor = visDoctor;
    }
    public String getCardNo() {
        return cardNo;
    }
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    public String getDiagnosedResult() {
        return diagnosedResult;
    }
    public void setDiagnosedResult(String diagnosedResult) {
        this.diagnosedResult = diagnosedResult;
    }
    public String getDiagnosedProject() {
        return diagnosedProject;
    }
    public void setDiagnosedProject(String diagnosedProject) {
        this.diagnosedProject = diagnosedProject;
    }
    public String getMedicines() {
        return medicines;
    }
    public void setMedicines(String medicines) {
        this.medicines = medicines;
    }
    public String getMemo() {
        return memo;
    }
    public void setMemo(String memo) {
        this.memo = memo;
    }
}

+ 69 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MArRelation.java

@ -0,0 +1,69 @@
package com.yihu.jw.restmodel.ehr.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * @author lincl
 * @version 1.0
 * @created 2016/6/22
 */
public class MArRelation {
    private int id;          //编号
    private String idCard;   //申请人身份证号
    private int arApplyId;   //档案申请编号
    private String archiveId;  //档案编号
    private String status;     //关联状态
    private Date relationDate;//关联时间
    public int getId() {
        return id;
    }
    public void setId(int id) {
        this.id = id;
    }
    public String getIdCard() {
        return idCard;
    }
    public void setIdCard(String idCard) {
        this.idCard = idCard;
    }
    public int getArApplyId() {
        return arApplyId;
    }
    public void setArApplyId(int arApplyId) {
        this.arApplyId = arApplyId;
    }
    public String getArchiveId() {
        return archiveId;
    }
    public void setArchiveId(String archiveId) {
        this.archiveId = archiveId;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getRelationDate() {
        return relationDate;
    }
    public void setRelationDate(Date relationDate) {
        this.relationDate = relationDate;
    }
}

+ 0 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/patient/MAuthentication.java


Some files were not shown because too many files changed in this diff