Procházet zdrojové kódy

把i健康的job工程独立出来

chenweida před 8 roky
rodič
revize
bd7952131a
100 změnil soubory, kde provedl 6346 přidání a 4 odebrání
  1. 1 0
      common-lib/pom.xml
  2. 0 4
      patient-co/patient-co-pc/pom.xml
  3. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/1.png
  4. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/2.png
  5. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/3.png
  6. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/4.png
  7. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/5.png
  8. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/6.png
  9. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/7.png
  10. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/8.png
  11. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot项目启动的2种方式.docx
  12. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/1.png
  13. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/10.png
  14. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/11.png
  15. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/12.png
  16. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/13.png
  17. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/2.png
  18. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/3.png
  19. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/4.png
  20. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/5.png
  21. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/6.png
  22. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/7.png
  23. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/8.png
  24. binární
      patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/9.png
  25. binární
      patient-co/patient-co-wlyy-job/doc/接口文档/厦门i健康API文档.docx
  26. 10 0
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/00.readme.txt
  27. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/HBuilder使用该证书打包的例子.png
  28. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/aps推送证书.p12
  29. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/xmijkPro.mobileprovision
  30. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/证书.p12
  31. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/医生端通过HBuilder打包说明(草稿,完整版V0.2).docx
  32. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/发布修改参数.docx
  33. 10 0
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/00.readme.txt
  34. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/20160721170424_该证书的生成命令.png
  35. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/HBuilder使用该证书打包的例子.png
  36. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/ssgg_doctor.keystore
  37. 5 0
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/文档.txt
  38. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/im/im.docx
  39. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/后台/tomcat部署.docx
  40. binární
      patient-co/patient-co-wlyy-job/doc/部署文档/正式库/微信端/微信端发布.docx
  41. binární
      patient-co/patient-co-wlyy-job/images/booking.png
  42. binární
      patient-co/patient-co-wlyy-job/images/device.png
  43. binární
      patient-co/patient-co-wlyy-job/images/examination.png
  44. binární
      patient-co/patient-co-wlyy-job/images/familycontract.png
  45. binární
      patient-co/patient-co-wlyy-job/images/inspect.png
  46. binární
      patient-co/patient-co-wlyy-job/images/myfamily.png
  47. binární
      patient-co/patient-co-wlyy-job/images/operatinginstructions.png
  48. binární
      patient-co/patient-co-wlyy-job/images/operatinginstructions1.png
  49. binární
      patient-co/patient-co-wlyy-job/images/prescriptionRecords.png
  50. binární
      patient-co/patient-co-wlyy-job/images/renew.png
  51. binární
      patient-co/patient-co-wlyy-job/images/visit.png
  52. 471 0
      patient-co/patient-co-wlyy-job/pom.xml
  53. 29 0
      patient-co/patient-co-wlyy-job/readme.MD
  54. 18 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/Application.java
  55. 14 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/ObserverRequired.java
  56. 90 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/ObserverRequiredAOP.java
  57. 57 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/UserFilterAOP.java
  58. 27 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/FastDFSConfig.java
  59. 52 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/MvcConfig.java
  60. 122 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/SwaggerConfig.java
  61. 54 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/async/AsyncConfig.java
  62. 61 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/jpa/HealthJpa.java
  63. 27 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/jpa/HibernateProperties.java
  64. 67 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/jpa/WlyyJpa.java
  65. 0 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/quartz/JobFactory.java
  66. 0 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/quartz/SchedulerConfig.java
  67. 44 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/security/WebSecurityConfig.java
  68. 15 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/war/ServletInitializer.java
  69. 39 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/IdEntity.java
  70. 81 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/Versions.java
  71. 57 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/City.java
  72. 68 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Country.java
  73. 47 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Province.java
  74. 77 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Street.java
  75. 77 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Town.java
  76. 116 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/advert/Advert.java
  77. 280 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/charge/WlyyCharge.java
  78. 145 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/Consult.java
  79. 169 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultCommunication.java
  80. 117 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultCommunicationReply.java
  81. 283 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultMoVi.java
  82. 166 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultMoViReferral.java
  83. 180 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultPublic.java
  84. 127 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultPublicReply.java
  85. 328 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeam.java
  86. 100 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeamDoctor.java
  87. 125 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeamLog.java
  88. 77 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/Evaluate.java
  89. 57 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/EvaluateLabel.java
  90. 56 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/EvaluateScore.java
  91. 914 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/demographic/DemographicInfo.java
  92. 299 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/demographic/FamilyInfo.java
  93. 349 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/demographic/ResidenceInfo.java
  94. 109 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/Device.java
  95. 57 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/DeviceCategory.java
  96. 226 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/PatientBloodSugger.java
  97. 152 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/PatientDevice.java
  98. 248 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/PatientHealthTime.java
  99. 46 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/dict/Disease.java
  100. 0 0
      patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/dict/DmDrugsGroup.java

+ 1 - 0
common-lib/pom.xml

@ -20,6 +20,7 @@
        <!--<module>../jolokia-admin</module>&lt;!&ndash;springBoot性能分析项目&ndash;&gt;-->
        <module>../patient-co/patient-co-wlyy</module> <!--i健康-->
        <module>../patient-co/patient-co-wlyy-job</module> <!--i健康 job工程-->
        <module>../patient-co/patient-co-statistics</module> <!--i健康 mysql 版本统计-->
        <module>../patient-co/patient-co-statistics-es</module> <!--i健康 es 版本统计-->
        <module>../patient-co/patient-co-pc</module><!--im pc 版本-->

+ 0 - 4
patient-co/patient-co-pc/pom.xml

@ -410,10 +410,6 @@
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ylz</groupId>
            <artifactId>onepay-java-sdk</artifactId>
        </dependency>
    </dependencies>
    <build>

binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/1.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/2.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/3.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/4.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/5.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/6.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/7.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot启动/8.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/boot项目启动的2种方式.docx


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/1.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/10.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/11.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/12.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/13.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/2.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/3.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/4.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/5.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/6.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/7.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/8.png


binární
patient-co/patient-co-wlyy-job/doc/技术文档/IDEA操作/tomcat启动/9.png


binární
patient-co/patient-co-wlyy-job/doc/接口文档/厦门i健康API文档.docx


+ 10 - 0
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/00.readme.txt

@ -0,0 +1,10 @@
----------------------------------
包名:
com.yihu.xmijk
证书密码:
111111
----------------------------------
develope.apple.com 账号:
chunyudang.yihu@gmail.com 
Jkzldangchunyu060201

binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/HBuilder使用该证书打包的例子.png


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/aps推送证书.p12


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/xmijkPro.mobileprovision


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/ios/证书.p12


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/医生端通过HBuilder打包说明(草稿,完整版V0.2).docx


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/发布修改参数.docx


+ 10 - 0
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/00.readme.txt

@ -0,0 +1,10 @@
----------------------------------
包名:
com.wjw.ssgg.doctor
证书别名:
ssgg_doctor.keystore
证书密码:
ssgg_doctor
----------------------------------

binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/20160721170424_该证书的生成命令.png


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/HBuilder使用该证书打包的例子.png


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/ssgg_doctor.keystore


+ 5 - 0
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/app/安卓/文档.txt

@ -0,0 +1,5 @@
upload_preview.js
common_http.js
im_new.js

binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/im/im.docx


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/后台/tomcat部署.docx


binární
patient-co/patient-co-wlyy-job/doc/部署文档/正式库/微信端/微信端发布.docx


binární
patient-co/patient-co-wlyy-job/images/booking.png


binární
patient-co/patient-co-wlyy-job/images/device.png


binární
patient-co/patient-co-wlyy-job/images/examination.png


binární
patient-co/patient-co-wlyy-job/images/familycontract.png


binární
patient-co/patient-co-wlyy-job/images/inspect.png


binární
patient-co/patient-co-wlyy-job/images/myfamily.png


binární
patient-co/patient-co-wlyy-job/images/operatinginstructions.png


binární
patient-co/patient-co-wlyy-job/images/operatinginstructions1.png


binární
patient-co/patient-co-wlyy-job/images/prescriptionRecords.png


binární
patient-co/patient-co-wlyy-job/images/renew.png


binární
patient-co/patient-co-wlyy-job/images/visit.png


+ 471 - 0
patient-co/patient-co-wlyy-job/pom.xml

@ -0,0 +1,471 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <artifactId>common-lib</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../../common-lib/pom.xml</relativePath>
    </parent>
    <artifactId>patient-co-wlyy-job</artifactId>
    <name>patient-co-wlyy-job</name>
    <version>1.0.0</version>
    <packaging>war</packaging>
    <!-- 设定插件仓库, 如有Nexus私服, 取消注释并指向正确的服务器地址. -->
    <pluginRepositories>
        <pluginRepository>
            <id>nexus</id>
            <name>Team Nexus Repository</name>
            <url>http://172.19.103.47:8081/nexus/content/groups/public</url>
            <snapshots>
                <enabled>false</enabled>
            </snapshots>
        </pluginRepository>
    </pluginRepositories>
    <dependencies>
        <!--Spring boot family-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-autoconfigure</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-actuator-docs</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-mail</artifactId>
        </dependency>
        <!--<dependency>-->
        <!--<groupId>org.springframework.boot</groupId>-->
        <!--<artifactId>spring-boot-devtools</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-jdbc</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-thymeleaf</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-mail</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
        </dependency>
        <!-- end -->
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
        </dependency>
        <!-- spring start -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-beans</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-commons</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-keyvalue</artifactId>
        </dependency>
        <!-- spring end -->
        <!--Swagger start -->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
        </dependency>
        <!--Swagger end -->
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>jave-ffmpegjave</artifactId>
        </dependency>
        <!-- poi start-->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
        </dependency>
        <!-- poi end-->
        <dependency>
            <groupId>org.apache.axis</groupId>
            <artifactId>axis</artifactId>
        </dependency>
        <dependency>
            <groupId>axis</groupId>
            <artifactId>axis-jaxrpc</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
        </dependency>
        <dependency>
            <groupId>sehrCrypto</groupId>
            <artifactId>sehrCrypto</artifactId>
        </dependency>
        <dependency>
            <groupId>org.jdom</groupId>
            <artifactId>jdom</artifactId>
        </dependency>
        <dependency>
            <groupId>org.bouncycastle</groupId>
            <artifactId>bcprov-jdk16</artifactId>
        </dependency>
        <!-- Apache Commons fileupload -->
        <dependency>
            <groupId>commons-fileupload</groupId>
            <artifactId>commons-fileupload</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>
        <!-- SPRINGSIDE -->
        <dependency>
            <groupId>org.springside</groupId>
            <artifactId>springside-core</artifactId>
        </dependency>
        <!-- PERSISTENCE begin -->
        <!-- hibernate -->
        <dependency>
            <groupId>org.hibernate</groupId>
            <artifactId>hibernate-entitymanager</artifactId>
        </dependency>
        <dependency>
            <groupId>com.google.code.kaptcha</groupId>
            <artifactId>kaptcha</artifactId>
        </dependency>
        <!-- spring data access -->
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-jpa</artifactId>
        </dependency>
        <!-- aspectjrt start -->
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjrt</artifactId>
        </dependency>
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjweaver</artifactId>
        </dependency>
        <!-- aspectjrt end -->
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
            <version>2.4</version>
        </dependency>
        <!-- jdbc driver -->
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
        </dependency>
        <!-- PERSISTENCE end -->
        <!-- WEB begin -->
        <dependency>
            <groupId>opensymphony</groupId>
            <artifactId>sitemesh</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>jstl</artifactId>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
            <version>3.0.1</version>
        </dependency>
        <!-- WEB end -->
        <!-- JSR303 BeanValidator -->
        <dependency>
            <groupId>org.hibernate</groupId>
            <artifactId>hibernate-validator</artifactId>
        </dependency>
        <!-- JSON begin -->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.dataformat</groupId>
            <artifactId>jackson-dataformat-xml</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.module</groupId>
            <artifactId>jackson-module-jaxb-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
        </dependency>
        <!-- JSON end -->
        <dependency>
            <groupId>org.htmlparser</groupId>
            <artifactId>htmlparser</artifactId>
        </dependency>
        <dependency>
            <groupId>xom</groupId>
            <artifactId>xom</artifactId>
        </dependency>
        <dependency>
            <groupId>com.thoughtworks.xstream</groupId>
            <artifactId>xstream</artifactId>
        </dependency>
        <!-- LOGGING begin -->
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
        </dependency>
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
        </dependency>
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-core</artifactId>
        </dependency>
        <!-- 代码直接调用log4j会被桥接到slf4j -->
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>log4j-over-slf4j</artifactId>
        </dependency>
        <!-- 代码直接调用common-logging会被桥接到slf4j -->
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>jcl-over-slf4j</artifactId>
        </dependency>
        <!-- 代码直接调用java.util.logging会被桥接到slf4j -->
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>jul-to-slf4j</artifactId>
        </dependency>
        <!-- LOGGING end -->
        <!-- GENERAL UTILS begin -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
        </dependency>
        <!-- GENERAL UTILS end -->
        <!-- selenium 2.0 -->
        <dependency>
            <groupId>org.seleniumhq.selenium</groupId>
            <artifactId>selenium-java</artifactId>
            <scope>test</scope>
            <exclusions>
                <exclusion>
                    <groupId>org.seleniumhq.selenium</groupId>
                    <artifactId>selenium-htmlunit-driver</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>org.seleniumhq.selenium</groupId>
                    <artifactId>selenium-android-driver</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>org.seleniumhq.selenium</groupId>
                    <artifactId>selenium-iphone-driver</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>org.seleniumhq.selenium</groupId>
                    <artifactId>selenium-safari-driver</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>commons-logging</groupId>
                    <artifactId>commons-logging</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.seleniumhq.selenium</groupId>
            <artifactId>selenium-remote-driver</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>cglib</groupId>
                    <artifactId>cglib-nodep</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>commons-logging</groupId>
                    <artifactId>commons-logging</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <!--二维码生成 start-->
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>javase</artifactId>
        </dependency>
        <!--二维码生成 end-->
        <!-- quartz start  -->
        <dependency>
            <groupId>org.quartz-scheduler</groupId>
            <artifactId>quartz</artifactId>
        </dependency>
        <!-- quartz end  -->
        <!-- redis start  -->
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
        </dependency>
        <!-- redis end  -->
        <!--fastdfs start-->
        <dependency>
            <groupId>org.csource</groupId>
            <artifactId>fastdfs_lib</artifactId>
        </dependency>
        <!--fastdfs end-->
        <dependency>
            <groupId>joda-time</groupId>
            <artifactId>joda-time</artifactId>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
        </dependency>
        <!--易联众支付-->
        <dependency>
            <groupId>com.ylz</groupId>
            <artifactId>onpay-java-sdk-all</artifactId>
        </dependency>
    </dependencies>
    <build>
        <finalName>wlyy</finalName>
        <plugins>
            <!--打成war包需要的配置-->
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <source>1.8</source>
                    <target>1.8</target>
                    <compilerArguments>
                        <verbose/>
                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
                    </compilerArguments>
                </configuration>
                <version>3.1</version>
            </plugin>
        </plugins>
        <resources>
            <resource>
                <!--打包的时候把webapp下的资源移到根目录下-->
                <directory>${basedir}/src/main/webapp</directory>
                <targetPath>${basedir}/</targetPath>
                <includes>
                    <include>**/**</include>
                </includes>
                <!--防止以下两个文件编译的时候出现在项目根目录中,打包的时候还是会打包进去这2个文件-->
                <excludes>
                    <exclude>downloadPage.html</exclude>
                    <exclude>ssgg_doctor.plist</exclude>
                </excludes>
            </resource>
            <resource>
                <!--打包的时候把resources下的资源移到classpath下-->
                <directory>${basedir}/src/main/resources</directory>
                <includes>
                    <include>**/**</include>
                </includes>
            </resource>
        </resources>
    </build>
</project>

+ 29 - 0
patient-co/patient-co-wlyy-job/readme.MD

@ -0,0 +1,29 @@
项目中涉及到的框架
spring,springMVC,springJPA,springSecurity,springBoot
quartz,swagger-ui,hibernate,redis,fastDfs
项目包结构
doc 项目相关文档
src 代码
    main
        java
            com.yihu.wlyy
                aop 切面相关代码
                config 配置相关代码
                entity jpa 实体类相关代码
                event 事件相关代码
                exception 异常相关代码
                health 体征设备相关代码
                interceptors 拦截器相关代码
                job 任务相关代码
                logs 日志相关代码
                repository dao相关代码
                rest 
                service 服务类相关代码
                task 线程相关代码
                util 工具类相关代码
                web controller相关代码
                wechat 微信相关代码
        resource 资源和配置文件
        webapp  web相关代码

+ 18 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/Application.java

@ -0,0 +1,18 @@
package com.yihu.wlyy;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ApplicationContext;
/**
 * Created by chenweida on 2017/7/28.
 */
@SpringBootApplication
public class Application {
    public static ApplicationContext ctx = null;
    public static void main(String[] args) {
        ctx = SpringApplication.run(Application.class, args);
    }
}

+ 14 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/ObserverRequired.java

@ -0,0 +1,14 @@
package com.yihu.wlyy.aop;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
 * Created by Trick on 2017/6/24.
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface ObserverRequired {
}

+ 90 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/ObserverRequiredAOP.java

@ -0,0 +1,90 @@
package com.yihu.wlyy.aop;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.json.JSONObject;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
/**
 * Created by Trick on 2017/6/24.
 */
@Aspect
@Component
public class ObserverRequiredAOP {
    //Controller层切点路径
    @Pointcut("execution(* com.yihu.wlyy.web..*.*(..))")
    public void controllerAspect() {
    }
    public ObserverRequiredAOP() {
        //System.out.println("Observer---------------------------------------");
    }
    @Around("controllerAspect() && @annotation(com.yihu.wlyy.aop.ObserverRequired)")
    public Object checkToken(ProceedingJoinPoint point) throws Throwable {
        Object o = null;
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
        String error = "";
        try {
            response.setCharacterEncoding("UTF-8");
            JSONObject json = getAgent(request);
            String observer = json.has("observer") ? json.getString("observer") : "";
            if(StringUtils.isNotBlank(observer)&&"1".equals(observer)){
                PrintWriter writer=response.getWriter();
                writer.write(error(403, "该操作没有权限"));
                writer.flush();
                return o;
            }
        }catch (Exception e){
            //return o;
        }
         o = point.proceed();
        return o;
    }
    public String write(int code, String msg) {
        try {
            JSONObject json = new JSONObject();
            json.put("status", code);
            json.put("msg", msg);
            return json.toString();
        } catch (Exception e) {
            return null;
        }
    }
    public String error(int code, String msg) {
        try {
            JSONObject json = new JSONObject();
            json.put("status", code);
            json.put("msg", msg);
            return json.toString();
        } catch (Exception e) {
            return null;
        }
    }
    public JSONObject getAgent(HttpServletRequest request) {
        try {
            String userAgent = request.getHeader("userAgent");
            if (StringUtils.isEmpty(userAgent)) {
                userAgent = request.getHeader("User-Agent");
            }
            System.out.println("userAgent:" + userAgent);
            return new JSONObject(userAgent);
        } catch (Exception e) {
            return null;
        }
    }
}

+ 57 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/aop/UserFilterAOP.java

@ -0,0 +1,57 @@
package com.yihu.wlyy.aop;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.yihu.wlyy.repository.security.TokenDao;
@Component
@Aspect
public class UserFilterAOP {
	@Autowired
	public TokenDao tokenDao;
//	private JSONObject getAgent() {
//		try {
//			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
//			String userAgent = request.getHeader("User-Agent");
//			return new JSONObject(userAgent);
//		} catch (Exception e) {
//			return null;
//		}
//	}
//
//	@Before("execution(* com.yihu.wlyy.service.app..*.*(..))")
//	public void before() throws Exception {
//		JSONObject json = getAgent();
//		if(json == null){
//			// 未登录
//			throw new InvalidUserException(SystemConf.NOT_LOGIN, "请登录后再操作!");
//		}
//		String user = json.getString("uid");
//		String imei = json.getString("imei");
//		int platform = json.getInt("platform");
//
//		Token token = SystemData.allUserTokens.get(user);
//		if (token == null) {
//			token = tokenDao.findByUser(user, platform);
//			if (token == null) {
//				// 未登录
//				throw new InvalidUserException(SystemConf.NOT_LOGIN, "请登录后再操作!");
//			} else {
//				if (token.getTimeout().getTime() < new Date().getTime()) {
//					// 登录超时
//					throw new InvalidUserException(SystemConf.LOGIN_TIMEOUT, "登录超时,请重新登录");
//				} else if (!StringUtils.equals(imei, token.getImei())) {
//					// 别处登录
//					throw new InvalidUserException(SystemConf.LOGIN_OTHER, "帐号在别处登录,请重新登录");
//				} else {
//					// 登录正常,更新缓存
//					SystemData.allUserTokens.put(user, token);
//				}
//			}
//		}
//	}
}

+ 27 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/FastDFSConfig.java

@ -0,0 +1,27 @@
package com.yihu.wlyy.config;
import com.yihu.wlyy.util.fastdfs.FastDFSClientPool;
import com.yihu.wlyy.util.fastdfs.FastDFSUtil;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
 * @author Sand
 * @version 1.0
 * @created 2015.11.27 16:08
 */
@Configuration
public class FastDFSConfig {
    @Bean
    public FastDFSClientPool fastDFSClientPool(){
        FastDFSClientPool clientPool = FastDFSClientPool.getInstance();
        return clientPool;
    }
    @Bean
    public FastDFSUtil fastDFSUtil(){
        FastDFSUtil util = new FastDFSUtil();
        return util;
    }
}

+ 52 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/MvcConfig.java

@ -0,0 +1,52 @@
package com.yihu.wlyy.config;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.interceptors.DoctorInterceptor;
import com.yihu.wlyy.interceptors.PatientInterceptor;
import com.yihu.wlyy.interceptors.UserInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import java.util.List;
/**
 * Created by chenweida on 2017/4/6.
 */
@Configuration
public class MvcConfig extends WebMvcConfigurerAdapter {
    @Autowired
    private DoctorInterceptor doctorInterceptor;
    @Autowired
    private PatientInterceptor patientInterceptor;
    @Autowired
    private UserInterceptor userInterceptor;
    @Override
    public void addInterceptors(InterceptorRegistry registry) {
        // 多个拦截器组成一个拦截器链
        // addPathPatterns 用于添加拦截规则
        // excludePathPatterns 用户排除拦截
        registry.addInterceptor(doctorInterceptor).addPathPatterns("/doctor/**","/statistics/province/**","/statistics/**");
        registry.addInterceptor(patientInterceptor).addPathPatterns("/patient/**");
        registry.addInterceptor(userInterceptor).addPathPatterns("/user/**");
        super.addInterceptors(registry);
    }
//    /**
//     * 为null的数据不返回
//     * @param converters
//     */
//    @Override
//    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
//        MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
//        ObjectMapper objectMapper=new ObjectMapper();
//        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
//        mappingJackson2HttpMessageConverter.setObjectMapper(objectMapper);
//        converters.add(mappingJackson2HttpMessageConverter);
//    }
}

+ 122 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/SwaggerConfig.java

@ -0,0 +1,122 @@
package com.yihu.wlyy.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.request.async.DeferredResult;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@EnableSwagger2
@Configuration
public class SwaggerConfig {
    private static final String PUBLIC_API = "Default";
    private static final String Doctor_API = "doctor";
    private static final String Patient_API = "patient";
    private static final String Other_API = "other";
    @Bean
    public Docket publicAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Doctor_API)
                .genericModelSubstitutes(DeferredResult.class)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(true)
                .pathMapping("/")
                .select()
                .paths(PathSelectors.regex("/doctor/.*"))
                .build()
                .apiInfo(publicApiInfo());
    }
    private ApiInfo publicApiInfo() {
        ApiInfo apiInfo = new ApiInfo("三师平台API",
                "向PC端,微信、App等应用提供功能与数据接口。",
                "1.0",
                "No terms of service",
                "admin@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
    @Bean
    public Docket patientAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Patient_API)
                .genericModelSubstitutes(DeferredResult.class)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(true)
                .pathMapping("/")
                .select()
                .paths(PathSelectors.regex("/patient/.*"))
                .build()
                .apiInfo(patientApiInfo());
    }
    private ApiInfo patientApiInfo() {
        ApiInfo apiInfo = new ApiInfo("三师平台API",
                "向PC端,微信、App等应用提供功能与数据接口。",
                "1.0",
                "No terms of service",
                "admin@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
    @Bean
    public Docket otherAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Other_API)
                .genericModelSubstitutes(DeferredResult.class)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(true)
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/third/.*"),
                        regex("/statistics/.*"),
                        regex("/statistics/province/.*"),
                        regex("/job/.*"),
                        regex("/family_contract/.*"),
                        regex("/hosptail/.*"),
                        regex("/manage_util/.*"),
                        regex("/common/.*"),
                        regex("/hospitals/.*"),
                        regex("/upload/.*"),
                        regex("/weixin/.*"),
                        regex("/wx/.*"),
                        regex("/area/.*"),
                        regex("/login/.*"),
                        regex("/qrcode/.*"),
                        regex("/onepay/.*"),
                        regex("/wlyy_service/.*")
                ))
                .build()
                .apiInfo(otherApiInfo());
    }
    private ApiInfo otherApiInfo() {
        ApiInfo apiInfo = new ApiInfo("三师平台API",
                "向PC端,微信、App等应用提供功能与数据接口。",
                "1.0",
                "No terms of service",
                "admin@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
}

+ 54 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/async/AsyncConfig.java

@ -0,0 +1,54 @@
package com.yihu.wlyy.config.async;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Executor;
/**
 * Created by chenweida on 2016.10.18.
 * 启用多綫程
 */
@Configuration
@EnableAsync
public class AsyncConfig {
    /**
     * 如果池中的实际线程数小于corePoolSize,无论是否其中有空闲的线程,都会给新的任务产生新的线程
     */
    private int corePoolSize = 5;
    /**
     * 如果池中的线程数=maximumPoolSize,则有空闲线程使用空闲线程,否则新任务放入queueCapacity.
     * 设定 比 系统native thread个数要大的话,会优先抛出Java.lang.OutOfMemoryError: unable to create new native thread
     */
    private int maxPoolSize = 10;
    /**
     * 缓冲队列大小
     */
    private int queueCapacity = 100;
    /**
     * 线程池维护线程所允许的空闲时间  秒
     */
    private int keepAliveSeconds = 300;
    @Bean
    public Executor wlyyExecutor() {
        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
        executor.setCorePoolSize(corePoolSize);
        executor.setMaxPoolSize(maxPoolSize);
        executor.setQueueCapacity(queueCapacity);
        executor.setKeepAliveSeconds(keepAliveSeconds);
        /** Reject策略预定义有四种:
         (1)ThreadPoolExecutor.AbortPolicy策略,是默认的策略,处理程序遭到拒绝将抛出运行时 RejectedExecutionException。
         (2)ThreadPoolExecutor.CallerRunsPolicy策略 ,调用者的线程会执行该任务,如果执行器已关闭,则丢弃.
         (3)ThreadPoolExecutor.DiscardPolicy策略,不能执行的任务将被丢弃.
         (4)ThreadPoolExecutor.DiscardOldestPolicy策略,如果执行程序尚未关闭,则位于工作队列头部的任务将被删除,然后重试执行程序(如果再次失败,则重复此过程).
         */
        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
        executor.initialize();
        return executor;
    }
}

+ 61 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/jpa/HealthJpa.java

@ -0,0 +1,61 @@
package com.yihu.wlyy.config.jpa;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
/**
 * Created by chenweida on 2017/4/6.
 */
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
        entityManagerFactoryRef = "healthEntityManagerFactory",
        transactionManagerRef = "healthTransactionManager",
        basePackages = {"com.yihu.wlyy.health.repository"})  //设置Repository所在位置
public class HealthJpa {
    @Autowired
    private HibernateProperties hibernateProperties;
    @Bean(name = "healthDataSource")
    @ConfigurationProperties(prefix="spring.datasource.health")
    public DataSource healthDataSource() {
        return DataSourceBuilder.create().build();
    }
    @Bean(name = "healthEntityManagerFactory")
    public LocalContainerEntityManagerFactoryBean entityManagerFactorySecondary(
            @Qualifier("healthDataSource") DataSource dataSource) {
        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
        emfb.setDataSource(dataSource);
        emfb.setPackagesToScan("com.yihu.wlyy.health.entity");
        emfb.setPersistenceUnitName("health");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);
        emfb.setJpaProperties(hibernateProperties.hibProperties());
        return emfb;
    }
    @Bean(name = "healthTransactionManager")
    JpaTransactionManager transactionManagerSecondary(
            @Qualifier("healthEntityManagerFactory")EntityManagerFactory builder) {
        return new JpaTransactionManager(builder);
    }
}

+ 27 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/jpa/HibernateProperties.java

@ -0,0 +1,27 @@
package com.yihu.wlyy.config.jpa;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.Properties;
/**
 * Created by chenweida on 2017/4/6.
 */
@Component
public class HibernateProperties {
    @Value("${hibernate.dialect}")
    private String dialect;
    @Value("${hibernate.show_sql}")
    private String show_sql;
    @Value("${hibernate.ejb.naming_strategy}")
    private String naming_strategy;
    public  Properties hibProperties() {
        Properties properties = new Properties();
        properties.put("hibernate.dialect",dialect);
        properties.put("hibernate.show_sql", show_sql);
        properties.put("hibernate.ejb.naming_strategy", naming_strategy);
        return properties;
    }
}

+ 67 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/jpa/WlyyJpa.java

@ -0,0 +1,67 @@
package com.yihu.wlyy.config.jpa;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
/**
 * Created by chenweida on 2017/4/6.
 */
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyyEntityManagerFactory",
        transactionManagerRef = "wlyyTransactionManager",
        basePackages = {"com.yihu.wlyy.repository"})   //设置Repository所在位置
public class WlyyJpa {
    @Autowired
    private HibernateProperties hibernateProperties;
    @Bean(name = "wlyyDataSource")
    @Primary
    @ConfigurationProperties(prefix = "spring.datasource.wlyy")
    public DataSource wlyyDataSource() {
        return DataSourceBuilder.create().build();
    }
    @Bean(name = "wlyyEntityManagerFactory")
    @Primary
    public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary(
            @Qualifier("wlyyDataSource") DataSource dataSource) {
        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
        emfb.setDataSource(dataSource);
        emfb.setPackagesToScan("com.yihu.wlyy.entity");
        emfb.setPersistenceUnitName("wlyy");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);
        emfb.setJpaProperties(hibernateProperties.hibProperties());
        return emfb;
    }
    @Bean(name = "wlyyTransactionManager")
    @Primary
    JpaTransactionManager transactionManagerSecondary(
            @Qualifier("wlyyEntityManagerFactory") EntityManagerFactory builder) {
        return new JpaTransactionManager(builder);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/quartz/JobFactory.java → patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/quartz/JobFactory.java


patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/quartz/SchedulerConfig.java → patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/quartz/SchedulerConfig.java


+ 44 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/security/WebSecurityConfig.java

@ -0,0 +1,44 @@
package com.yihu.wlyy.config.security;
        import org.springframework.beans.factory.annotation.Autowired;
        import org.springframework.beans.factory.annotation.Value;
        import org.springframework.context.annotation.Configuration;
        import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
        import org.springframework.security.config.annotation.web.builders.HttpSecurity;
        import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
        import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
/**
 * Created by Administrator on 2016.10.17.
 */
@Configuration
@EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
    @Value("${security.basic.username}")
    String username;
    @Value("${security.basic.password}")
    String password;
    protected void configure(HttpSecurity http) throws Exception {
        http.authorizeRequests()
                .antMatchers("/swagger-ui.html").authenticated()
                .antMatchers("/swagger-ui.html").authenticated()
                .antMatchers("/configuration/security").authenticated()
                .anyRequest().permitAll()
                .and()
                .csrf().disable()
                .formLogin().defaultSuccessUrl("/swagger-ui.html").failureUrl("/login") //登录成功之后的跳转
                .permitAll()
                .and()
                .logout().logoutSuccessUrl("/login")
                .permitAll();
    }
    @Autowired
    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
        auth.inMemoryAuthentication()
                .withUser(username).password(password).roles("USER");
    }
}

+ 15 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/config/war/ServletInitializer.java

@ -0,0 +1,15 @@
package com.yihu.wlyy.config.war;//package com.yihu.wlyy.config.war;
import com.yihu.wlyy.Application;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.web.SpringBootServletInitializer;
/**
 * Created by Administrator on 2016.10.14.
 */
public class ServletInitializer extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(Application.class);
    }
}

+ 39 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/IdEntity.java

@ -0,0 +1,39 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.entity;
import java.io.Serializable;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
/**
 * 统一定义id的entity基类.
 * 
 * 基类统一定义id的属性名称、数据类型、列名映射及生成策略.
 * Oracle需要每个Entity独立定义id的SEQUCENCE时,不继承于本类而改为实现一个Idable的接口。
 * 
 * @author calvin
 */
// JPA 基类的标识
@MappedSuperclass
public abstract class IdEntity implements Serializable {
	private static final long serialVersionUID = 3673803562328635206L;
	protected Long id;  // 非业务主键
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
}

+ 81 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/Versions.java

@ -0,0 +1,81 @@
package com.yihu.wlyy.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 版本号
 * @author George
 */
@Entity
@Table(name = "wlyy_version")
public class Versions extends IdEntity {
	private static final long serialVersionUID = 7549164317186300400L;
	private String code;// 版本编码
	private String name;// 版本名称
	private Double versionInt;// 数字版本号
	private String versionStr;// 字符串版本号
	private String url;// 更新链接地址
	private String info;// 版本信息描述
	private Double size;// 版本包大小,单位M
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "version_int")
	public Double getVersionInt() {
		return versionInt;
	}
	public void setVersionInt(Double versionInt) {
		this.versionInt = versionInt;
	}
	@Column(name = "version_str")
	public String getVersionStr() {
		return versionStr;
	}
	public void setVersionStr(String versionStr) {
		this.versionStr = versionStr;
	}
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	public String getInfo() {
		return info;
	}
	public void setInfo(String info) {
		this.info = info;
	}
	public Double getSize() {
		return size;
	}
	public void setSize(Double size) {
		this.size = size;
	}
}

+ 57 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/City.java

@ -0,0 +1,57 @@
package com.yihu.wlyy.entity.address;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 城市信息對象
 *
 * @author George
 */
@Entity
@Table(name = "dm_city")
public class City extends IdEntity {
    /**
     *
     */
    private static final long serialVersionUID = 366338400555505599L;
    // 省編碼
    private String province;
    // 城市編碼
    private String code;
    // 城市名稱
    private String name;
    public City() {
    }
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

+ 68 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Country.java

@ -0,0 +1,68 @@
package com.yihu.wlyy.entity.address;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2017/7/20.
 */
@Entity
@Table(name = "dm_country")
public class Country extends IdEntity {
    private String  province;
    private String  city;
    private String  town;
    private String  street ;
    private String  code;
    private String  name;
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    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 getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
}

+ 47 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Province.java

@ -0,0 +1,47 @@
package com.yihu.wlyy.entity.address;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 省份信息對象
 * @author George
 *
 */
@Entity
@Table(name = "dm_province")
public class Province extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 1126538739936773663L;
	
	// 省編碼
	private String code;
	// 省名稱
	private String name;
	public Province() {
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
}

+ 77 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Street.java

@ -0,0 +1,77 @@
package com.yihu.wlyy.entity.address;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 街道信息对象
 * @author George
 *
 */
@Entity
@Table(name = "dm_street")
public class Street extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 2307784886255268677L;
	
	// 省編碼
	private String province;
	// 城市編碼
	private String city;
	// 区县编码
	private String town;
	// 區縣編碼
	private String code;
	// 區縣名稱
	private String name;
	public Street() {
	}
	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 getTown() {
		return town;
	}
	public void setTown(String town) {
		this.town = town;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
}

+ 77 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/address/Town.java

@ -0,0 +1,77 @@
package com.yihu.wlyy.entity.address;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 區縣信息對象
 * @author George
 *
 */
@Entity
@Table(name = "dm_town")
public class Town extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -3851597133734507811L;
	
	// 省編碼
	private String province;
	// 城市編碼
	private String city;
	// 區縣編碼
	private String code;
	// 區縣名稱
	private String name;
	private String photo;
	public Town() {
	}
	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 getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
}

+ 116 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/advert/Advert.java

@ -0,0 +1,116 @@
package com.yihu.wlyy.entity.advert;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 广告对象
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_advert")
public class Advert extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -5977709740868451783L;
	
	// 广告标题
	private String title;
	// 广告来源
	private String from;
	// 广告图片
	private String photo;
	// 广告链接地址
	private String url;
	// 广告显示顺序
	private Integer seq;
	// 广告类型(如主页广告)
	private Integer type;
	// 发布时间
	private Date czrq;
	// 是否作废,1正常,0作废
	private String del;
	// 操作员
	private String czy;
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	public String getFrom() {
		return from;
	}
	public void setFrom(String from) {
		this.from = from;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	public Integer getSeq() {
		return seq;
	}
	public void setSeq(Integer seq) {
		this.seq = seq;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
	public String getCzy() {
		return czy;
	}
	public void setCzy(String czy) {
		this.czy = czy;
	}
}

+ 280 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/charge/WlyyCharge.java

@ -0,0 +1,280 @@
package com.yihu.wlyy.entity.charge;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 扣费记录
 * @author hzp
 */
@Entity
@Table(name = "wlyy_charge")
public class WlyyCharge extends IdEntity {
	private String code;   //  接入应用支付业务流水号
	private String chargeType;   //交易类型  1签约 2续签
	private String chargeRelation;   //交易关联代码
	private Date createTime;   //  接入应用内支付时间
	private String patient;   //  用户
	private String openid;   //  用戶微信openid
	private String ssc;   // 医保卡号
	private String name;   //  姓名
	private String idType;   //  证件类型
	private String idNo;   //  证件号码
	private String hospital;   //  机构代码
	private String hospitalName;   //  机构名称
	private Integer totalAmount;   //  交易总金额
	private Integer selfpayAmount;   //  自费金额
	private Integer insuranceAmount;   //  医保支付金额
	private String needUpload;// 是否需要上传 0否(已上传) 1是(未上传) 2重复失败(上传失败)
	private String uploadLog;// 上传日志
	private String miRegisterNo;// 医保签约号(支付成功时由易联众返回)
	private String feeDetail;   //  费用明细
	private String channel;   //  医保支付渠道
	private String merchName;   //  收款单位名称
	private String subject;   //  订单名称
	private String tradeStatus;   //  交易状态0 成功 1 失败 2 已退款
	private String chargeNo;   //  流水号
	private String chargeTime;   // 扣费时间YYYYMMDDHHMMSS
	private String medOrgNo;   //  医疗机构编码
	private String medOrgName;   //  医疗机构名称
	private String billNo;   //  待结算费用单据号
	private Date updateTime;//修改时间
	public String getChargeType() {
		return chargeType;
	}
	public void setChargeType(String chargeType) {
		this.chargeType = chargeType;
	}
	public String getChargeRelation() {
		return chargeRelation;
	}
	public void setChargeRelation(String chargeRelation) {
		this.chargeRelation = chargeRelation;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@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;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public String getOpenid() {
		return openid;
	}
	public void setOpenid(String openid) {
		this.openid = openid;
	}
	public String getSsc() {
		return ssc;
	}
	public void setSsc(String ssc) {
		this.ssc = ssc;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public String getIdType() {
		return idType;
	}
	public void setIdType(String idType) {
		this.idType = idType;
	}
	public String getIdNo() {
		return idNo;
	}
	public void setIdNo(String idNo) {
		this.idNo = idNo;
	}
	public String getHospital() {
		return hospital;
	}
	public void setHospital(String hospital) {
		this.hospital = hospital;
	}
	public String getHospitalName() {
		return hospitalName;
	}
	public void setHospitalName(String hospitalName) {
		this.hospitalName = hospitalName;
	}
	public Integer getTotalAmount() {
		return totalAmount;
	}
	public void setTotalAmount(Integer totalAmount) {
		this.totalAmount = totalAmount;
	}
	public Integer getSelfpayAmount() {
		return selfpayAmount;
	}
	public void setSelfpayAmount(Integer selfpayAmount) {
		this.selfpayAmount = selfpayAmount;
	}
	public Integer getInsuranceAmount() {
		return insuranceAmount;
	}
	public void setInsuranceAmount(Integer insuranceAmount) {
		this.insuranceAmount = insuranceAmount;
	}
	public String getNeedUpload() {
		return needUpload;
	}
	public void setNeedUpload(String needUpload) {
		this.needUpload = needUpload;
	}
	public String getUploadLog() {
		return uploadLog;
	}
	public void setUploadLog(String uploadLog) {
		this.uploadLog = uploadLog;
	}
    public String getMiRegisterNo() {
        return miRegisterNo;
    }
    public void setMiRegisterNo(String miRegisterNo) {
        this.miRegisterNo = miRegisterNo;
    }
    public String getFeeDetail() {
		return feeDetail;
	}
	public void setFeeDetail(String feeDetail) {
		this.feeDetail = feeDetail;
	}
	public String getChannel() {
		return channel;
	}
	public void setChannel(String channel) {
		this.channel = channel;
	}
	public String getMerchName() {
		return merchName;
	}
	public void setMerchName(String merchName) {
		this.merchName = merchName;
	}
	public String getSubject() {
		return subject;
	}
	public void setSubject(String subject) {
		this.subject = subject;
	}
	public String getTradeStatus() {
		return tradeStatus;
	}
	public void setTradeStatus(String tradeStatus) {
		this.tradeStatus = tradeStatus;
	}
	public String getChargeNo() {
		return chargeNo;
	}
	public void setChargeNo(String chargeNo) {
		this.chargeNo = chargeNo;
	}
	public String getChargeTime() {
		return chargeTime;
	}
	public void setChargeTime(String chargeTime) {
		this.chargeTime = chargeTime;
	}
	public String getMedOrgNo() {
		return medOrgNo;
	}
	public void setMedOrgNo(String medOrgNo) {
		this.medOrgNo = medOrgNo;
	}
	public String getMedOrgName() {
		return medOrgName;
	}
	public void setMedOrgName(String medOrgName) {
		this.medOrgName = medOrgName;
	}
	public String getBillNo() {
		return billNo;
	}
	public void setBillNo(String billNo) {
		this.billNo = billNo;
	}
	public Date getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
}

+ 145 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/Consult.java

@ -0,0 +1,145 @@
package com.yihu.wlyy.entity.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 患者视频、三师、公共、病友等咨询记录
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult")
public class Consult extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -1619584376832854189L;
	// 咨询标识
	private String code;
	// 患者标识
	private String patient;
	// 咨询类型:1三师咨询,2视频咨询,3图文咨询,4公共咨询,5病友圈 6、患者名医咨询 7医生名医咨询 8续方咨询 10医生发起的求助
	private Integer type;
	// 咨询标题/主诉
	private String title;
	// 主诉
	private String symptoms;
	// 咨询图片URL,多图以逗号分隔
	private String images;
	// 关联指导
	private Long guidance;
	// 咨询时间
	private Date czrq;
	// 作废标识,1正常,0作废
	private String del;
	// 结束时间
	private Date endTime;
	//签约表Code
	private String signCode;
	private String relationCode;//关联业务表的code
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	public String getSymptoms() {
		return symptoms;
	}
	public void setSymptoms(String symptoms) {
		this.symptoms = symptoms;
	}
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getEndTime() {
		return endTime;
	}
	public void setEndTime(Date endTime) {
		this.endTime = endTime;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
	public Long getGuidance() {
		return guidance;
	}
	public void setGuidance(Long guidance) {
		this.guidance = guidance;
	}
	public String getSignCode() {
		return signCode;
	}
	public void setSignCode(String signCode) {
		this.signCode = signCode;
	}
	public String getRelationCode() {
		return relationCode;
	}
	public void setRelationCode(String relationCode) {
		this.relationCode = relationCode;
	}
}

+ 169 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultCommunication.java

@ -0,0 +1,169 @@
package com.yihu.wlyy.entity.consult;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 病友圈
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_communication")
public class ConsultCommunication extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 2631720251475612892L;
	// 咨询标识
	private String consult;
	// 咨询患者标识
	private String patient;
	// 患者姓名
	private String name;
	// 性别:1男,2女
//	private int sex;
	// 患者头像
	private String photo;
	// 问题标题
	private String title;
	// 问题描述
	private String content;
	// 图片URL,多图以逗号分隔
	private String images;
	// 疾病类型,关联wlyy_disease表code
	private String disease;
	// 疾病类型名称
	private String diseaseName;
	// 回复数量
	private Integer amount;
	// 未读数量
	private Integer unread;
	// 咨询时间
	private Date czrq;
	// 作废标识:1正常,0作废
	private String del;
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
//	public int getSex() {
//		return sex;
//	}
//
//	public void setSex(int sex) {
//		this.sex = sex;
//	}
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
	public String getDisease() {
		return disease;
	}
	public void setDisease(String disease) {
		this.disease = disease;
	}
	@Column(name = "disease_name")
	public String getDiseaseName() {
		return diseaseName;
	}
	public void setDiseaseName(String diseaseName) {
		this.diseaseName = diseaseName;
	}
	public Integer getAmount() {
		return amount;
	}
	public void setAmount(Integer amount) {
		this.amount = amount;
	}
	public Integer getUnread() {
		return unread;
	}
	public void setUnread(Integer unread) {
		this.unread = unread;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 117 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultCommunicationReply.java

@ -0,0 +1,117 @@
package com.yihu.wlyy.entity.consult;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 病友圈回复信息
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_communication_reply")
public class ConsultCommunicationReply extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 8719071445963445644L;
	// 咨询标识
	private String consult;
	// 回复患者标识
	private String patient;
	// 回复者姓名
	private String name;
	// 性别:1男,2女
//	private int sex;
	// 回复者头像
	private String photo;
	// 回复内容
	private String content;
	// 回复图片URL地址,多图以逗号分隔
	private String images;
	// 咨询时间
	private Date czrq;
	// 作废标识:1正常,0作废
	private String del;
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
//	public int getSex() {
//		return sex;
//	}
//
//	public void setSex(int sex) {
//		this.sex = sex;
//	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 283 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultMoVi.java

@ -0,0 +1,283 @@
package com.yihu.wlyy.entity.consult;
import java.sql.Time;
import java.util.Date;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.doctor.profile.DoctorComment;
import com.yihu.wlyy.entity.IdEntity;
import io.swagger.annotations.Api;
/**
 * 电话视频咨询信息對象
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_movi")
@Api(description = "电视咨询")
public class ConsultMoVi extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -8996800633072164852L;
	// 咨询标识
	private String consult;
	// 医生标识
	private String doctor;
	// 医生姓名
	private String doctorName;
	// 三师团队
	private String team;
	// 三师团队名称
	private String teamName;
	// 预约类型:1指定医生,2三师预约
	private Integer target;
	// 患者标识
	private String patient;
	// 家人标识
	private String family;
	// 患者姓名
	private String name;
	// 患者性别
	private Integer sex;
	// 患者生日
	private Date birthday;
	// 患者头像
	private String photo;
	// 预约内容说明
	private String content;
	// 咨询类型,1电话咨询,2视频咨询
	private Integer type;
	// 排班标识
	private String scheduling;
	// 预约日期
	private Date appoDate;
	// 预约星期
	private Integer appoWeek;
	// 预约开始时间
	private Time hourBegin;
	// 预约结束时间
	private Time hourEnd;
	// 图片URL,多图逗号分隔
	private String images;
	// 咨询状态:0待医生同意,-1医生拒绝,1医生同意,2咨询完成
	private Integer status;
	// 评价标识,为空说明未评价
	private DoctorComment comment;
	// 咨询时间
	private Date czrq;
	// 作废标识,1正常,0作废
	private String del;
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	public String getDoctor() {
		return doctor;
	}
	public void setDoctor(String doctor) {
		this.doctor = doctor;
	}
	@Column(name = "doctor_name")
	public String getDoctorName() {
		return doctorName;
	}
	public void setDoctorName(String doctorName) {
		this.doctorName = doctorName;
	}
	public String getTeam() {
		return team;
	}
	public void setTeam(String team) {
		this.team = team;
	}
	@Column(name = "team_name")
	public String getTeamName() {
		return teamName;
	}
	public void setTeamName(String teamName) {
		this.teamName = teamName;
	}
	public Integer getTarget() {
		return target;
	}
	public void setTarget(Integer target) {
		this.target = target;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public String getFamily() {
		return family;
	}
	public void setFamily(String family) {
		this.family = family;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public Integer getSex() {
		return sex;
	}
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	public Date getBirthday() {
		return birthday;
	}
	public void setBirthday(Date birthday) {
		this.birthday = birthday;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public String getScheduling() {
		return scheduling;
	}
	public void setScheduling(String scheduling) {
		this.scheduling = scheduling;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getAppoDate() {
		return appoDate;
	}
	public void setAppoDate(Date appoDate) {
		this.appoDate = appoDate;
	}
	public Integer getAppoWeek() {
		return appoWeek;
	}
	public void setAppoWeek(Integer appoWeek) {
		this.appoWeek = appoWeek;
	}
	@Column(name = "hour_begin")
	public Time getHourBegin() {
		return hourBegin;
	}
	public void setHourBegin(Time hourBegin) {
		this.hourBegin = hourBegin;
	}
	@Column(name = "hour_end")
	public Time getHourEnd() {
		return hourEnd;
	}
	public void setHourEnd(Time hourEnd) {
		this.hourEnd = hourEnd;
	}
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@ManyToOne(cascade = CascadeType.REFRESH, fetch = FetchType.LAZY, targetEntity = DoctorComment.class, optional = true)
	@JoinColumn(name = "comment", referencedColumnName = "code", insertable = true)
	public DoctorComment getComment() {
		return comment;
	}
	public void setComment(DoctorComment comment) {
		this.comment = comment;
	}
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 166 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultMoViReferral.java

@ -0,0 +1,166 @@
package com.yihu.wlyy.entity.consult;
import java.sql.Time;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 视频咨询转诊记录表
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_movi_referral")
public class ConsultMoViReferral extends IdEntity {
	/**
	 *
	 */
	private static final long serialVersionUID = -544301814870032058L;
	// 视频咨询标识
	private String consult;
	// 转出医生标识
	private String from;
	// 转出医生姓名
	private String fromName;
	// 转入医生标识
	private String to;
	// 排班标识
	private String scheduling;
	// 预约日期
	private Date appoDate;
	// 预约星期
	private Integer appoWeek;
	// 预约开始时间
	private Time hourBegin;
	// 预约结束时间
	private Time hourEnd;
	// 转诊说明
	private String content;
	// 通话时长:分钟
	private Integer talkTime;
	// 是否已转诊:1是,0否
	private Integer flag;
	// 转诊时间
	private Date czrq;
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	@Column(name = "form_doctor")
	public String getFrom() {
		return from;
	}
	public void setFrom(String from) {
		this.from = from;
	}
	@Column(name = "form_doctor_name")
	public String getFromName() {
		return fromName;
	}
	public void setFromName(String fromName) {
		this.fromName = fromName;
	}
	@Column(name = "to_doctor")
	public String getTo() {
		return to;
	}
	public void setTo(String to) {
		this.to = to;
	}
	public String getScheduling() {
		return scheduling;
	}
	public void setScheduling(String scheduling) {
		this.scheduling = scheduling;
	}
	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
	public Date getAppoDate() {
		return appoDate;
	}
	public void setAppoDate(Date appoDate) {
		this.appoDate = appoDate;
	}
	public Integer getAppoWeek() {
		return appoWeek;
	}
	public void setAppoWeek(Integer appoWeek) {
		this.appoWeek = appoWeek;
	}
	@Column(name = "hour_begin")
	public Time getHourBegin() {
		return hourBegin;
	}
	public void setHourBegin(Time hourBegin) {
		this.hourBegin = hourBegin;
	}
	@Column(name = "hour_end")
	public Time getHourEnd() {
		return hourEnd;
	}
	public void setHourEnd(Time hourEnd) {
		this.hourEnd = hourEnd;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	@Column(name = "talk_time")
	public Integer getTalkTime() {
		return talkTime;
	}
	public void setTalkTime(Integer talkTime) {
		this.talkTime = talkTime;
	}
	public Integer getFlag() {
		return flag;
	}
	public void setFlag(Integer flag) {
		this.flag = flag;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
}

+ 180 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultPublic.java

@ -0,0 +1,180 @@
package com.yihu.wlyy.entity.consult;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 公共咨询
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_public")
public class ConsultPublic extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 959839737694203009L;
	// 咨询标识
	private String consult;
	// 咨询患者标识
	private String patient;
	// 患者姓名
	private String name;
	// 性别:1男,2女
	private Integer sex;
	// 患者头像
	private String photo;
	// 发病时间(如:1小时前)
	private String when;
	// 问题标题
	private String title;
	// 问题描述
	private String content;
	// 图片URL,多图以逗号分隔
	private String images;
	// 疾病类型,关联wlyy_disease表code
	private String disease;
	// 疾病类型名称
	private String diseaseName;
	// 回复数量
	private Integer amount;
	// 未读数量
	private Integer unread;
	// 咨询时间
	private Date czrq;
	// 作废标识:1正常,0作废
	private String del;
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public Integer getSex() {
		return sex;
	}
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	@Column(name = "fbsj")
	public String getWhen() {
		return when;
	}
	public void setWhen(String when) {
		this.when = when;
	}
	public String getTitle() {
		return title;
	}
	public void setTitle(String title) {
		this.title = title;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
	public String getDisease() {
		return disease;
	}
	public void setDisease(String disease) {
		this.disease = disease;
	}
	@Column(name = "disease_name")
	public String getDiseaseName() {
		return diseaseName;
	}
	public void setDiseaseName(String diseaseName) {
		this.diseaseName = diseaseName;
	}
	public Integer getAmount() {
		return amount;
	}
	public void setAmount(Integer amount) {
		this.amount = amount;
	}
	public Integer getUnread() {
		return unread;
	}
	public void setUnread(Integer unread) {
		this.unread = unread;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 127 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultPublicReply.java

@ -0,0 +1,127 @@
package com.yihu.wlyy.entity.consult;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 公共咨询回复信息
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_public_reply")
public class ConsultPublicReply extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 959839737694203009L;
	// 咨询标识
	private String consult;
	// 回复患者标识
	private String patient;
	// 回复医生标识
	private String doctor;
	// 回复者姓名
	private String name;
	// 性别:1男,2女
	private Integer sex;
	// 回复者头像
	private String photo;
	// 回复内容
	private String content;
	// 回复图片URL地址,多图以逗号分隔
	private String images;
	// 咨询时间
	private Date czrq;
	// 作废标识:1正常,0作废
	private String del;
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public String getDoctor() {
		return doctor;
	}
	public void setDoctor(String doctor) {
		this.doctor = doctor;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public Integer getSex() {
		return sex;
	}
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 328 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeam.java

@ -0,0 +1,328 @@
package com.yihu.wlyy.entity.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
 * 三师咨询
 * @author George
 */
@Entity
@Table(name = "wlyy_consult_team")
public class ConsultTeam extends IdEntity {
	private static final long serialVersionUID = -7644448339473861513L;
	private String consult;         // 咨询标识
	private String doctor;          // 医生标识
	private String team;            // 三师团队标识
	private Integer type;           //  1、三师咨询,2、家庭医生咨询,6、患者名医咨询 7医生名医咨询 8续方咨询
	private String patient;         // 提问者标识
	private String name;            // 患者姓名
	private Integer sex;            // 患者性别
	private Date birthday;          // 患者生日
	private String photo;           // 患者头像
	private String when;            // 发病日期
	private String symptoms;        // 主要症状
	private Integer status;         // 咨询状态(0进行中,1已完成,-1患者取消,-2超时未响应自动关闭)
	private String images;          // 咨询图片URL,多图以逗号分隔
	private String voice;           // 咨询语音URL
	private String comment;         // 用户评价标识
	private String commentContent;  // 用户评价内容
	private Integer commentStar;    // 用户评价星级
	private Integer doctorRead;     // 医生未读数量
	private Integer patientRead;    // 患者未读数量
	private Date czrq;              // 咨询时间
	private String del;             // 作废标识,1正常,0作废
	private Long adminTeamId;//行政团队ID
	private Long guidance;   //关联指导
	private String doctorName;//醫生名字
	//起始消息id
	private String startMsgId;
	//结束消息id
	private String endMsgId;
	// 结束人
	private String endOperator;
	// 结束人类型
	private Integer endType;
	// 结束时间
	private Date endTime;
	//是否评价 1、已评价 0、未评价'
	private Integer evaluate;
	//评价时间
	private Date evaluateTime;
	private String relationCode;//关联业务表的code
	public Integer getEvaluate() {
		return evaluate;
	}
	public void setEvaluate(Integer evaluate) {
		this.evaluate = evaluate;
	}
	public Date getEvaluateTime() {
		return evaluateTime;
	}
	public void setEvaluateTime(Date evaluateTime) {
		this.evaluateTime = evaluateTime;
	}
	@Column(name = "admin_team_code")
	public Long getAdminTeamId() {
		return adminTeamId;
	}
	public void setAdminTeamId(Long adminTeamId) {
		this.adminTeamId = adminTeamId;
	}
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	public ConsultTeam() {
	}
	public String getDoctor() {
		return doctor;
	}
	public void setDoctor(String doctor) {
		this.doctor = doctor;
	}
	public String getTeam() {
		return team;
	}
	public void setTeam(String team) {
		this.team = team;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public String getPatient() {
		return patient;
	}
	public void setPatient(String patient) {
		this.patient = patient;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
	public Date getBirthday() {
		return birthday;
	}
	public void setBirthday(Date birthday) {
		this.birthday = birthday;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	@Column(name = "fbsj")
	public String getWhen() {
		return when;
	}
	public void setWhen(String when) {
		this.when = when;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
	public String getVoice() {
		return voice;
	}
	public void setVoice(String voice) {
		this.voice = voice;
	}
	public String getComment() {
		return comment;
	}
	public void setComment(String comment) {
		this.comment = comment;
	}
	@Column(name = "comment_content")
	public String getCommentContent() {
		return commentContent;
	}
	public void setCommentContent(String commentContent) {
		this.commentContent = commentContent;
	}
	@Column(name = "comment_star")
	public Integer getCommentStar() {
		return commentStar;
	}
	public void setCommentStar(Integer commentStar) {
		this.commentStar = commentStar;
	}
	@Column(name = "doctor_read")
	public Integer getDoctorRead() {
		return doctorRead;
	}
	public void setDoctorRead(Integer doctorRead) {
		this.doctorRead = doctorRead;
	}
	@Column(name = "patient_read")
	public Integer getPatientRead() {
		return patientRead;
	}
	public void setPatientRead(Integer patientRead) {
		this.patientRead = patientRead;
	}
	// 设定JSON序列化时的日期格式
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	// 设定JSON序列化时的日期格式
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getEndTime() {
		return endTime;
	}
	public void setEndTime(Date endTime) {
		this.endTime = endTime;
	}
	public String getSymptoms() {
		return symptoms;
	}
	public void setSymptoms(String symptoms) {
		this.symptoms = symptoms;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
	public Integer getSex() {
		return sex;
	}
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	@Transient
	public String getDoctorName() {
		return doctorName;
	}
	public void setDoctorName(String doctorName) {
		this.doctorName = doctorName;
	}
	public Long getGuidance() {
		return guidance;
	}
	public void setGuidance(Long guidance) {
		this.guidance = guidance;
	}
	public String getStartMsgId() {
		return startMsgId;
	}
	public void setStartMsgId(String startMsgId) {
		this.startMsgId = startMsgId;
	}
	public String getEndMsgId() {
		return endMsgId;
	}
	public void setEndMsgId(String endMsgId) {
		this.endMsgId = endMsgId;
	}
	public String getEndOperator() {
		return endOperator;
	}
	public void setEndOperator(String endOperator) {
		this.endOperator = endOperator;
	}
	public Integer getEndType() {
		return endType;
	}
	public void setEndType(Integer endType) {
		this.endType = endType;
	}
	public String getRelationCode() {
		return relationCode;
	}
	public void setRelationCode(String relationCode) {
		this.relationCode = relationCode;
	}
}

+ 100 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeamDoctor.java

@ -0,0 +1,100 @@
package com.yihu.wlyy.entity.consult;
import com.yihu.wlyy.entity.IdEntity;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 三师咨询转接给的医生记录对象
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_team_doctor")
public class ConsultTeamDoctor extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -7967961374207943953L;
	// 三师咨询标识
	private String consult;
	// 医生标
	private String from;
	// 转出医生姓名
	private String fromName;
	// 替回答的医生标识
	private String to;
	// 是否有回复过
	private int reply;
	// 咨询时间
	private Date czrq;
	// 作废标识,1正常,0作废
	private String del;
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	@Column(name = "form_doctor")
	public String getFrom() {
		return from;
	}
	public void setFrom(String from) {
		this.from = from;
	}
	@Column(name = "form_doctor_name")
	public String getFromName() {
		return fromName;
	}
	public void setFromName(String fromName) {
		this.fromName = fromName;
	}
	@Column(name = "to_doctor")
	public String getTo() {
		return to;
	}
	public void setTo(String to) {
		this.to = to;
	}
	public int getReply() {
		return reply;
	}
	public void setReply(int reply) {
		this.reply = reply;
	}
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 125 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeamLog.java

@ -0,0 +1,125 @@
package com.yihu.wlyy.entity.consult;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 三师咨询日志表
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_consult_team_log")
public class ConsultTeamLog extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 3678031205910236039L;
	// 咨询标识
	private String consult;
	// 回复医生标识
	private String doctor;
	// 回复医生姓名
	private String doctorName;
	// 回复人头像
	private String photo;
	// 回复内容/追问内容
	private String content;
	// 类型,0问,1回复,2追问,3评价
	private Integer type;
	// 记录类型:1文字,2图片,3语音
	private Integer chatType;
	// 操作时间
	private Date czrq;
	// 作废标识,1正常,0作废
	private String del;
	public ConsultTeamLog() {
	}
	public String getConsult() {
		return consult;
	}
	public void setConsult(String consult) {
		this.consult = consult;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	@Column(name = "chat_type")
	public Integer getChatType() {
		return chatType;
	}
	public void setChatType(Integer chatType) {
		this.chatType = chatType;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public String getDoctor() {
		return doctor;
	}
	public void setDoctor(String doctor) {
		this.doctor = doctor;
	}
	@Column(name = "doctor_name")
	public String getDoctorName() {
		return doctorName;
	}
	public void setDoctorName(String doctorName) {
		this.doctorName = doctorName;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 77 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/Evaluate.java

@ -0,0 +1,77 @@
package com.yihu.wlyy.entity.consult;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by 卓 on 2017/5/10.
 */
@Entity
@Table(name = "wlyy_evaluate")
public class Evaluate extends IdEntity {
    private static final long serialVersionUID = -161924234234189L;
    private String doctor;//被评价的医生
    private String consult;//咨询
    private String patient;//评价人
    private Integer score;//分数
    private Integer type;//1、实名,2、匿名
    private Integer evaluateType;//评价种类0、实名评价, 1、专业能力,2、服务态度,3、回复速度
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getConsult() {
        return consult;
    }
    public void setConsult(String consult) {
        this.consult = consult;
    }
    public Integer getScore() {
        return score;
    }
    public void setScore(Integer score) {
        this.score = score;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getEvaluateType() {
        return evaluateType;
    }
    public void setEvaluateType(Integer evaluateType) {
        this.evaluateType = evaluateType;
    }
}

+ 57 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/EvaluateLabel.java

@ -0,0 +1,57 @@
package com.yihu.wlyy.entity.consult;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by 卓 on 2017/5/10.
 */
@Entity
@Table(name = "wlyy_evaluate_label")
public class EvaluateLabel extends IdEntity {
    private static final long serialVersionUID = -161943424234234189L;
    private String doctor; //被评价的医生
    private String patient; //被评价的患者
    private String consult; //咨询code
    private String content;//标签内容
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getConsult() {
        return consult;
    }
    public void setConsult(String consult) {
        this.consult = consult;
    }
}

+ 56 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/consult/EvaluateScore.java

@ -0,0 +1,56 @@
package com.yihu.wlyy.entity.consult;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by 卓 on 2017/5/10.
 */
@Entity
@Table(name = "wlyy_evaluate_score")
public class EvaluateScore extends IdEntity {
    private static final long serialVersionUID = -16123422342334189L;
    private String doctor;//被评价的医生
    private String consult;//咨询
    private Double score;//分数
    private String remark;//备注
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    public String getConsult() {
        return consult;
    }
    public void setConsult(String consult) {
        this.consult = consult;
    }
    public Double getScore() {
        return score;
    }
    public void setScore(Double score) {
        this.score = score;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

+ 914 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/demographic/DemographicInfo.java

@ -0,0 +1,914 @@
package com.yihu.wlyy.entity.demographic;
import java.sql.Timestamp;
import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
 * 人口学信息。所有数据均从基卫数据库导出,数据库的表名与基卫一致。
 */
@Entity
@Table(name = "tbl_basic")
public class DemographicInfo implements java.io.Serializable {
	private Integer personid;//人员编码
	private String persontype;//人员类型c2n(Persontype)
	private String name;//姓名
	private String oldname;//曾用名
	private String aliasname;//别名
	private String sex;//性别c2n(sex)
	private Timestamp birth;//出生年月
	private Timestamp doorbirth;//公安户籍出生年月
	private String cardid;//身份证号码  18
	private String nation;//民族c2n(Nation)
	private String edudegree;//文化程度c2n(Edudegree)
	private String work;//职业c2n(Work)
	private String party;//政治面貌c2n(Party)
	private String doorprop;//户口性质c2n(Whouse)
	private String farmer;//是否农户c2n(Whether)
	private String aviso;//是否重点通报对象
	private String publicize;//是否宣传访视重点
	private String hortation;//是否应奖励对象
	private String checktype;//是否三查对象
	private String single;//是否独生子女
	private Integer workid;//工作单位编码
	private String dooraddress;//户籍地编码
	private String dooraddressinfo;//户籍地详细地址
	private String nowaddress;//现居住地编码
	private String nowaddressinfo;//现居住地详细地址
	private String doortel;//户籍地电话
	private String marrytype;//当前婚姻状况c2n(Marriage)
	private Timestamp marrychangedate;//婚姻变动日期
	private Integer mateid;//'配偶ID
	private String matename;//配偶姓名
	private String matecardid;//配偶身份证号码
	private Timestamp matebrith;//配偶出生年月
	private Integer fatherid;//父亲ID
	private String fathername;//父亲姓名
	private Integer materid;//母亲ID
	private String matername;//母亲姓名
	private Integer girlcount;//现有女孩数
	private Integer boycount;//现有男孩数
	private Integer operatorid;//登记操作员
	private String checkunit;//登记单位
	private Timestamp checkdate;//登记日期
	private Integer uoperatorid;//'修改操作员
	private String updateunit;//修改单位
	private Timestamp updatedate;//修改日期
	private Timestamp indate;//入库日期
	private Integer cancel;//注销表ID(迁出的时候写随机写一个数进去'
	private String memo;//备注
	private String persontel;//人员联系电话
	private Timestamp arrivedate;//来厦日期
	private Timestamp leavedate;//离籍日期
	private String conclass;//避孕方法c2n(ConClass)
	private String munitid;//主管单位id (当人员迁出或死亡的时候置为空)
	private String state;//是否有效1为有效,2为迁出,3为死亡,4为重复人口
	private String health;//健康状态
	private String relaparents;//与父母关系 Relaparents',
	private String matebwork;//配偶职业 Work
	private String workaddress;//配偶工作单位
	private String mateaddtel;//配偶户籍联系电话
	private Integer nowchilden;//现有孩数
	private Timestamp schildbirth;//最小孩子出生日期
	private Timestamp singlenodate;//领独子证时间
	private String isviolate;//是否违纪 Whether (0否,1是)
	private String ismatefarmer;// '配偶是否农户c2n(Whether)'
	private String workaddressid;//'配偶工作单位编码
	private String workname;//工作单位名称
	private Timestamp condate;//避孕日期
	private String contramemo;//避孕备注c2n(Contramemo)
	private String matedooradd;//配偶户籍地编码
	private String matedooraddinfo;//配偶户籍地详细地址
	private Timestamp fmarrydate;//初婚日期
	private String unitname;//配偶工作单位名称
	private String addtype;//人口增加类型(2出生,1迁入)
	private String zjlxdm;//
	private String qtzjhm;//
	private String fathercode;//
	private String gjdm;//
	private Timestamp dbdate;//
	private String mothercode;//
	private String familyhtype;//
	public DemographicInfo() {
	}
	public DemographicInfo(String persontype, String name, String oldname,
						   String aliasname, String sex, Timestamp birth, Timestamp doorbirth,
						   String cardid, String nation, String edudegree, String work,
						   String party, String doorprop, String farmer, String aviso,
						   String publicize, String hortation, String checktype,
						   String single, Integer workid, String dooraddress,
						   String dooraddressinfo, String nowaddress, String nowaddressinfo,
						   String doortel, String marrytype, Timestamp marrychangedate,
						   Integer mateid, String matename, String matecardid,
						   Timestamp matebrith, Integer fatherid, String fathername,
						   Integer materid, String matername, Integer girlcount,
						   Integer boycount, Integer operatorid, String checkunit,
						   Timestamp checkdate, Integer uoperatorid, String updateunit,
						   Timestamp updatedate, Timestamp indate, Integer cancel,
						   String memo, String persontel, Timestamp arrivedate,
						   Timestamp leavedate, String conclass, String munitid, String state,
						   String health, String relaparents, String matebwork,
						   String workaddress, String mateaddtel, Integer nowchilden,
						   Timestamp schildbirth, Timestamp singlenodate, String isviolate,
						   String ismatefarmer, String workaddressid, String workname,
						   Timestamp condate, String contramemo, String matedooradd,
						   String matedooraddinfo, Timestamp fmarrydate, String unitname,
						   String addtype, String zjlxdm, String qtzjhm, String fathercode,
						   String gjdm, Timestamp dbdate, String mothercode, String familyhtype) {
		this.persontype = persontype;
		this.name = name;
		this.oldname = oldname;
		this.aliasname = aliasname;
		this.sex = sex;
		this.birth = birth;
		this.doorbirth = doorbirth;
		this.cardid = cardid;
		this.nation = nation;
		this.edudegree = edudegree;
		this.work = work;
		this.party = party;
		this.doorprop = doorprop;
		this.farmer = farmer;
		this.aviso = aviso;
		this.publicize = publicize;
		this.hortation = hortation;
		this.checktype = checktype;
		this.single = single;
		this.workid = workid;
		this.dooraddress = dooraddress;
		this.dooraddressinfo = dooraddressinfo;
		this.nowaddress = nowaddress;
		this.nowaddressinfo = nowaddressinfo;
		this.doortel = doortel;
		this.marrytype = marrytype;
		this.marrychangedate = marrychangedate;
		this.mateid = mateid;
		this.matename = matename;
		this.matecardid = matecardid;
		this.matebrith = matebrith;
		this.fatherid = fatherid;
		this.fathername = fathername;
		this.materid = materid;
		this.matername = matername;
		this.girlcount = girlcount;
		this.boycount = boycount;
		this.operatorid = operatorid;
		this.checkunit = checkunit;
		this.checkdate = checkdate;
		this.uoperatorid = uoperatorid;
		this.updateunit = updateunit;
		this.updatedate = updatedate;
		this.indate = indate;
		this.cancel = cancel;
		this.memo = memo;
		this.persontel = persontel;
		this.arrivedate = arrivedate;
		this.leavedate = leavedate;
		this.conclass = conclass;
		this.munitid = munitid;
		this.state = state;
		this.health = health;
		this.relaparents = relaparents;
		this.matebwork = matebwork;
		this.workaddress = workaddress;
		this.mateaddtel = mateaddtel;
		this.nowchilden = nowchilden;
		this.schildbirth = schildbirth;
		this.singlenodate = singlenodate;
		this.isviolate = isviolate;
		this.ismatefarmer = ismatefarmer;
		this.workaddressid = workaddressid;
		this.workname = workname;
		this.condate = condate;
		this.contramemo = contramemo;
		this.matedooradd = matedooradd;
		this.matedooraddinfo = matedooraddinfo;
		this.fmarrydate = fmarrydate;
		this.unitname = unitname;
		this.addtype = addtype;
		this.zjlxdm = zjlxdm;
		this.qtzjhm = qtzjhm;
		this.fathercode = fathercode;
		this.gjdm = gjdm;
		this.dbdate = dbdate;
		this.mothercode = mothercode;
		this.familyhtype = familyhtype;
	}
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "PERSONID", unique = true, nullable = false)
	public Integer getPersonid() {
		return this.personid;
	}
	public void setPersonid(Integer personid) {
		this.personid = personid;
	}
	@Column(name = "PERSONTYPE", length = 1)
	public String getPersontype() {
		return this.persontype;
	}
	public void setPersontype(String persontype) {
		this.persontype = persontype;
	}
	@Column(name = "NAME", length = 20)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "OLDNAME", length = 20)
	public String getOldname() {
		return this.oldname;
	}
	public void setOldname(String oldname) {
		this.oldname = oldname;
	}
	@Column(name = "ALIASNAME", length = 20)
	public String getAliasname() {
		return this.aliasname;
	}
	public void setAliasname(String aliasname) {
		this.aliasname = aliasname;
	}
	@Column(name = "SEX", length = 1)
	public String getSex() {
		return this.sex;
	}
	public void setSex(String sex) {
		this.sex = sex;
	}
	@Column(name = "BIRTH", length = 0)
	public Timestamp getBirth() {
		return this.birth;
	}
	public void setBirth(Timestamp birth) {
		this.birth = birth;
	}
	@Column(name = "DOORBIRTH", length = 0)
	public Timestamp getDoorbirth() {
		return this.doorbirth;
	}
	public void setDoorbirth(Timestamp doorbirth) {
		this.doorbirth = doorbirth;
	}
	@Column(name = "CARDID", length = 18)
	public String getCardid() {
		return this.cardid;
	}
	public void setCardid(String cardid) {
		this.cardid = cardid;
	}
	@Column(name = "NATION", length = 2)
	public String getNation() {
		return this.nation;
	}
	public void setNation(String nation) {
		this.nation = nation;
	}
	@Column(name = "EDUDEGREE", length = 2)
	public String getEdudegree() {
		return this.edudegree;
	}
	public void setEdudegree(String edudegree) {
		this.edudegree = edudegree;
	}
	@Column(name = "WORK", length = 3)
	public String getWork() {
		return this.work;
	}
	public void setWork(String work) {
		this.work = work;
	}
	@Column(name = "PARTY", length = 2)
	public String getParty() {
		return this.party;
	}
	public void setParty(String party) {
		this.party = party;
	}
	@Column(name = "DOORPROP", length = 2)
	public String getDoorprop() {
		return this.doorprop;
	}
	public void setDoorprop(String doorprop) {
		this.doorprop = doorprop;
	}
	@Column(name = "FARMER", length = 1)
	public String getFarmer() {
		return this.farmer;
	}
	public void setFarmer(String farmer) {
		this.farmer = farmer;
	}
	@Column(name = "AVISO", length = 1)
	public String getAviso() {
		return this.aviso;
	}
	public void setAviso(String aviso) {
		this.aviso = aviso;
	}
	@Column(name = "PUBLICIZE", length = 1)
	public String getPublicize() {
		return this.publicize;
	}
	public void setPublicize(String publicize) {
		this.publicize = publicize;
	}
	@Column(name = "HORTATION", length = 1)
	public String getHortation() {
		return this.hortation;
	}
	public void setHortation(String hortation) {
		this.hortation = hortation;
	}
	@Column(name = "CHECKTYPE", length = 1)
	public String getChecktype() {
		return this.checktype;
	}
	public void setChecktype(String checktype) {
		this.checktype = checktype;
	}
	@Column(name = "SINGLE", length = 1)
	public String getSingle() {
		return this.single;
	}
	public void setSingle(String single) {
		this.single = single;
	}
	@Column(name = "WORKID")
	public Integer getWorkid() {
		return this.workid;
	}
	public void setWorkid(Integer workid) {
		this.workid = workid;
	}
	@Column(name = "DOORADDRESS", length = 12)
	public String getDooraddress() {
		return this.dooraddress;
	}
	public void setDooraddress(String dooraddress) {
		this.dooraddress = dooraddress;
	}
	@Column(name = "DOORADDRESSINFO", length = 100)
	public String getDooraddressinfo() {
		return this.dooraddressinfo;
	}
	public void setDooraddressinfo(String dooraddressinfo) {
		this.dooraddressinfo = dooraddressinfo;
	}
	@Column(name = "NOWADDRESS", length = 12)
	public String getNowaddress() {
		return this.nowaddress;
	}
	public void setNowaddress(String nowaddress) {
		this.nowaddress = nowaddress;
	}
	@Column(name = "NOWADDRESSINFO", length = 100)
	public String getNowaddressinfo() {
		return this.nowaddressinfo;
	}
	public void setNowaddressinfo(String nowaddressinfo) {
		this.nowaddressinfo = nowaddressinfo;
	}
	@Column(name = "DOORTEL", length = 60)
	public String getDoortel() {
		return this.doortel;
	}
	public void setDoortel(String doortel) {
		this.doortel = doortel;
	}
	@Column(name = "MARRYTYPE", length = 2)
	public String getMarrytype() {
		return this.marrytype;
	}
	public void setMarrytype(String marrytype) {
		this.marrytype = marrytype;
	}
	@Column(name = "MARRYCHANGEDATE", length = 0)
	public Timestamp getMarrychangedate() {
		return this.marrychangedate;
	}
	public void setMarrychangedate(Timestamp marrychangedate) {
		this.marrychangedate = marrychangedate;
	}
	@Column(name = "MATEID")
	public Integer getMateid() {
		return this.mateid;
	}
	public void setMateid(Integer mateid) {
		this.mateid = mateid;
	}
	@Column(name = "MATENAME", length = 30)
	public String getMatename() {
		return this.matename;
	}
	public void setMatename(String matename) {
		this.matename = matename;
	}
	@Column(name = "MATECARDID", length = 18)
	public String getMatecardid() {
		return this.matecardid;
	}
	public void setMatecardid(String matecardid) {
		this.matecardid = matecardid;
	}
	@Column(name = "MATEBRITH", length = 0)
	public Timestamp getMatebrith() {
		return this.matebrith;
	}
	public void setMatebrith(Timestamp matebrith) {
		this.matebrith = matebrith;
	}
	@Column(name = "FATHERID")
	public Integer getFatherid() {
		return this.fatherid;
	}
	public void setFatherid(Integer fatherid) {
		this.fatherid = fatherid;
	}
	@Column(name = "FATHERNAME", length = 20)
	public String getFathername() {
		return this.fathername;
	}
	public void setFathername(String fathername) {
		this.fathername = fathername;
	}
	@Column(name = "MATERID")
	public Integer getMaterid() {
		return this.materid;
	}
	public void setMaterid(Integer materid) {
		this.materid = materid;
	}
	@Column(name = "MATERNAME", length = 20)
	public String getMatername() {
		return this.matername;
	}
	public void setMatername(String matername) {
		this.matername = matername;
	}
	@Column(name = "GIRLCOUNT")
	public Integer getGirlcount() {
		return this.girlcount;
	}
	public void setGirlcount(Integer girlcount) {
		this.girlcount = girlcount;
	}
	@Column(name = "BOYCOUNT")
	public Integer getBoycount() {
		return this.boycount;
	}
	public void setBoycount(Integer boycount) {
		this.boycount = boycount;
	}
	@Column(name = "OPERATORID")
	public Integer getOperatorid() {
		return this.operatorid;
	}
	public void setOperatorid(Integer operatorid) {
		this.operatorid = operatorid;
	}
	@Column(name = "CHECKUNIT", length = 12)
	public String getCheckunit() {
		return this.checkunit;
	}
	public void setCheckunit(String checkunit) {
		this.checkunit = checkunit;
	}
	@Column(name = "CHECKDATE", length = 0)
	public Timestamp getCheckdate() {
		return this.checkdate;
	}
	public void setCheckdate(Timestamp checkdate) {
		this.checkdate = checkdate;
	}
	@Column(name = "UOPERATORID")
	public Integer getUoperatorid() {
		return this.uoperatorid;
	}
	public void setUoperatorid(Integer uoperatorid) {
		this.uoperatorid = uoperatorid;
	}
	@Column(name = "UPDATEUNIT", length = 12)
	public String getUpdateunit() {
		return this.updateunit;
	}
	public void setUpdateunit(String updateunit) {
		this.updateunit = updateunit;
	}
	@Column(name = "UPDATEDATE", length = 0)
	public Timestamp getUpdatedate() {
		return this.updatedate;
	}
	public void setUpdatedate(Timestamp updatedate) {
		this.updatedate = updatedate;
	}
	@Column(name = "INDATE", length = 0)
	public Timestamp getIndate() {
		return this.indate;
	}
	public void setIndate(Timestamp indate) {
		this.indate = indate;
	}
	@Column(name = "CANCEL")
	public Integer getCancel() {
		return this.cancel;
	}
	public void setCancel(Integer cancel) {
		this.cancel = cancel;
	}
	@Column(name = "MEMO", length = 210)
	public String getMemo() {
		return this.memo;
	}
	public void setMemo(String memo) {
		this.memo = memo;
	}
	@Column(name = "PERSONTEL", length = 60)
	public String getPersontel() {
		return this.persontel;
	}
	public void setPersontel(String persontel) {
		this.persontel = persontel;
	}
	@Column(name = "ARRIVEDATE", length = 0)
	public Timestamp getArrivedate() {
		return this.arrivedate;
	}
	public void setArrivedate(Timestamp arrivedate) {
		this.arrivedate = arrivedate;
	}
	@Column(name = "LEAVEDATE", length = 0)
	public Timestamp getLeavedate() {
		return this.leavedate;
	}
	public void setLeavedate(Timestamp leavedate) {
		this.leavedate = leavedate;
	}
	@Column(name = "CONCLASS", length = 3)
	public String getConclass() {
		return this.conclass;
	}
	public void setConclass(String conclass) {
		this.conclass = conclass;
	}
	@Column(name = "MUNITID", length = 12)
	public String getMunitid() {
		return this.munitid;
	}
	public void setMunitid(String munitid) {
		this.munitid = munitid;
	}
	@Column(name = "STATE", length = 1)
	public String getState() {
		return this.state;
	}
	public void setState(String state) {
		this.state = state;
	}
	@Column(name = "HEALTH", length = 2)
	public String getHealth() {
		return this.health;
	}
	public void setHealth(String health) {
		this.health = health;
	}
	@Column(name = "RELAPARENTS", length = 2)
	public String getRelaparents() {
		return this.relaparents;
	}
	public void setRelaparents(String relaparents) {
		this.relaparents = relaparents;
	}
	@Column(name = "MATEBWORK", length = 3)
	public String getMatebwork() {
		return this.matebwork;
	}
	public void setMatebwork(String matebwork) {
		this.matebwork = matebwork;
	}
	@Column(name = "WORKADDRESS", length = 100)
	public String getWorkaddress() {
		return this.workaddress;
	}
	public void setWorkaddress(String workaddress) {
		this.workaddress = workaddress;
	}
	@Column(name = "MATEADDTEL", length = 60)
	public String getMateaddtel() {
		return this.mateaddtel;
	}
	public void setMateaddtel(String mateaddtel) {
		this.mateaddtel = mateaddtel;
	}
	@Column(name = "NOWCHILDEN")
	public Integer getNowchilden() {
		return this.nowchilden;
	}
	public void setNowchilden(Integer nowchilden) {
		this.nowchilden = nowchilden;
	}
	@Column(name = "SCHILDBIRTH", length = 0)
	public Timestamp getSchildbirth() {
		return this.schildbirth;
	}
	public void setSchildbirth(Timestamp schildbirth) {
		this.schildbirth = schildbirth;
	}
	@Column(name = "SINGLENODATE", length = 0)
	public Timestamp getSinglenodate() {
		return this.singlenodate;
	}
	public void setSinglenodate(Timestamp singlenodate) {
		this.singlenodate = singlenodate;
	}
	@Column(name = "ISVIOLATE", length = 1)
	public String getIsviolate() {
		return this.isviolate;
	}
	public void setIsviolate(String isviolate) {
		this.isviolate = isviolate;
	}
	@Column(name = "ISMATEFARMER", length = 2)
	public String getIsmatefarmer() {
		return this.ismatefarmer;
	}
	public void setIsmatefarmer(String ismatefarmer) {
		this.ismatefarmer = ismatefarmer;
	}
	@Column(name = "WORKADDRESSID", length = 12)
	public String getWorkaddressid() {
		return this.workaddressid;
	}
	public void setWorkaddressid(String workaddressid) {
		this.workaddressid = workaddressid;
	}
	@Column(name = "WORKNAME", length = 100)
	public String getWorkname() {
		return this.workname;
	}
	public void setWorkname(String workname) {
		this.workname = workname;
	}
	@Column(name = "CONDATE", length = 0)
	public Timestamp getCondate() {
		return this.condate;
	}
	public void setCondate(Timestamp condate) {
		this.condate = condate;
	}
	@Column(name = "CONTRAMEMO", length = 3)
	public String getContramemo() {
		return this.contramemo;
	}
	public void setContramemo(String contramemo) {
		this.contramemo = contramemo;
	}
	@Column(name = "MATEDOORADD", length = 12)
	public String getMatedooradd() {
		return this.matedooradd;
	}
	public void setMatedooradd(String matedooradd) {
		this.matedooradd = matedooradd;
	}
	@Column(name = "MATEDOORADDINFO", length = 100)
	public String getMatedooraddinfo() {
		return this.matedooraddinfo;
	}
	public void setMatedooraddinfo(String matedooraddinfo) {
		this.matedooraddinfo = matedooraddinfo;
	}
	@Column(name = "FMARRYDATE", length = 0)
	public Timestamp getFmarrydate() {
		return this.fmarrydate;
	}
	public void setFmarrydate(Timestamp fmarrydate) {
		this.fmarrydate = fmarrydate;
	}
	@Column(name = "UNITNAME", length = 100)
	public String getUnitname() {
		return this.unitname;
	}
	public void setUnitname(String unitname) {
		this.unitname = unitname;
	}
	@Column(name = "ADDTYPE", length = 1)
	public String getAddtype() {
		return this.addtype;
	}
	public void setAddtype(String addtype) {
		this.addtype = addtype;
	}
	@Column(name = "ZJLXDM", length = 3)
	public String getZjlxdm() {
		return this.zjlxdm;
	}
	public void setZjlxdm(String zjlxdm) {
		this.zjlxdm = zjlxdm;
	}
	@Column(name = "QTZJHM", length = 20)
	public String getQtzjhm() {
		return this.qtzjhm;
	}
	public void setQtzjhm(String qtzjhm) {
		this.qtzjhm = qtzjhm;
	}
	@Column(name = "FATHERCODE", length = 18)
	public String getFathercode() {
		return this.fathercode;
	}
	public void setFathercode(String fathercode) {
		this.fathercode = fathercode;
	}
	@Column(name = "GJDM", length = 3)
	public String getGjdm() {
		return this.gjdm;
	}
	public void setGjdm(String gjdm) {
		this.gjdm = gjdm;
	}
	@Column(name = "DBDATE", length = 0)
	public Timestamp getDbdate() {
		return this.dbdate;
	}
	public void setDbdate(Timestamp dbdate) {
		this.dbdate = dbdate;
	}
	@Column(name = "MOTHERCODE", length = 18)
	public String getMothercode() {
		return this.mothercode;
	}
	public void setMothercode(String mothercode) {
		this.mothercode = mothercode;
	}
	@Column(name = "FAMILYHTYPE", length = 2)
	public String getFamilyhtype() {
		return this.familyhtype;
	}
	public void setFamilyhtype(String familyhtype) {
		this.familyhtype = familyhtype;
	}
}

+ 299 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/demographic/FamilyInfo.java

@ -0,0 +1,299 @@
package com.yihu.wlyy.entity.demographic;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 * 人口学之家庭信息。此信息从基卫导出,表名与基卫一致。
 */
@Entity
@Table(name = "tbl_family")
public class FamilyInfo implements java.io.Serializable {
    private Integer id;//记录编码
    private String village;//居委会编码
    private String team;//组编码
    private String familyno;//家庭编号
    private String doornumb;//分户编号
    private String familyadd;//家庭地址
    private String doorno;//门牌号
    private String zipcode;//家庭邮编
    private String doorman;//房东姓名
    private String doormantel;//房东联系电话
    private Integer operatorid;//录入操作员
    private String checkunit;//登记单位
    private Timestamp checkdate;//登记日期
    private Timestamp intime;//入库时间
    private String cancelcau;//注销原因
    private Timestamp canceldate;//注销日期
    private String memo;//备注
    private Timestamp lastmodifydate;//末次修改时间
    private String ftype;//住房类型
    private Timestamp updatedate;//
    private Integer upoperater;//
    private String doorcardid;//房东身份证
    private Integer doorpersonid;//房东关联id
    private String persontype;//人口类型
    private String mzdzm;
    public FamilyInfo(String village, String team, String familyno,
                      String doornumb, String familyadd, String doorno, String zipcode,
                      String doorman, String doormantel, Integer operatorid,
                      String checkunit, Timestamp checkdate, Timestamp intime,
                      String cancelcau, Timestamp canceldate, String memo,
                      Timestamp lastmodifydate, String ftype, Timestamp updatedate,
                      Integer upoperater, String doorcardid, Integer doorpersonid,
                      String persontype, String mzdzm) {
        this.village = village;
        this.team = team;
        this.familyno = familyno;
        this.doornumb = doornumb;
        this.familyadd = familyadd;
        this.doorno = doorno;
        this.zipcode = zipcode;
        this.doorman = doorman;
        this.doormantel = doormantel;
        this.operatorid = operatorid;
        this.checkunit = checkunit;
        this.checkdate = checkdate;
        this.intime = intime;
        this.cancelcau = cancelcau;
        this.canceldate = canceldate;
        this.memo = memo;
        this.lastmodifydate = lastmodifydate;
        this.ftype = ftype;
        this.updatedate = updatedate;
        this.upoperater = upoperater;
        this.doorcardid = doorcardid;
        this.doorpersonid = doorpersonid;
        this.persontype = persontype;
        this.mzdzm = mzdzm;
    }
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "ID", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "VILLAGE", length = 12)
    public String getVillage() {
        return this.village;
    }
    public void setVillage(String village) {
        this.village = village;
    }
    @Column(name = "TEAM", length = 4)
    public String getTeam() {
        return this.team;
    }
    public void setTeam(String team) {
        this.team = team;
    }
    @Column(name = "FAMILYNO", length = 6)
    public String getFamilyno() {
        return this.familyno;
    }
    public void setFamilyno(String familyno) {
        this.familyno = familyno;
    }
    @Column(name = "DOORNUMB", length = 4)
    public String getDoornumb() {
        return this.doornumb;
    }
    public void setDoornumb(String doornumb) {
        this.doornumb = doornumb;
    }
    @Column(name = "FAMILYADD", length = 80)
    public String getFamilyadd() {
        return this.familyadd;
    }
    public void setFamilyadd(String familyadd) {
        this.familyadd = familyadd;
    }
    @Column(name = "DOORNO", length = 20)
    public String getDoorno() {
        return this.doorno;
    }
    public void setDoorno(String doorno) {
        this.doorno = doorno;
    }
    @Column(name = "ZIPCODE", length = 6)
    public String getZipcode() {
        return this.zipcode;
    }
    public void setZipcode(String zipcode) {
        this.zipcode = zipcode;
    }
    @Column(name = "DOORMAN", length = 50)
    public String getDoorman() {
        return this.doorman;
    }
    public void setDoorman(String doorman) {
        this.doorman = doorman;
    }
    @Column(name = "DOORMANTEL", length = 60)
    public String getDoormantel() {
        return this.doormantel;
    }
    public void setDoormantel(String doormantel) {
        this.doormantel = doormantel;
    }
    @Column(name = "OPERATORID")
    public Integer getOperatorid() {
        return this.operatorid;
    }
    public void setOperatorid(Integer operatorid) {
        this.operatorid = operatorid;
    }
    @Column(name = "CHECKUNIT", length = 12)
    public String getCheckunit() {
        return this.checkunit;
    }
    public void setCheckunit(String checkunit) {
        this.checkunit = checkunit;
    }
    @Column(name = "CHECKDATE", length = 0)
    public Timestamp getCheckdate() {
        return this.checkdate;
    }
    public void setCheckdate(Timestamp checkdate) {
        this.checkdate = checkdate;
    }
    @Column(name = "INTIME", length = 0)
    public Timestamp getIntime() {
        return this.intime;
    }
    public void setIntime(Timestamp intime) {
        this.intime = intime;
    }
    @Column(name = "CANCELCAU", length = 1)
    public String getCancelcau() {
        return this.cancelcau;
    }
    public void setCancelcau(String cancelcau) {
        this.cancelcau = cancelcau;
    }
    @Column(name = "CANCELDATE", length = 0)
    public Timestamp getCanceldate() {
        return this.canceldate;
    }
    public void setCanceldate(Timestamp canceldate) {
        this.canceldate = canceldate;
    }
    @Column(name = "MEMO", length = 210)
    public String getMemo() {
        return this.memo;
    }
    public void setMemo(String memo) {
        this.memo = memo;
    }
    @Column(name = "LASTMODIFYDATE", length = 0)
    public Timestamp getLastmodifydate() {
        return this.lastmodifydate;
    }
    public void setLastmodifydate(Timestamp lastmodifydate) {
        this.lastmodifydate = lastmodifydate;
    }
    @Column(name = "FTYPE", length = 1)
    public String getFtype() {
        return this.ftype;
    }
    public void setFtype(String ftype) {
        this.ftype = ftype;
    }
    @Column(name = "UPDATEDATE", length = 0)
    public Timestamp getUpdatedate() {
        return this.updatedate;
    }
    public void setUpdatedate(Timestamp updatedate) {
        this.updatedate = updatedate;
    }
    @Column(name = "UPOPERATER")
    public Integer getUpoperater() {
        return this.upoperater;
    }
    public void setUpoperater(Integer upoperater) {
        this.upoperater = upoperater;
    }
    @Column(name = "DOORCARDID", length = 18)
    public String getDoorcardid() {
        return this.doorcardid;
    }
    public void setDoorcardid(String doorcardid) {
        this.doorcardid = doorcardid;
    }
    @Column(name = "DOORPERSONID")
    public Integer getDoorpersonid() {
        return this.doorpersonid;
    }
    public void setDoorpersonid(Integer doorpersonid) {
        this.doorpersonid = doorpersonid;
    }
    @Column(name = "PERSONTYPE", length = 1)
    public String getPersontype() {
        return this.persontype;
    }
    public void setPersontype(String persontype) {
        this.persontype = persontype;
    }
    @Column(name = "MZDZM", length = 12)
    public String getMzdzm() {
        return this.mzdzm;
    }
    public void setMzdzm(String mzdzm) {
        this.mzdzm = mzdzm;
    }
}

+ 349 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/demographic/ResidenceInfo.java

@ -0,0 +1,349 @@
package com.yihu.wlyy.entity.demographic;
import java.sql.Timestamp;
import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
 * 户口信息。数据来自基卫,表名与基卫一致。
 */
@Entity
@Table(name = "tbl_personjoinfamilymid")
public class ResidenceInfo implements java.io.Serializable {
	private Integer id;//记录编码
	private Integer familystateid;//家庭户对应id
	private Integer personid;//人员编码
	private String property;//住户性质
	private String relaholder;//与户主关系
	private String personstate;//人户状态
	private Integer operatorid;//录入操作员
	private String checkunit;//登记单位
	private Timestamp checkdate;//登记时间
	private String leavecau;//出户原因
	private Timestamp canceldate;//出户日期
	private String memo;//备注
	private Integer familyinfoid;//户信息id对应表familystate
	private Timestamp indate;//入户日期
	private String state;//1为激活,2为未激活
	private String sn;//序号
	private String team;//组编码
	private String familyno;//家庭编号
	private String doornumb;//分户编号
	private String addno;//地址码(来源于:TEAM+FAMILYNO+DOORNUMB)
	private String persontype;//对应TBL_BASIC表的人员类型
	private String munittype;//管理单位类型(0为主管单位,1为协管单位
	private Integer manid;//对应TBLSYS_MANAGE表的记录ID
	private Timestamp startdate;//开始管理日期
	private Timestamp enddate;//结束管理日期
	private Integer jionid;//入户ID对应tblreg_move或tblhis_children表
	private String jiontype;//入户类型(01对应迁入,02对应出生)
	private Integer cancelid;//出户ID对应tblreg_move或tblreg_cancel表
	private String canceltype;//出户类型(03对应死亡,04对应迁出)
	public ResidenceInfo() {
	}
	public ResidenceInfo(Integer familystateid, Integer personid,
						 String property, String relaholder, String personstate,
						 Integer operatorid, String checkunit, Timestamp checkdate,
						 String leavecau, Timestamp canceldate, String memo,
						 Integer familyinfoid, Timestamp indate, String state, String sn,
						 String team, String familyno, String doornumb, String addno,
						 String persontype, String munittype, Integer manid,
						 Timestamp startdate, Timestamp enddate, Integer jionid,
						 String jiontype, Integer cancelid, String canceltype) {
		this.familystateid = familystateid;
		this.personid = personid;
		this.property = property;
		this.relaholder = relaholder;
		this.personstate = personstate;
		this.operatorid = operatorid;
		this.checkunit = checkunit;
		this.checkdate = checkdate;
		this.leavecau = leavecau;
		this.canceldate = canceldate;
		this.memo = memo;
		this.familyinfoid = familyinfoid;
		this.indate = indate;
		this.state = state;
		this.sn = sn;
		this.team = team;
		this.familyno = familyno;
		this.doornumb = doornumb;
		this.addno = addno;
		this.persontype = persontype;
		this.munittype = munittype;
		this.manid = manid;
		this.startdate = startdate;
		this.enddate = enddate;
		this.jionid = jionid;
		this.jiontype = jiontype;
		this.cancelid = cancelid;
		this.canceltype = canceltype;
	}
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "ID", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "FAMILYSTATEID")
	public Integer getFamilystateid() {
		return this.familystateid;
	}
	public void setFamilystateid(Integer familystateid) {
		this.familystateid = familystateid;
	}
	@Column(name = "PERSONID")
	public Integer getPersonid() {
		return this.personid;
	}
	public void setPersonid(Integer personid) {
		this.personid = personid;
	}
	@Column(name = "PROPERTY", length = 1)
	public String getProperty() {
		return this.property;
	}
	public void setProperty(String property) {
		this.property = property;
	}
	@Column(name = "RELAHOLDER", length = 2)
	public String getRelaholder() {
		return this.relaholder;
	}
	public void setRelaholder(String relaholder) {
		this.relaholder = relaholder;
	}
	@Column(name = "PERSONSTATE", length = 1)
	public String getPersonstate() {
		return this.personstate;
	}
	public void setPersonstate(String personstate) {
		this.personstate = personstate;
	}
	@Column(name = "OPERATORID")
	public Integer getOperatorid() {
		return this.operatorid;
	}
	public void setOperatorid(Integer operatorid) {
		this.operatorid = operatorid;
	}
	@Column(name = "CHECKUNIT", length = 12)
	public String getCheckunit() {
		return this.checkunit;
	}
	public void setCheckunit(String checkunit) {
		this.checkunit = checkunit;
	}
	@Column(name = "CHECKDATE", length = 0)
	public Timestamp getCheckdate() {
		return this.checkdate;
	}
	public void setCheckdate(Timestamp checkdate) {
		this.checkdate = checkdate;
	}
	@Column(name = "LEAVECAU", length = 1)
	public String getLeavecau() {
		return this.leavecau;
	}
	public void setLeavecau(String leavecau) {
		this.leavecau = leavecau;
	}
	@Column(name = "CANCELDATE", length = 0)
	public Timestamp getCanceldate() {
		return this.canceldate;
	}
	public void setCanceldate(Timestamp canceldate) {
		this.canceldate = canceldate;
	}
	@Column(name = "MEMO", length = 210)
	public String getMemo() {
		return this.memo;
	}
	public void setMemo(String memo) {
		this.memo = memo;
	}
	@Column(name = "FAMILYINFOID")
	public Integer getFamilyinfoid() {
		return this.familyinfoid;
	}
	public void setFamilyinfoid(Integer familyinfoid) {
		this.familyinfoid = familyinfoid;
	}
	@Column(name = "INDATE", length = 0)
	public Timestamp getIndate() {
		return this.indate;
	}
	public void setIndate(Timestamp indate) {
		this.indate = indate;
	}
	@Column(name = "STATE", length = 1)
	public String getState() {
		return this.state;
	}
	public void setState(String state) {
		this.state = state;
	}
	@Column(name = "SN", length = 4)
	public String getSn() {
		return this.sn;
	}
	public void setSn(String sn) {
		this.sn = sn;
	}
	@Column(name = "TEAM", length = 4)
	public String getTeam() {
		return this.team;
	}
	public void setTeam(String team) {
		this.team = team;
	}
	@Column(name = "FAMILYNO", length = 6)
	public String getFamilyno() {
		return this.familyno;
	}
	public void setFamilyno(String familyno) {
		this.familyno = familyno;
	}
	@Column(name = "DOORNUMB", length = 4)
	public String getDoornumb() {
		return this.doornumb;
	}
	public void setDoornumb(String doornumb) {
		this.doornumb = doornumb;
	}
	@Column(name = "ADDNO", length = 14)
	public String getAddno() {
		return this.addno;
	}
	public void setAddno(String addno) {
		this.addno = addno;
	}
	@Column(name = "PERSONTYPE", length = 1)
	public String getPersontype() {
		return this.persontype;
	}
	public void setPersontype(String persontype) {
		this.persontype = persontype;
	}
	@Column(name = "MUNITTYPE", length = 1)
	public String getMunittype() {
		return this.munittype;
	}
	public void setMunittype(String munittype) {
		this.munittype = munittype;
	}
	@Column(name = "MANID")
	public Integer getManid() {
		return this.manid;
	}
	public void setManid(Integer manid) {
		this.manid = manid;
	}
	@Column(name = "STARTDATE", length = 0)
	public Timestamp getStartdate() {
		return this.startdate;
	}
	public void setStartdate(Timestamp startdate) {
		this.startdate = startdate;
	}
	@Column(name = "ENDDATE", length = 0)
	public Timestamp getEnddate() {
		return this.enddate;
	}
	public void setEnddate(Timestamp enddate) {
		this.enddate = enddate;
	}
	@Column(name = "JIONID")
	public Integer getJionid() {
		return this.jionid;
	}
	public void setJionid(Integer jionid) {
		this.jionid = jionid;
	}
	@Column(name = "JIONTYPE", length = 2)
	public String getJiontype() {
		return this.jiontype;
	}
	public void setJiontype(String jiontype) {
		this.jiontype = jiontype;
	}
	@Column(name = "CANCELID")
	public Integer getCancelid() {
		return this.cancelid;
	}
	public void setCancelid(Integer cancelid) {
		this.cancelid = cancelid;
	}
	@Column(name = "CANCELTYPE", length = 2)
	public String getCanceltype() {
		return this.canceltype;
	}
	public void setCanceltype(String canceltype) {
		this.canceltype = canceltype;
	}
}

+ 109 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/Device.java

@ -0,0 +1,109 @@
package com.yihu.wlyy.entity.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 设备列表
 */
@Entity
@Table(name = "dm_device")
public class Device extends IdEntity {
	private String categoryCode;
	private String photo;
	private String brands;
	private String model;
	private String isMultiUser;
	private String multiUser;
	private String name;
	private Date czrq;
	private String del;
	@Column(name="category_code")
	public String getCategoryCode() {
		return categoryCode;
	}
	public void setCategoryCode(String categoryCode) {
		this.categoryCode = categoryCode;
	}
	@Column(name="photo")
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	@Column(name="brands")
	public String getBrands() {
		return brands;
	}
	public void setBrands(String brands) {
		this.brands = brands;
	}
	@Column(name="model")
	public String getModel() {
		return model;
	}
	public void setModel(String model) {
		this.model = model;
	}
	@Column(name="is_multi_user")
	public String getIsMultiUser() {
		return isMultiUser;
	}
	public void setIsMultiUser(String isMultiUser) {
		this.isMultiUser = isMultiUser;
	}
	@Column(name="multi_user")
	public String getMultiUser() {
		return multiUser;
	}
	public void setMultiUser(String multiUser) {
		this.multiUser = multiUser;
	}
	@Column(name="name")
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
	@Column(name="czrq")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	@Column(name="del")
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 57 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/DeviceCategory.java

@ -0,0 +1,57 @@
package com.yihu.wlyy.entity.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 设备分类表
 */
@Entity
@Table(name = "dm_device_category")
public class DeviceCategory extends IdEntity {
	// 设备类型标识
	private String code;
	// 设备类型名称
	private String name;
	// 操作时间
	private Date czrq;
	private String del;
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 226 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/PatientBloodSugger.java

@ -0,0 +1,226 @@
package com.yihu.wlyy.entity.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import com.yihu.wlyy.health.entity.DevicePatientHealthIndex;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by Reece on 2017/5/11.
 */
@Entity
@Table(name = "wlyy_patient_blood_sugger")
public class PatientBloodSugger extends IdEntity {
    //    早餐前开始时间
    private String fastingStart;
    //    '早餐前截止时间'
    private String fastingEnd;
    //    '早餐后开始时间'
    private String afterBreakfastStart;
    //    '早餐后截止时间'
    private String afterBreakfastEnd;
    //    '午餐前开始时间'
    private String beforeLunchStart;
    //    '午餐前截止时间'
    private String beforeLunchEnd;
    //    '午餐后开始时间'
    private String afterLunchStart;
    //    '午餐后截止时间'
    private String afterLunchEnd;
    //    '晚餐前开始时间'
    private String beforeDinnerStart;
    //    '晚餐前截止时间'
    private String beforeDinnerEnd;
    //    '晚餐后开始时间'
    private String afterDinnerStart;
    //    '晚餐后截止时间'
    private String afterDinnerEnd;
    //    '睡前开始时间'
    private String beforeSleepStart;
    //    '睡前截止时间'
    private String beforeSleepEnd;
    //    '添加时间'
    private Date czrq;
    //    是否作废,1正常,0作废
    private int del;
    public PatientBloodSugger() {
    }
    @Column(name = "fasting_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getFastingStart() {
        return fastingStart;
    }
    public void setFastingStart(String fastingStart) {
        this.fastingStart = fastingStart;
    }
    @Column(name = "fasting_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getFastingEnd() {
        return fastingEnd;
    }
    public void setFastingEnd(String fastingEnd) {
        this.fastingEnd = fastingEnd;
    }
    @Column(name = "after_breakfast_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterBreakfastStart() {
        return afterBreakfastStart;
    }
    public void setAfterBreakfastStart(String afterBreakfastStart) {
        this.afterBreakfastStart = afterBreakfastStart;
    }
    @Column(name = "after_breakfast_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterBreakfastEnd() {
        return afterBreakfastEnd;
    }
    public void setAfterBreakfastEnd(String afterBreakfastEnd) {
        this.afterBreakfastEnd = afterBreakfastEnd;
    }
    @Column(name = "before_lunch_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeLunchStart() {
        return beforeLunchStart;
    }
    public void setBeforeLunchStart(String beforeLunchStart) {
        this.beforeLunchStart = beforeLunchStart;
    }
    @Column(name = "before_lunch_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeLunchEnd() {
        return beforeLunchEnd;
    }
    public void setBeforeLunchEnd(String beforeLunchEnd) {
        this.beforeLunchEnd = beforeLunchEnd;
    }
    @Column(name = "after_lunch_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterLunchStart() {
        return afterLunchStart;
    }
    public void setAfterLunchStart(String afterLunchStart) {
        this.afterLunchStart = afterLunchStart;
    }
    @Column(name = "after_lunch_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterLunchEnd() {
        return afterLunchEnd;
    }
    public void setAfterLunchEnd(String afterLunchEnd) {
        this.afterLunchEnd = afterLunchEnd;
    }
    @Column(name = "before_dinner_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeDinnerStart() {
        return beforeDinnerStart;
    }
    public void setBeforeDinnerStart(String beforeDinnerStart) {
        this.beforeDinnerStart = beforeDinnerStart;
    }
    @Column(name = "before_dinner_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeDinnerEnd() {
        return beforeDinnerEnd;
    }
    public void setBeforeDinnerEnd(String beforeDinnerEnd) {
        this.beforeDinnerEnd = beforeDinnerEnd;
    }
    @Column(name = "after_dinner_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterDinnerStart() {
        return afterDinnerStart;
    }
    public void setAfterDinnerStart(String afterDinnerStart) {
        this.afterDinnerStart = afterDinnerStart;
    }
    @Column(name = "after_dinner_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterDinnerEnd() {
        return afterDinnerEnd;
    }
    public void setAfterDinnerEnd(String afterDinnerEnd) {
        this.afterDinnerEnd = afterDinnerEnd;
    }
    @Column(name = "before_sleep_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeSleepStart() {
        return beforeSleepStart;
    }
    public void setBeforeSleepStart(String beforeSleepStart) {
        this.beforeSleepStart = beforeSleepStart;
    }
    @Column(name = "before_sleep_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeSleepEnd() {
        return beforeSleepEnd;
    }
    public void setBeforeSleepEnd(String beforeSleepEnd) {
        this.beforeSleepEnd = beforeSleepEnd;
    }
    @Column(name = "czrq")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
    public int getDel() {
        return del;
    }
    public void setDel(int del) {
        this.del = del;
    }
}

+ 152 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/PatientDevice.java

@ -0,0 +1,152 @@
package com.yihu.wlyy.entity.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "wlyy_patient_device")
public class PatientDevice extends IdEntity {
	// 设备ID
	private Long deviceId;
	// 设备标识
	private String deviceSn;
	// 设备名称
	private String deviceName;
	// 用户code
	private String user;
	// 设备类型标识
	private String categoryCode;
	// 用户类型标准 -1代表单用户
	private String userType;
	// 用户身份证
	private String userIdcard;
	// 操作医生代码
	private String doctor;
	private String agent;//代绑人代码(家人)
	// 操作时间
	private Date czrq;
	///**
	// * 是否有效
	// * 1-已删除绑定
	// * 0-正常绑定
	// */
	//private int del;
	///**
	// * 删除人CODE
	// */
	//private String delUser;
    //
	//@Column(name="del_user")
	//public String getDelUser() {
	//	return delUser;
	//}
    //
	//public void setDelUser(String delUser) {
	//	this.delUser = delUser;
	//}
    //
	//public int getDel() {
	//	return del;
	//}
    //
	//public void setDel(int del) {
	//	this.del = del;
	//}
	@Column(name="device_id")
	public Long getDeviceId() {
		return deviceId;
	}
	public void setDeviceId(Long deviceId) {
		this.deviceId = deviceId;
	}
	@Column(name="device_sn")
	public String getDeviceSn() {
		return deviceSn;
	}
	public void setDeviceSn(String deviceSn) {
		this.deviceSn = deviceSn;
	}
	@Column(name="device_name")
	public String getDeviceName() {
		return deviceName;
	}
	public void setDeviceName(String deviceName) {
		this.deviceName = deviceName;
	}
	@Column(name="user")
	public String getUser() {
		return user;
	}
	public void setUser(String user) {
		this.user = user;
	}
	@Column(name="category_code")
	public String getCategoryCode() {
		return categoryCode;
	}
	public void setCategoryCode(String categoryCode) {
		this.categoryCode = categoryCode;
	}
	@Column(name="user_type")
	public String getUserType() {
		return userType;
	}
	public void setUserType(String userType) {
		this.userType = userType;
	}
	@Column(name="user_idcard")
	public String getUserIdcard() {
		return userIdcard;
	}
	public void setUserIdcard(String userIdcard) {
		this.userIdcard = userIdcard;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name="czrq")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	@Column(name="doctor")
	public String getDoctor() {
		return doctor;
	}
	public void setDoctor(String doctor) {
		this.doctor = doctor;
	}
	@Column(name="agent")
	public String getAgent() {
		return agent;
	}
	public void setAgent(String agent) {
		this.agent = agent;
	}
}

+ 248 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/device/PatientHealthTime.java

@ -0,0 +1,248 @@
package com.yihu.wlyy.entity.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import com.yihu.wlyy.health.entity.DevicePatientHealthIndex;
import javax.persistence.*;
import java.util.Date;
/**
 * Created by Reece on 2017/5/11.
 */
@Entity
@Table(name = "wlyy_patient_health_time")
public class PatientHealthTime extends IdEntity {
    //    居民
    private String user;
    //    设备sn码
    private String deviceSN;
    //    早餐前开始时间
    private String fastingStart;
    //    '早餐前截止时间'
    private String fastingEnd;
    //    '早餐后开始时间'
    private String afterBreakfastStart;
    //    '早餐后截止时间'
    private String afterBreakfastEnd;
    //    '午餐前开始时间'
    private String beforeLunchStart;
    //    '午餐前截止时间'
    private String beforeLunchEnd;
    //    '午餐后开始时间'
    private String afterLunchStart;
    //    '午餐后截止时间'
    private String afterLunchEnd;
    //    '晚餐前开始时间'
    private String beforeDinnerStart;
    //    '晚餐前截止时间'
    private String beforeDinnerEnd;
    //    '晚餐后开始时间'
    private String afterDinnerStart;
    //    '晚餐后截止时间'
    private String afterDinnerEnd;
    //    '睡前开始时间'
    private String beforeSleepStart;
    //    '睡前截止时间'
    private String beforeSleepEnd;
    //    '添加时间'
    private Date czrq;
    //    是否作废,1正常,0作废
    private int del;
    public PatientHealthTime() {
    }
    @Column(name = "user")
    public String getUser() {
        return user;
    }
    public void setUser(String user) {
        this.user = user;
    }
    @Column(name = "device_sn")
    public String getDeviceSN() {
        return deviceSN;
    }
    public void setDeviceSN(String deviceSN) {
        this.deviceSN = deviceSN;
    }
    @Column(name = "fasting_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getFastingStart() {
        return fastingStart;
    }
    public void setFastingStart(String fastingStart) {
        this.fastingStart = fastingStart;
    }
    @Column(name = "fasting_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getFastingEnd() {
        return fastingEnd;
    }
    public void setFastingEnd(String fastingEnd) {
        this.fastingEnd = fastingEnd;
    }
    @Column(name = "after_breakfast_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterBreakfastStart() {
        return afterBreakfastStart;
    }
    public void setAfterBreakfastStart(String afterBreakfastStart) {
        this.afterBreakfastStart = afterBreakfastStart;
    }
    @Column(name = "after_breakfast_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterBreakfastEnd() {
        return afterBreakfastEnd;
    }
    public void setAfterBreakfastEnd(String afterBreakfastEnd) {
        this.afterBreakfastEnd = afterBreakfastEnd;
    }
    @Column(name = "before_lunch_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeLunchStart() {
        return beforeLunchStart;
    }
    public void setBeforeLunchStart(String beforeLunchStart) {
        this.beforeLunchStart = beforeLunchStart;
    }
    @Column(name = "before_lunch_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeLunchEnd() {
        return beforeLunchEnd;
    }
    public void setBeforeLunchEnd(String beforeLunchEnd) {
        this.beforeLunchEnd = beforeLunchEnd;
    }
    @Column(name = "after_lunch_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterLunchStart() {
        return afterLunchStart;
    }
    public void setAfterLunchStart(String afterLunchStart) {
        this.afterLunchStart = afterLunchStart;
    }
    @Column(name = "after_lunch_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterLunchEnd() {
        return afterLunchEnd;
    }
    public void setAfterLunchEnd(String afterLunchEnd) {
        this.afterLunchEnd = afterLunchEnd;
    }
    @Column(name = "before_dinner_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeDinnerStart() {
        return beforeDinnerStart;
    }
    public void setBeforeDinnerStart(String beforeDinnerStart) {
        this.beforeDinnerStart = beforeDinnerStart;
    }
    @Column(name = "before_dinner_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeDinnerEnd() {
        return beforeDinnerEnd;
    }
    public void setBeforeDinnerEnd(String beforeDinnerEnd) {
        this.beforeDinnerEnd = beforeDinnerEnd;
    }
    @Column(name = "after_dinner_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterDinnerStart() {
        return afterDinnerStart;
    }
    public void setAfterDinnerStart(String afterDinnerStart) {
        this.afterDinnerStart = afterDinnerStart;
    }
    @Column(name = "after_dinner_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getAfterDinnerEnd() {
        return afterDinnerEnd;
    }
    public void setAfterDinnerEnd(String afterDinnerEnd) {
        this.afterDinnerEnd = afterDinnerEnd;
    }
    @Column(name = "before_sleep_start")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeSleepStart() {
        return beforeSleepStart;
    }
    public void setBeforeSleepStart(String beforeSleepStart) {
        this.beforeSleepStart = beforeSleepStart;
    }
    @Column(name = "before_sleep_end")
    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+08:00")
    public String getBeforeSleepEnd() {
        return beforeSleepEnd;
    }
    public void setBeforeSleepEnd(String beforeSleepEnd) {
        this.beforeSleepEnd = beforeSleepEnd;
    }
    @Column(name = "czrq")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
    public int getDel() {
        return del;
    }
    public void setDel(int del) {
        this.del = del;
    }
}

+ 46 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/dict/Disease.java

@ -0,0 +1,46 @@
package com.yihu.wlyy.entity.dict;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 疾病字典项
 *
 * @author George
 */
@Entity
@Table(name = "wlyy_disease")
public class Disease extends IdEntity {
	private static final long serialVersionUID = 7011816488798083794L;
	private String code;// 疾病标识
	private String name;// 疾病名称
	private String del;// 作废标识,1正常,0删除
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

+ 0 - 0
patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/entity/dict/DmDrugsGroup.java


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů