Преглед на файлове

Merge branch 'dev/triage20200319_shaoyifu' into innerDevelop

gaodm преди 5 години
родител
ревизия
85de277de7
променени са 82 файла, в които са добавени 3818 реда и са изтрити 301 реда
  1. 59 43
      config-server/src/main/resources/shared/mrman-service-dev.yml
  2. 59 43
      config-server/src/main/resources/shared/mrman-service-local.yml
  3. 59 43
      config-server/src/main/resources/shared/mrman-service-pre.yml
  4. 59 43
      config-server/src/main/resources/shared/mrman-service-pro.yml
  5. 59 42
      config-server/src/main/resources/shared/mrman-service-test.yml
  6. 4 4
      icss-service/src/test/java/com/diagbot/CodeGeneration.java
  7. 16 1
      mrman-service/pom.xml
  8. 2 1
      mrman-service/src/main/java/com/diagbot/MrmanServiceApplication.java
  9. 19 0
      mrman-service/src/main/java/com/diagbot/dto/ModuleMappingDTO.java
  10. 31 0
      mrman-service/src/main/java/com/diagbot/dto/QcAllInputcasesDTO.java
  11. 53 0
      mrman-service/src/main/java/com/diagbot/dto/QcCasesAllDTO.java
  12. 17 0
      mrman-service/src/main/java/com/diagbot/dto/QcCasesDTO.java
  13. 25 0
      mrman-service/src/main/java/com/diagbot/dto/QcHospitalInfoAllDTO.java
  14. 123 0
      mrman-service/src/main/java/com/diagbot/dto/QcInputcasesAllDTO.java
  15. 43 0
      mrman-service/src/main/java/com/diagbot/dto/QcInputcasesMappingDTO.java
  16. 157 0
      mrman-service/src/main/java/com/diagbot/entity/CasesNumber.java
  17. 133 0
      mrman-service/src/main/java/com/diagbot/entity/Mode.java
  18. 160 0
      mrman-service/src/main/java/com/diagbot/entity/ModelMapping.java
  19. 132 0
      mrman-service/src/main/java/com/diagbot/entity/QcCases.java
  20. 145 0
      mrman-service/src/main/java/com/diagbot/entity/QcCasesEntry.java
  21. 212 0
      mrman-service/src/main/java/com/diagbot/entity/QcHospitalInfo.java
  22. 313 0
      mrman-service/src/main/java/com/diagbot/entity/QcInputcases.java
  23. 172 0
      mrman-service/src/main/java/com/diagbot/entity/QcInputcasesMapping.java
  24. 72 0
      mrman-service/src/main/java/com/diagbot/facade/QcCasesFacade.java
  25. 35 0
      mrman-service/src/main/java/com/diagbot/facade/QcHospitalInfoFacade.java
  26. 451 0
      mrman-service/src/main/java/com/diagbot/facade/QcInputcasesFacade.java
  27. 11 0
      mrman-service/src/main/java/com/diagbot/mapper/ArRechomeMapper.java
  28. 16 0
      mrman-service/src/main/java/com/diagbot/mapper/CasesNumberMapper.java
  29. 16 0
      mrman-service/src/main/java/com/diagbot/mapper/ModeMapper.java
  30. 16 0
      mrman-service/src/main/java/com/diagbot/mapper/ModelMappingMapper.java
  31. 16 0
      mrman-service/src/main/java/com/diagbot/mapper/QcCasesEntryMapper.java
  32. 20 0
      mrman-service/src/main/java/com/diagbot/mapper/QcCasesMapper.java
  33. 16 0
      mrman-service/src/main/java/com/diagbot/mapper/QcHospitalInfoMapper.java
  34. 16 0
      mrman-service/src/main/java/com/diagbot/mapper/QcInputcasesMapper.java
  35. 22 0
      mrman-service/src/main/java/com/diagbot/mapper/QcInputcasesMappingMapper.java
  36. 13 0
      mrman-service/src/main/java/com/diagbot/service/ArRechomeService.java
  37. 2 0
      mrman-service/src/main/java/com/diagbot/service/BrRecdiagnoseService.java
  38. 2 0
      mrman-service/src/main/java/com/diagbot/service/BrRecinhosService.java
  39. 16 0
      mrman-service/src/main/java/com/diagbot/service/CasesNumberService.java
  40. 16 0
      mrman-service/src/main/java/com/diagbot/service/ModeService.java
  41. 16 0
      mrman-service/src/main/java/com/diagbot/service/ModelMappingService.java
  42. 2 0
      mrman-service/src/main/java/com/diagbot/service/MrMedicalrecordsService.java
  43. 2 0
      mrman-service/src/main/java/com/diagbot/service/MrMrcontentService.java
  44. 18 0
      mrman-service/src/main/java/com/diagbot/service/QcCasesEntryService.java
  45. 22 0
      mrman-service/src/main/java/com/diagbot/service/QcCasesService.java
  46. 16 0
      mrman-service/src/main/java/com/diagbot/service/QcHospitalInfoService.java
  47. 23 0
      mrman-service/src/main/java/com/diagbot/service/QcInputcasesMappingService.java
  48. 18 0
      mrman-service/src/main/java/com/diagbot/service/QcInputcasesService.java
  49. 13 0
      mrman-service/src/main/java/com/diagbot/service/impl/ArRechomeServiceImpl.java
  50. 20 0
      mrman-service/src/main/java/com/diagbot/service/impl/CasesNumberServiceImpl.java
  51. 20 0
      mrman-service/src/main/java/com/diagbot/service/impl/ModeServiceImpl.java
  52. 20 0
      mrman-service/src/main/java/com/diagbot/service/impl/ModelMappingServiceImpl.java
  53. 20 0
      mrman-service/src/main/java/com/diagbot/service/impl/QcCasesEntryServiceImpl.java
  54. 27 0
      mrman-service/src/main/java/com/diagbot/service/impl/QcCasesServiceImpl.java
  55. 20 0
      mrman-service/src/main/java/com/diagbot/service/impl/QcHospitalInfoServiceImpl.java
  56. 31 0
      mrman-service/src/main/java/com/diagbot/service/impl/QcInputcasesMappingServiceImpl.java
  57. 20 0
      mrman-service/src/main/java/com/diagbot/service/impl/QcInputcasesServiceImpl.java
  58. 11 0
      mrman-service/src/main/java/com/diagbot/vo/BAZYPageVO.java
  59. 30 0
      mrman-service/src/main/java/com/diagbot/vo/QcInputMappingSaveVO.java
  60. 19 0
      mrman-service/src/main/java/com/diagbot/vo/QcInputcasesAllVO.java
  61. 17 0
      mrman-service/src/main/java/com/diagbot/vo/QcInputcasesByIdVO.java
  62. 102 0
      mrman-service/src/main/java/com/diagbot/vo/QcInputcasesSaveVO.java
  63. 11 0
      mrman-service/src/main/java/com/diagbot/vo/QcInputcasesVO.java
  64. 11 1
      mrman-service/src/main/java/com/diagbot/web/ArRechomeController.java
  65. 0 20
      mrman-service/src/main/java/com/diagbot/web/BrRecdiagnoseController.java
  66. 0 20
      mrman-service/src/main/java/com/diagbot/web/BrRecinhosController.java
  67. 0 20
      mrman-service/src/main/java/com/diagbot/web/MrMedicalrecordsController.java
  68. 0 20
      mrman-service/src/main/java/com/diagbot/web/MrMrcontentController.java
  69. 53 0
      mrman-service/src/main/java/com/diagbot/web/QcCasesController.java
  70. 22 0
      mrman-service/src/main/java/com/diagbot/web/QcCasesEntryController.java
  71. 45 0
      mrman-service/src/main/java/com/diagbot/web/QcHospitalInfoController.java
  72. 122 0
      mrman-service/src/main/java/com/diagbot/web/QcInputcasesController.java
  73. 22 0
      mrman-service/src/main/java/com/diagbot/web/QcInputcasesMappingController.java
  74. 11 0
      mrman-service/src/main/resources/mapper/ArRechomeMapper.xml
  75. 19 0
      mrman-service/src/main/resources/mapper/CasesNumberMapper.xml
  76. 17 0
      mrman-service/src/main/resources/mapper/ModeMapper.xml
  77. 19 0
      mrman-service/src/main/resources/mapper/ModelMappingMapper.xml
  78. 18 0
      mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml
  79. 35 0
      mrman-service/src/main/resources/mapper/QcCasesMapper.xml
  80. 23 0
      mrman-service/src/main/resources/mapper/QcHospitalInfoMapper.xml
  81. 31 0
      mrman-service/src/main/resources/mapper/QcInputcasesMapper.xml
  82. 64 0
      mrman-service/src/main/resources/mapper/QcInputcasesMappingMapper.xml

+ 59 - 43
config-server/src/main/resources/shared/mrman-service-dev.yml

@@ -4,51 +4,67 @@ server:
 # 驱动配置信息
 spring:
   datasource:
-    druid:
-      driver-class-name: oracle.jdbc.driver.OracleDriver
-      platform: oracle
-      url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-      username: ETRACKMRQC
-      password: ETRACKMRQC
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+    dynamic:
+      primary: master
+      druid:
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: true
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库配置
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.236:3306/sys-qctest?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+          username: root
+          password: lantone
+          druid:
+            initial-size: 5
+        slave:
+          driver-class-name: oracle.jdbc.driver.OracleDriver
+          platform: oracle
+          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
+          username: ETRACKMRQC
+          password: ETRACKMRQC
+          druid:
+            initial-size: 5
 
   cloud:
     stream:

+ 59 - 43
config-server/src/main/resources/shared/mrman-service-local.yml

@@ -4,51 +4,67 @@ server:
 # 驱动配置信息
 spring:
   datasource:
-    druid:
-      driver-class-name: oracle.jdbc.driver.OracleDriver
-      platform: oracle
-      url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-      username: ETRACKMRQC
-      password: ETRACKMRQC
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+    dynamic:
+      primary: master
+      druid:
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: true
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库配置
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.236:3306/sys-mrqc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+          username: root
+          password: lantone
+          druid:
+            initial-size: 5
+        slave:
+          driver-class-name: oracle.jdbc.driver.OracleDriver
+          platform: oracle
+          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
+          username: ETRACKMRQC
+          password: ETRACKMRQC
+          druid:
+            initial-size: 5
 
   cloud:
     stream:

+ 59 - 43
config-server/src/main/resources/shared/mrman-service-pre.yml

@@ -4,51 +4,67 @@ server:
 # 驱动配置信息
 spring:
   datasource:
-    druid:
-      driver-class-name: oracle.jdbc.driver.OracleDriver
-      platform: oracle
-      url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-      username: ETRACKMRQC
-      password: ETRACKMRQC
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+    dynamic:
+      primary: master
+      druid:
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: true
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库配置
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.236:3306/sys-mrqc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+          username: root
+          password: lantone
+          druid:
+            initial-size: 5
+        slave:
+          driver-class-name: oracle.jdbc.driver.OracleDriver
+          platform: oracle
+          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
+          username: ETRACKMRQC
+          password: ETRACKMRQC
+          druid:
+            initial-size: 5
 
   cloud:
     stream:

+ 59 - 43
config-server/src/main/resources/shared/mrman-service-pro.yml

@@ -4,51 +4,67 @@ server:
 # 驱动配置信息
 spring:
   datasource:
-    druid:
-      driver-class-name: oracle.jdbc.driver.OracleDriver
-      platform: oracle
-      url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-      username: ETRACKMRQC
-      password: ETRACKMRQC
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+    dynamic:
+      primary: master
+      druid:
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: true
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库配置
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.236:3306/sys-mrqc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+          username: root
+          password: lantone
+          druid:
+            initial-size: 5
+        slave:
+          driver-class-name: oracle.jdbc.driver.OracleDriver
+          platform: oracle
+          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
+          username: ETRACKMRQC
+          password: ETRACKMRQC
+          druid:
+            initial-size: 5
 
   cloud:
     stream:

+ 59 - 42
config-server/src/main/resources/shared/mrman-service-test.yml

@@ -5,50 +5,67 @@ server:
 spring:
   datasource:
     druid:
-      driver-class-name: oracle.jdbc.driver.OracleDriver
-      platform: oracle
-      url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-      username: ETRACKMRQC
-      password: ETRACKMRQC
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+    dynamic:
+      primary: master
+      druid:
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: true
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库配置
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.236:3306/sys-mrqc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+          username: root
+          password: lantone
+          druid:
+            initial-size: 5
+        slave:
+          driver-class-name: oracle.jdbc.driver.OracleDriver
+          platform: oracle
+          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
+          username: ETRACKMRQC
+          password: ETRACKMRQC
+          druid:
+            initial-size: 5
 
   cloud:
     stream:

+ 4 - 4
icss-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -33,7 +33,7 @@ public class CodeGeneration {
         gc.setEnableCache(false);// XML 二级缓存
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhoutg");// 作者
+        gc.setAuthor("wangfeng");// 作者
 
         // 自定义文件命名,注意 %s 会自动填充表实体属性!
         gc.setControllerName("%sController");
@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-mrqc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setTablePrefix(new String[] { "icss_" });// 此处可以修改为您的表前缀
+        strategy.setTablePrefix(new String[] { "" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "icss_template_folder","icss_folder_mapping","icss_template_classify","icss_classify_mapping" }); // 需要生成的表
+        strategy.setInclude(new String[] {"qc_hospital_info","qc_inputcases"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

+ 16 - 1
mrman-service/pom.xml

@@ -89,12 +89,20 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
-        <!--database-->
+        <!--oracle-database-->
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>11.2.0.3</version>
         </dependency>
+
+        <!--mysql-database-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <!--security-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -149,6 +157,13 @@
             <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
+        <!--多数据源-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>

+ 2 - 1
mrman-service/src/main/java/com/diagbot/MrmanServiceApplication.java

@@ -1,5 +1,6 @@
 package com.diagbot;
 
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -20,7 +21,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @time: 2018/8/7 9:26
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class, DruidDataSourceAutoConfigure.class })
 @EnableEurekaClient
 @EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrixDashboard

+ 19 - 0
mrman-service/src/main/java/com/diagbot/dto/ModuleMappingDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2020/3/23 18:30
+ */
+@Getter
+@Setter
+public class ModuleMappingDTO {
+    private Long modeId;
+    private String name;
+    private List<String> text;
+}

+ 31 - 0
mrman-service/src/main/java/com/diagbot/dto/QcAllInputcasesDTO.java

@@ -0,0 +1,31 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2020/3/23 17:56
+ */
+@Getter
+@Setter
+public class QcAllInputcasesDTO {
+    private Long id;
+    private String isDeleted;
+    private Date gmtCreate;
+    private Date gmtModified;
+    private String creator;
+    private String modifier;
+    private String hospitalId;
+    private String hospitalName;
+    private String caseNumber;
+    private String isTag;
+    private List<ModuleMappingDTO> moduleMappingDTOList;
+    private List<QcInputcasesMappingDTO> qcInputcasesMapping;
+    private String remark;
+
+}

+ 53 - 0
mrman-service/src/main/java/com/diagbot/dto/QcCasesAllDTO.java

@@ -0,0 +1,53 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.QcCasesEntry;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-10 16:45
+ */
+@Setter
+@Getter
+public class QcCasesAllDTO {
+
+    private Long id;
+
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private List<QcCasesEntry> qcCasesEntry;
+}

+ 17 - 0
mrman-service/src/main/java/com/diagbot/dto/QcCasesDTO.java

@@ -0,0 +1,17 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-10 17:00
+ */
+@Getter
+@Setter
+public class QcCasesDTO  {
+    private Long Id ;
+    private String name;
+    private String remark;
+}

+ 25 - 0
mrman-service/src/main/java/com/diagbot/dto/QcHospitalInfoAllDTO.java

@@ -0,0 +1,25 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diagbot.entity.QcHospitalInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-17 13:49
+ */
+@Setter
+@Getter
+public class QcHospitalInfoAllDTO  {
+    private Long id;
+    /**
+     * 医院名称
+     */
+    private String name;
+
+}

+ 123 - 0
mrman-service/src/main/java/com/diagbot/dto/QcInputcasesAllDTO.java

@@ -0,0 +1,123 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-10 18:58
+ */
+@Setter
+@Getter
+public class QcInputcasesAllDTO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    private Integer hospitalId;
+
+    /**
+     * 入院记录
+     */
+    private String text;
+
+    /**
+     * 临床用血审核
+     */
+    private String clinicalBlood;
+
+    /**
+     * 会诊
+     */
+    private String consultation;
+
+    /**
+     * 死亡病例讨论
+     */
+    private String deathCaseDiscuss;
+
+    /**
+     * 死亡记录
+     */
+    private String deathRecord;
+
+    /**
+     * 疑难病例讨论
+     */
+    private String difficultCaseDiscuss;
+
+    /**
+     * 值班交接班
+     */
+    private String dutyShiftSystem;
+
+    /**
+     * 首次病程录
+     */
+    private String firstCourseRecord;
+
+    /**
+     * 出院小结
+     */
+    private String leaveHospital;
+
+    /**
+     * 分级护理
+     */
+    private String nursingSystem;
+
+    /**
+     * 手术期间讨论
+     */
+    private String operationDiscussion;
+
+    /**
+     * 术前讨论
+     */
+    private String preOperativeDiscussion;
+
+    /**
+     * 三级查房
+     */
+    private String threeLevelWard;
+
+    /**
+     * 危急值报告
+     */
+    private String criticalValue;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private List<QcInputcasesMappingDTO> qcInputcasesMapping;
+}

+ 43 - 0
mrman-service/src/main/java/com/diagbot/dto/QcInputcasesMappingDTO.java

@@ -0,0 +1,43 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-10 19:02
+ */
+@Setter
+@Getter
+public class QcInputcasesMappingDTO {
+
+
+    private Long id;
+
+    /**
+     * 病历文本id
+     */
+    private Long textId;
+
+
+
+    /**
+     * 病历id
+     */
+    private Long casesId;
+    private String casesName;
+    /**
+     * 病历条目id
+     */
+    private Long casesEntryId;
+    private String EntryName;
+    /**
+     * 是否通过
+     */
+    private Integer pass;
+
+    private String caseNumberId;
+
+
+}

+ 157 - 0
mrman-service/src/main/java/com/diagbot/entity/CasesNumber.java

@@ -0,0 +1,157 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病历
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@TableName("qc_cases_number")
+public class CasesNumber implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 医院id
+     */
+    private String hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String caseNumber;
+
+    private String isTag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getCaseNumber() {
+        return caseNumber;
+    }
+
+    public void setCaseNumber(String caseNumber) {
+        this.caseNumber = caseNumber;
+    }
+    public String getIsTag() {
+        return isTag;
+    }
+
+    public void setIsTag(String isTag) {
+        this.isTag = isTag;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "CasesNumber{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", hospitalId=" + hospitalId +
+            ", caseNumber=" + caseNumber +
+            ", isTag=" + isTag +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 133 - 0
mrman-service/src/main/java/com/diagbot/entity/Mode.java

@@ -0,0 +1,133 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 病历
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@TableName("qc_mode")
+public class Mode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "Mode{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", name=" + name +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 160 - 0
mrman-service/src/main/java/com/diagbot/entity/ModelMapping.java

@@ -0,0 +1,160 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病历内容
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@TableName("qc_model_mapping")
+public class ModelMapping implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历号
+     */
+    private Long caseNumberId;
+
+    /**
+     * 数据类型id
+     */
+    private Long modeId;
+
+    /**
+     * 内容
+     */
+    private String text;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getCaseNumberId() {
+        return caseNumberId;
+    }
+
+    public void setCaseNumberId(Long caseNumberId) {
+        this.caseNumberId = caseNumberId;
+    }
+    public Long getModeId() {
+        return modeId;
+    }
+
+    public void setModeId(Long modeId) {
+        this.modeId = modeId;
+    }
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "ModelMapping{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", caseNumberId=" + caseNumberId +
+            ", modeId=" + modeId +
+            ", text=" + text +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 132 - 0
mrman-service/src/main/java/com/diagbot/entity/QcCases.java

@@ -0,0 +1,132 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 病历
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+public class QcCases implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "QcCases{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", name=" + name +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 145 - 0
mrman-service/src/main/java/com/diagbot/entity/QcCasesEntry.java

@@ -0,0 +1,145 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 病历条目
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+public class QcCasesEntry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历id
+     */
+    private Long casesId;
+
+    /**
+     * 条目
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getCasesId() {
+        return casesId;
+    }
+
+    public void setCasesId(Long casesId) {
+        this.casesId = casesId;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "QcCasesEntry{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", casesId=" + casesId +
+            ", name=" + name +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 212 - 0
mrman-service/src/main/java/com/diagbot/entity/QcHospitalInfo.java

@@ -0,0 +1,212 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医院信息表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+@TableName("qc_hospital_info")
+public class QcHospitalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 医院编码
+     */
+    private String code;
+
+    /**
+     * 医院名称
+     */
+    private String name;
+
+    /**
+     * 医院地址
+     */
+    private String address;
+
+    /**
+     * 医院名称拼音
+     */
+    private String spell;
+
+    /**
+     * 状态:0.禁用1.启用
+     */
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 是否对接(0-不对接,1-对接)
+     */
+    private Integer connect;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    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 getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public Integer getConnect() {
+        return connect;
+    }
+
+    public void setConnect(Integer connect) {
+        this.connect = connect;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "QcHospitalInfo{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", code=" + code +
+            ", name=" + name +
+            ", address=" + address +
+            ", spell=" + spell +
+            ", status=" + status +
+            ", orderNo=" + orderNo +
+            ", connect=" + connect +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 313 - 0
mrman-service/src/main/java/com/diagbot/entity/QcInputcases.java

@@ -0,0 +1,313 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病历录入
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+@TableName("qc_inputcases")
+public class QcInputcases implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    private Integer hospitalId;
+
+    /**
+     * 入院记录
+     */
+    private String text;
+
+    /**
+     * 临床用血审核
+     */
+    private String clinicalBlood;
+
+    /**
+     * 会诊
+     */
+    private String consultation;
+
+    /**
+     * 死亡病例讨论
+     */
+    private String deathCaseDiscuss;
+
+    /**
+     * 死亡记录
+     */
+    private String deathRecord;
+
+    /**
+     * 疑难病例讨论
+     */
+    private String difficultCaseDiscuss;
+
+    /**
+     * 值班交接班
+     */
+    private String dutyShiftSystem;
+
+    /**
+     * 首次病程录
+     */
+    private String firstCourseRecord;
+
+    /**
+     * 出院小结
+     */
+    private String leaveHospital;
+
+    /**
+     * 分级护理
+     */
+    private String nursingSystem;
+
+    /**
+     * 手术期间讨论
+     */
+    private String operationDiscussion;
+
+    /**
+     * 术前讨论
+     */
+    private String preOperativeDiscussion;
+
+    /**
+     * 三级查房
+     */
+    private String threeLevelWard;
+
+    /**
+     * 危急值报告
+     */
+    private String criticalValue;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+    public String getClinicalBlood() {
+        return clinicalBlood;
+    }
+
+    public void setClinicalBlood(String clinicalBlood) {
+        this.clinicalBlood = clinicalBlood;
+    }
+    public String getConsultation() {
+        return consultation;
+    }
+
+    public void setConsultation(String consultation) {
+        this.consultation = consultation;
+    }
+    public String getDeathCaseDiscuss() {
+        return deathCaseDiscuss;
+    }
+
+    public void setDeathCaseDiscuss(String deathCaseDiscuss) {
+        this.deathCaseDiscuss = deathCaseDiscuss;
+    }
+    public String getDeathRecord() {
+        return deathRecord;
+    }
+
+    public void setDeathRecord(String deathRecord) {
+        this.deathRecord = deathRecord;
+    }
+    public String getDifficultCaseDiscuss() {
+        return difficultCaseDiscuss;
+    }
+
+    public void setDifficultCaseDiscuss(String difficultCaseDiscuss) {
+        this.difficultCaseDiscuss = difficultCaseDiscuss;
+    }
+    public String getDutyShiftSystem() {
+        return dutyShiftSystem;
+    }
+
+    public void setDutyShiftSystem(String dutyShiftSystem) {
+        this.dutyShiftSystem = dutyShiftSystem;
+    }
+    public String getFirstCourseRecord() {
+        return firstCourseRecord;
+    }
+
+    public void setFirstCourseRecord(String firstCourseRecord) {
+        this.firstCourseRecord = firstCourseRecord;
+    }
+    public String getLeaveHospital() {
+        return leaveHospital;
+    }
+
+    public void setLeaveHospital(String leaveHospital) {
+        this.leaveHospital = leaveHospital;
+    }
+    public String getNursingSystem() {
+        return nursingSystem;
+    }
+
+    public void setNursingSystem(String nursingSystem) {
+        this.nursingSystem = nursingSystem;
+    }
+    public String getOperationDiscussion() {
+        return operationDiscussion;
+    }
+
+    public void setOperationDiscussion(String operationDiscussion) {
+        this.operationDiscussion = operationDiscussion;
+    }
+    public String getPreOperativeDiscussion() {
+        return preOperativeDiscussion;
+    }
+
+    public void setPreOperativeDiscussion(String preOperativeDiscussion) {
+        this.preOperativeDiscussion = preOperativeDiscussion;
+    }
+    public String getThreeLevelWard() {
+        return threeLevelWard;
+    }
+
+    public void setThreeLevelWard(String threeLevelWard) {
+        this.threeLevelWard = threeLevelWard;
+    }
+    public String getCriticalValue() {
+        return criticalValue;
+    }
+
+    public void setCriticalValue(String criticalValue) {
+        this.criticalValue = criticalValue;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "QcInputcases{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", hospitalId=" + hospitalId +
+            ", text=" + text +
+            ", clinicalBlood=" + clinicalBlood +
+            ", consultation=" + consultation +
+            ", deathCaseDiscuss=" + deathCaseDiscuss +
+            ", deathRecord=" + deathRecord +
+            ", difficultCaseDiscuss=" + difficultCaseDiscuss +
+            ", dutyShiftSystem=" + dutyShiftSystem +
+            ", firstCourseRecord=" + firstCourseRecord +
+            ", leaveHospital=" + leaveHospital +
+            ", nursingSystem=" + nursingSystem +
+            ", operationDiscussion=" + operationDiscussion +
+            ", preOperativeDiscussion=" + preOperativeDiscussion +
+            ", threeLevelWard=" + threeLevelWard +
+            ", criticalValue=" + criticalValue +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 172 - 0
mrman-service/src/main/java/com/diagbot/entity/QcInputcasesMapping.java

@@ -0,0 +1,172 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病历录入关系
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+public class QcInputcasesMapping implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 病历文本id
+     */
+    private Long caseNumberId;
+
+    /**
+     * 病历id
+     */
+    private Long casesId;
+
+    /**
+     * 病历条目id
+     */
+    private Long casesEntryId;
+
+    /**
+     * 是否通过
+     */
+    private Integer pass;
+
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+
+
+    public Long getCasesId() {
+        return casesId;
+    }
+
+    public void setCasesId(Long casesId) {
+        this.casesId = casesId;
+    }
+    public Long getCasesEntryId() {
+        return casesEntryId;
+    }
+
+    public void setCasesEntryId(Long casesEntryId) {
+        this.casesEntryId = casesEntryId;
+    }
+    public Integer getPass() {
+        return pass;
+    }
+
+    public void setPass(Integer pass) {
+        this.pass = pass;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getCaseNumberId() {
+        return caseNumberId;
+    }
+
+    public void setCaseNumberId(Long caseNumberId) {
+        this.caseNumberId = caseNumberId;
+    }
+
+    @Override
+    public String toString() {
+        return "QcInputcasesMapping{" +
+            "id=" + id +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", caseNumberId=" + caseNumberId +
+            ", casesId=" + casesId +
+            ", casesEntryId=" + casesEntryId +
+            ", pass=" + pass +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 72 - 0
mrman-service/src/main/java/com/diagbot/facade/QcCasesFacade.java

@@ -0,0 +1,72 @@
+package com.diagbot.facade;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.QcCasesAllDTO;
+import com.diagbot.dto.QcCasesDTO;
+import com.diagbot.dto.QcHospitalInfoAllDTO;
+import com.diagbot.entity.QcCases;
+import com.diagbot.entity.QcCasesEntry;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.QcCasesEntryService;
+import com.diagbot.service.QcCasesService;
+import com.diagbot.service.impl.QcCasesServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-10 16:32
+ */
+@Component
+public class QcCasesFacade extends QcCasesServiceImpl {
+
+    @Autowired
+    QcCasesService qcCasesService;
+    @Autowired
+    QcCasesEntryService qcCasesEntryService;
+
+    public List<QcCasesAllDTO> getAlls() {
+        //查出所有病例
+        QueryWrapper<QcCases> qcCasesQuery = new QueryWrapper<>();
+        qcCasesQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByDesc("gmt_modified");
+        List<QcCases> data = list(qcCasesQuery);
+        List<QcCasesAllDTO> dataNew = new ArrayList<QcCasesAllDTO>();
+        dataNew = BeanUtil.listCopyTo(data, QcCasesAllDTO.class);
+        // 查出所有病例病例类型
+        QueryWrapper<QcCasesEntry> qcCasesEntryQuery = new QueryWrapper<>();
+        qcCasesEntryQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByDesc("gmt_modified");
+        List<QcCasesEntry> dataEntry = qcCasesEntryService.list(qcCasesEntryQuery);
+       // 然后把所有病例类型放进去
+        Map<Long, List<QcCasesEntry>> map
+                = EntityUtil.makeEntityListMap(dataEntry, "casesId");
+      //List<QcCases> data = qcCasesService.list();
+        //把模板放进文件夹中
+        if (dataNew.size() > 0) {
+            for (QcCasesAllDTO ts : dataNew) {
+                List<QcCasesEntry> tmp = map.get(ts.getId());
+                if (ListUtil.isNotEmpty(tmp)) {
+                    ts.setQcCasesEntry(tmp);
+                }
+            }
+        }
+        return dataNew;
+    }
+
+    public List<QcCasesDTO> getCasesAll() {
+        List<QcCases> data = qcCasesService.list();
+        List<QcCasesDTO> dataNew = new ArrayList<QcCasesDTO>();
+        dataNew = BeanUtil.listCopyTo(data, QcCasesDTO.class);
+        return dataNew;
+    }
+}

+ 35 - 0
mrman-service/src/main/java/com/diagbot/facade/QcHospitalInfoFacade.java

@@ -0,0 +1,35 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.QcHospitalInfoAllDTO;
+import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.service.QcHospitalInfoService;
+import com.diagbot.service.impl.QcHospitalInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-17 13:47
+ */
+@Component
+public class QcHospitalInfoFacade extends QcHospitalInfoServiceImpl {
+
+    @Autowired
+    QcHospitalInfoService qcHospitalInfoService;
+
+    /**
+     *
+     * @return
+     */
+    public List<QcHospitalInfoAllDTO> getHospitalInfoAll() {
+        List<QcHospitalInfo> data = qcHospitalInfoService.list();
+        List<QcHospitalInfoAllDTO> dataNew = new ArrayList<QcHospitalInfoAllDTO>();
+        dataNew = BeanUtil.listCopyTo(data, QcHospitalInfoAllDTO.class);
+        return dataNew;
+    }
+}

+ 451 - 0
mrman-service/src/main/java/com/diagbot/facade/QcInputcasesFacade.java

@@ -0,0 +1,451 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.ModuleMappingDTO;
+import com.diagbot.dto.QcAllInputcasesDTO;
+import com.diagbot.dto.QcInputcasesAllDTO;
+import com.diagbot.dto.QcInputcasesMappingDTO;
+import com.diagbot.entity.CasesNumber;
+import com.diagbot.entity.Mode;
+import com.diagbot.entity.ModelMapping;
+import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.entity.QcInputcases;
+import com.diagbot.entity.QcInputcasesMapping;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.CasesNumberService;
+import com.diagbot.service.ModeService;
+import com.diagbot.service.ModelMappingService;
+import com.diagbot.service.QcInputcasesMappingService;
+import com.diagbot.service.QcInputcasesService;
+import com.diagbot.service.impl.QcInputcasesServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.QcInputMappingSaveVO;
+import com.diagbot.vo.QcInputcasesAllVO;
+import com.diagbot.vo.QcInputcasesByIdVO;
+import com.diagbot.vo.QcInputcasesSaveVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-10 17:17
+ */
+@Component
+public class QcInputcasesFacade extends QcInputcasesServiceImpl {
+
+    @Autowired
+    QcInputcasesService qcInputcasesService;
+    @Autowired
+    QcInputcasesMappingService qcInputcasesMappingService;
+    @Autowired
+    CasesNumberService casesNumberService;
+    @Autowired
+    ModelMappingService modelMappingService;
+    @Autowired
+    ModeService modeService;
+    @Autowired
+    QcHospitalInfoFacade qcHospitalInfoFacade;
+
+   /* public List<QcInputcasesAllDTO> getInputcasesAlls(Long textId) {
+        //查出所有病例
+        QueryWrapper<QcInputcases> qcInputcasesQuery = new QueryWrapper<>();
+        qcInputcasesQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByDesc("gmt_modified")
+                .last("limit 30");
+        if (textId != null && textId != 0) {
+            qcInputcasesQuery.eq("id", textId);
+        }
+        List<QcInputcases> data = list(qcInputcasesQuery);
+        List<QcInputcasesAllDTO> dataNew = new ArrayList<QcInputcasesAllDTO>();
+        dataNew = BeanUtil.listCopyTo(data, QcInputcasesAllDTO.class);
+        // 查出所有病例病例类型
+        List<QcInputcasesMappingDTO> qcInputcasesMapping = qcInputcasesMappingService.getQcInputMappings(textId);
+        // 然后把所有病例类型放进去
+        Map<Long, List<QcInputcasesMappingDTO>> map
+                = EntityUtil.makeEntityListMap(qcInputcasesMapping, "textId");
+        if (dataNew.size() > 0) {
+            for (QcInputcasesAllDTO ts : dataNew) {
+                List<QcInputcasesMappingDTO> tmp = map.get(ts.getId());
+                if (ListUtil.isNotEmpty(tmp)) {
+                    ts.setQcInputcasesMapping(tmp);
+                }
+            }
+        }
+        return dataNew;
+    }*/
+
+    /**
+     * @param qcInputcasesSaveVO
+     * @return
+     */
+    public boolean saveAndUpdatas(QcInputcasesSaveVO qcInputcasesSaveVO) {
+        boolean res = false;
+        if (qcInputcasesSaveVO.getId() != null && qcInputcasesSaveVO.getId() != 0) {
+            //校验数据是否存在
+            QueryWrapper<QcInputcases> qcQuery = new QueryWrapper<>();
+            Map<String, Object> mapAll = new HashMap<>();
+            mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+            mapAll.put("id", qcInputcasesSaveVO.getId());
+            qcQuery.allEq(mapAll);
+            int sum = count(qcQuery);
+            if (sum == 0) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病例不存在");
+            }
+            UpdateWrapper<QcInputcases> qcInputcasesQuery = new UpdateWrapper<>();
+            qcInputcasesQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("id", qcInputcasesSaveVO.getId())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("creator", qcInputcasesSaveVO.getCreator())
+                    .set("text", qcInputcasesSaveVO.getText())
+                    .set("clinical_blood", qcInputcasesSaveVO.getClinicalBlood())
+                    .set("consultation", qcInputcasesSaveVO.getConsultation())
+                    .set("death_case_discuss", qcInputcasesSaveVO.getDeathCaseDiscuss())
+                    .set("death_record", qcInputcasesSaveVO.getDeathRecord())
+                    .set("difficult_case_discuss", qcInputcasesSaveVO.getDifficultCaseDiscuss())
+                    .set("duty_shift_system", qcInputcasesSaveVO.getDutyShiftSystem())
+                    .set("first_course_record", qcInputcasesSaveVO.getFirstCourseRecord())
+                    .set("leave_hospital", qcInputcasesSaveVO.getLeaveHospital())
+                    .set("nursing_system", qcInputcasesSaveVO.getNursingSystem())
+                    .set("operation_discussion", qcInputcasesSaveVO.getOperationDiscussion())
+                    .set("pre_operative_discussion", qcInputcasesSaveVO.getPreOperativeDiscussion())
+                    .set("three_level_ward", qcInputcasesSaveVO.getThreeLevelWard())
+                    .set("critical_value", qcInputcasesSaveVO.getCriticalValue());
+            res = update(qcInputcasesQuery);
+            UpdateWrapper<QcInputcasesMapping> qcMappingQuery = new UpdateWrapper<>();
+            qcMappingQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("text_id", qcInputcasesSaveVO.getId())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey());
+            res = qcInputcasesMappingService.update(qcMappingQuery);
+            List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
+
+            List<QcInputcasesMapping> qcMappingList = new ArrayList<>();
+            for (QcInputMappingSaveVO t : inputMapping) {
+                QcInputcasesMapping qcList = new QcInputcasesMapping();
+                qcList.setCasesEntryId(t.getCasesEntryId());
+                qcList.setCreator(qcInputcasesSaveVO.getCreator());
+                qcList.setCasesId(t.getCasesId());
+                qcList.setPass(t.getPass());
+               /* qcList.setTextId(qcInputcasesSaveVO.getId());*/
+                qcList.setGmtModified(DateUtil.now());
+                qcMappingList.add(qcList);
+            }
+            res = qcInputcasesMappingService.saveBatch(qcMappingList);
+
+        } else {
+            /*QueryWrapper<QcInputcases> qcInputcasesQuery = new QueryWrapper<>();
+            Map<String, Object> mapAll = new HashMap<>();
+            mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+            mapAll.put("text", qcInputcasesSaveVO.getText());
+            qcInputcasesQuery.allEq(mapAll);
+            int sum = count(qcInputcasesQuery);
+            if (sum != 0) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病例存在");
+            }*/
+            QcInputcases qcInputcases = new QcInputcases();
+           /* qcInputcases.setText(qcInputcasesSaveVO.getText());
+            qcInputcases.setClinicalBlood(qcInputcasesSaveVO.getClinicalBlood());
+            qcInputcases.setConsultation(qcInputcasesSaveVO.getConsultation());
+            qcInputcases.setCriticalValue(qcInputcasesSaveVO.getCriticalValue());
+            qcInputcases.setDeathCaseDiscuss(qcInputcasesSaveVO.getDeathCaseDiscuss());
+            qcInputcases.setDeathRecord(qcInputcasesSaveVO.getDeathRecord());
+            qcInputcases.setDifficultCaseDiscuss(qcInputcasesSaveVO.getDifficultCaseDiscuss());
+            qcInputcases.setDutyShiftSystem(qcInputcasesSaveVO.getDutyShiftSystem());
+            qcInputcases.setFirstCourseRecord(qcInputcasesSaveVO.getFirstCourseRecord());
+            qcInputcases.setLeaveHospital(qcInputcasesSaveVO.getLeaveHospital());
+            qcInputcases.setNursingSystem(qcInputcasesSaveVO.getNursingSystem());
+            qcInputcases.setOperationDiscussion(qcInputcasesSaveVO.getOperationDiscussion());
+            qcInputcases.setPreOperativeDiscussion(qcInputcasesSaveVO.getPreOperativeDiscussion());
+            qcInputcases.setThreeLevelWard(qcInputcasesSaveVO.getThreeLevelWard());
+            qcInputcases.setCreator(qcInputcasesSaveVO.getCreator());
+            qcInputcases.setGmtModified(DateUtil.now());*/
+            BeanUtil.copyProperties(qcInputcasesSaveVO,qcInputcases);
+            qcInputcases.setGmtModified(DateUtil.now());
+            res = save(qcInputcases);
+            List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
+            if (res) {
+                List<QcInputcasesMapping> qcMappingList = new ArrayList<>();
+                for (QcInputMappingSaveVO t : inputMapping) {
+                    QcInputcasesMapping qcList = new QcInputcasesMapping();
+                    qcList.setCasesEntryId(t.getCasesEntryId());
+                    qcList.setCreator(qcInputcasesSaveVO.getCreator());
+                    qcList.setCasesId(t.getCasesId());
+                    qcList.setPass(t.getPass());
+                   /* qcList.setTextId(qcInputcases.getId());*/
+                    qcMappingList.add(qcList);
+                }
+                res = qcInputcasesMappingService.saveBatch(qcMappingList);
+
+            }
+        }
+
+        return res;
+    }
+
+    /**
+     * @param qcInputcasesByIdVO
+     * @return
+     */
+    public boolean cancelByIds(QcInputcasesByIdVO qcInputcasesByIdVO) {
+        boolean res = false;
+        UpdateWrapper<QcInputcases> qcInputcasesQuery = new UpdateWrapper<>();
+        qcInputcasesQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", qcInputcasesByIdVO.getTextId())
+                .set("modifier", qcInputcasesByIdVO.getCreator())
+                .set("is_deleted", IsDeleteEnum.Y.getKey());
+        res = update(qcInputcasesQuery);
+        if (res) {
+            UpdateWrapper<QcInputcasesMapping> qcMappingQuery = new UpdateWrapper<>();
+            qcMappingQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("text_id", qcInputcasesByIdVO.getTextId())
+                    .set("modifier", qcInputcasesByIdVO.getCreator())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey());
+            res = qcInputcasesMappingService.update(qcMappingQuery);
+        }
+        return res;
+    }
+
+    public List<QcAllInputcasesDTO> getAllInputcases(QcInputcasesAllVO qcInputcasesAllVO){
+        List<Long> hospitalIds = new ArrayList<>();
+        if (StringUtil.isNotEmpty(qcInputcasesAllVO.getHospitalName())){
+            QueryWrapper<QcHospitalInfo> qcHospitalInfoQueryWrapper = new QueryWrapper<>();
+            qcHospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                    .like("name",qcInputcasesAllVO.getHospitalName());
+            hospitalIds = qcHospitalInfoFacade.list().stream().map(QcHospitalInfo::getId).collect(Collectors.toList());
+        }
+        //病例
+        QueryWrapper<CasesNumber> casesNumberQueryWrapper = new QueryWrapper<>();
+        casesNumberQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                .orderByDesc("gmt_modified");
+        if(StringUtil.isNotEmpty(qcInputcasesAllVO.getCaseNumber())){
+            casesNumberQueryWrapper.like("case_number",qcInputcasesAllVO.getCaseNumber());
+        }
+        if(StringUtil.isNotEmpty(qcInputcasesAllVO.getHospitalName())){
+            casesNumberQueryWrapper.in("hospital_id",hospitalIds);
+        }
+        List<CasesNumber> casesNumbers = casesNumberService.list(casesNumberQueryWrapper);
+        List<QcAllInputcasesDTO> res = new ArrayList<>();
+        //病例内容
+        QueryWrapper<ModelMapping> modelMappingQueryWrapper = new QueryWrapper<>();
+        modelMappingQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<ModelMapping> modelMappings = modelMappingService.list();
+        Map<Long, List<ModelMapping>> modelMap
+                = EntityUtil.makeEntityListMap(modelMappings, "modeId");
+        //病例列表
+        QueryWrapper<Mode> modelQueryWrapper = new QueryWrapper<>();
+        modelQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<Mode> modes = modeService.list();
+        Map<Long,String> modeMap = new HashMap<>();
+        modeMap = modes.stream().collect(Collectors.toMap(Mode::getId,mode -> mode.getName()));
+        //病例列表
+        QueryWrapper<QcHospitalInfo> hospitalInfoQueryWrapper = new QueryWrapper<>();
+        hospitalInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<QcHospitalInfo> qcHospitalInfos = qcHospitalInfoFacade.list();
+        Map<Long,String> hospitalMap = new HashMap<>();
+        hospitalMap = qcHospitalInfos.stream().collect(Collectors.toMap(QcHospitalInfo::getId,hospitalInfo -> hospitalInfo.getName()));
+        //将病例内容放入出参
+        res = BeanUtil.listCopyTo(casesNumbers,QcAllInputcasesDTO.class);
+        List<ModuleMappingDTO> moduleMappingDTOS = new ArrayList<>();
+        List<Long> modIds = new ArrayList<>();
+        ModuleMappingDTO moduleMappingDTO = new ModuleMappingDTO();
+        List<String> modeList = new ArrayList();
+        for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
+            moduleMappingDTOS = new ArrayList<>();
+            for (Mode mode : modes) {
+                moduleMappingDTO = new ModuleMappingDTO();
+                moduleMappingDTO.setModeId(mode.getId());
+                moduleMappingDTO.setName(mode.getName());
+                if(modelMap.get(mode.getId()) != null){
+                    modeList = new ArrayList();
+                    for (ModelMapping modelMapping: modelMap.get(mode.getId())) {
+                        if (modelMapping.getCaseNumberId().intValue() == qcAllInputcasesDTO.getId()){
+                            modeList.add(modelMapping.getText());
+                            moduleMappingDTO.setText(modeList);
+                        }
+                    }
+                }
+                moduleMappingDTOS.add(moduleMappingDTO);
+            }
+            qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
+            qcAllInputcasesDTO.setModuleMappingDTOList(moduleMappingDTOS);
+        }
+       /* for (QcAllInputcasesDTO qcAllInputcasesDTO : res) {
+            for (ModelMapping modelMapping : modelMappings) {
+                if (qcAllInputcasesDTO.getId().intValue() == modelMapping.getCaseNumberId().intValue()){
+                        if(!modIds.contains(modelMapping.getModeId())){
+                            moduleMappingDTO = new ModuleMappingDTO();
+                            moduleMappingDTO.setModeId(modelMapping.getModeId());
+                            moduleMappingDTO.setName(modeMap.get(modelMapping.getModeId()));
+                            moduleMappingDTO.setText(modelMapping.getText());
+                            moduleMappingDTOS.add(moduleMappingDTO);
+                            modIds.add(modelMapping.getModeId());
+                        }
+                }
+            }
+            qcAllInputcasesDTO.setHospitalName(hospitalMap.get(Long.parseLong(qcAllInputcasesDTO.getHospitalId())));
+            qcAllInputcasesDTO.setModuleMappingDTOList(moduleMappingDTOS);
+        }*/
+
+        // 查出所有病例病例类型
+        List<QcInputcasesMappingDTO> qcInputcasesMapping = qcInputcasesMappingService.getInputMapping(qcInputcasesAllVO.getCaseNumber());
+        // 然后把所有病例类型放进去
+        Map<Long, List<QcInputcasesMappingDTO>> map
+                = EntityUtil.makeEntityListMap(qcInputcasesMapping, "caseNumberId");
+        if (res.size() > 0) {
+            for (QcAllInputcasesDTO ts : res) {
+                List<QcInputcasesMappingDTO> tmp = map.get(ts.getId().toString());
+                if (ListUtil.isNotEmpty(tmp)) {
+                    ts.setQcInputcasesMapping(tmp);
+                }
+            }
+        }
+
+        return  res;
+    }
+
+    /**
+     * @param qcInputcasesByIdVO
+     * @return
+     */
+    public boolean deleteById(QcInputcasesByIdVO qcInputcasesByIdVO) {
+        boolean res = false;
+        UpdateWrapper<QcInputcases> qcInputcasesQuery = new UpdateWrapper<>();
+        qcInputcasesQuery
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", qcInputcasesByIdVO.getCaseNumberId())
+                .set("modifier", qcInputcasesByIdVO.getCreator())
+                .set("is_deleted", IsDeleteEnum.Y.getKey());
+        res = update(qcInputcasesQuery);
+        if (res) {
+            UpdateWrapper<QcInputcasesMapping> qcMappingQuery = new UpdateWrapper<>();
+            qcMappingQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesByIdVO.getCaseNumberId())
+                    .set("modifier", qcInputcasesByIdVO.getCreator())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey());
+            res = qcInputcasesMappingService.update(qcMappingQuery);
+        }
+        if (res) {
+            UpdateWrapper<ModelMapping> modelMappingUpdateWrapper = new UpdateWrapper<>();
+            modelMappingUpdateWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesByIdVO.getCaseNumberId())
+                    .set("modifier", qcInputcasesByIdVO.getCreator())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey());
+            res = modelMappingService.update(modelMappingUpdateWrapper);
+        }
+        return res;
+    }
+
+    /**
+     * @param qcInputcasesSaveVO
+     * @return
+     */
+    public boolean saveOrUpdata(QcInputcasesSaveVO qcInputcasesSaveVO) {
+        boolean res = false;
+        if (qcInputcasesSaveVO.getCaseNumberId() != null && qcInputcasesSaveVO.getCaseNumberId() != 0) {
+            //校验数据是否存在
+            QueryWrapper<CasesNumber> casesNumberQueryWrapper = new QueryWrapper<>();
+            Map<String, Object> mapAll = new HashMap<>();
+            mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
+            mapAll.put("id", qcInputcasesSaveVO.getCaseNumberId());
+            casesNumberQueryWrapper.allEq(mapAll);
+            int sum = casesNumberService.count(casesNumberQueryWrapper);
+            if (sum == 0) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病例不存在");
+            }
+            UpdateWrapper<CasesNumber> casesNumberUpdateWrapper = new UpdateWrapper<>();
+            casesNumberUpdateWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("id", qcInputcasesSaveVO.getCaseNumberId())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("creator", qcInputcasesSaveVO.getCreator())
+                    .set("hospital_id", qcInputcasesSaveVO.getHospitalId())
+                    .set("case_number", qcInputcasesSaveVO.getCaseNumber())
+                    .set("is_tag", qcInputcasesSaveVO.getIsTag());
+            res = casesNumberService.update(casesNumberUpdateWrapper);
+           /* UpdateWrapper<ModelMapping> modelMappingUpdateWrapper = new UpdateWrapper<>();
+            modelMappingUpdateWrapper
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesSaveVO.getId())
+                    .set("gmt_modified", DateUtil.now())
+                    .set("creator", qcInputcasesSaveVO.getCreator())
+                    .set("mode_id", qcInputcasesSaveVO.getModeId())
+                    .set("text", qcInputcasesSaveVO.getText());
+            res = modelMappingService.update(modelMappingUpdateWrapper);*/
+            QueryWrapper<QcInputcasesMapping> qcMappingQuery = new QueryWrapper<>();
+            qcMappingQuery
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("case_number_id", qcInputcasesSaveVO.getCaseNumberId());
+            res = qcInputcasesMappingService.remove(qcMappingQuery);
+            List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
+
+            List<QcInputcasesMapping> qcMappingList = new ArrayList<>();
+            for (QcInputMappingSaveVO t : inputMapping) {
+                QcInputcasesMapping qcList = new QcInputcasesMapping();
+                qcList.setCasesEntryId(t.getCasesEntryId());
+                qcList.setCreator(qcInputcasesSaveVO.getCreator());
+                qcList.setCasesId(t.getCasesId());
+                qcList.setPass(t.getPass());
+                qcList.setCaseNumberId(qcInputcasesSaveVO.getCaseNumberId());
+                qcList.setGmtModified(DateUtil.now());
+                qcMappingList.add(qcList);
+            }
+            res = qcInputcasesMappingService.saveBatch(qcMappingList);
+
+        } else {
+            CasesNumber casesNumber = new CasesNumber();
+            casesNumber.setGmtModified(DateUtil.now());
+            casesNumber.setCreator(qcInputcasesSaveVO.getCreator());
+            casesNumber.setCaseNumber(qcInputcasesSaveVO.getCaseNumber());
+            casesNumber.setHospitalId(qcInputcasesSaveVO.getHospitalId().toString());
+            casesNumber.setIsTag(qcInputcasesSaveVO.getIsTag());
+            casesNumber.setId(qcInputcasesSaveVO.getCaseNumberId());
+            res = casesNumberService.save(casesNumber);
+           /* ModelMapping modelMapping = new ModelMapping();
+            modelMapping.setCaseNumberId(qcInputcasesSaveVO.getCaseNumberId());
+            modelMapping.setCreator(qcInputcasesSaveVO.getCreator());
+            modelMapping.setGmtCreate(DateUtil.now());
+            modelMapping.setModeId(qcInputcasesSaveVO.getModeId());
+            modelMapping.setText(qcInputcasesSaveVO.getText());
+            res = modelMappingService.save(modelMapping);*/
+            List<QcInputMappingSaveVO> inputMapping = qcInputcasesSaveVO.getQcInputMappingSaveVO();
+            if (res) {
+                List<QcInputcasesMapping> qcMappingList = new ArrayList<>();
+                for (QcInputMappingSaveVO t : inputMapping) {
+                    QcInputcasesMapping qcList = new QcInputcasesMapping();
+                    qcList.setCasesEntryId(t.getCasesEntryId());
+                    qcList.setCreator(qcInputcasesSaveVO.getCreator());
+                    qcList.setCasesId(t.getCasesId());
+                    qcList.setPass(t.getPass());
+                    qcList.setCaseNumberId(casesNumber.getId());
+                    qcMappingList.add(qcList);
+                }
+                res = qcInputcasesMappingService.saveBatch(qcMappingList);
+
+            }
+        }
+
+        return res;
+    }
+}

+ 11 - 0
mrman-service/src/main/java/com/diagbot/mapper/ArRechomeMapper.java

@@ -1,10 +1,13 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.entity.ArRechome;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -31,4 +34,12 @@ public interface ArRechomeMapper extends BaseMapper<ArRechome> {
      * @return
      */
     BABLDetailDTO getBABLDetail(BABLVO bablvo);
+
+    /**
+     * 病案病历记录分页查询
+     *
+     * @param bazyPageVO
+     * @return
+     */
+    IPage<BABLDTO> getBAZYPage(@Param("bazyPageVO") BAZYPageVO bazyPageVO);
 }

+ 16 - 0
mrman-service/src/main/java/com/diagbot/mapper/CasesNumberMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.CasesNumber;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface CasesNumberMapper extends BaseMapper<CasesNumber> {
+
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/mapper/ModeMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.Mode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModeMapper extends BaseMapper<Mode> {
+
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/mapper/ModelMappingMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.ModelMapping;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病历内容 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModelMappingMapper extends BaseMapper<ModelMapping> {
+
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/mapper/QcCasesEntryMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.QcCasesEntry;
+
+/**
+ * <p>
+ * 病历条目 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+public interface QcCasesEntryMapper extends BaseMapper<QcCasesEntry> {
+
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/mapper/QcCasesMapper.java

@@ -0,0 +1,20 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.QcCasesDTO;
+import com.diagbot.entity.QcCases;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 病历 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+public interface QcCasesMapper extends BaseMapper<QcCases> {
+
+    List<QcCasesDTO> getCasesList(Long casesId);
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/mapper/QcHospitalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcHospitalInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 医院信息表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+public interface QcHospitalInfoMapper extends BaseMapper<QcHospitalInfo> {
+
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/mapper/QcInputcasesMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.QcInputcases;
+
+/**
+ * <p>
+ * 病历录入 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+public interface QcInputcasesMapper extends BaseMapper<QcInputcases> {
+
+}

+ 22 - 0
mrman-service/src/main/java/com/diagbot/mapper/QcInputcasesMappingMapper.java

@@ -0,0 +1,22 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.QcInputcasesMappingDTO;
+import com.diagbot.entity.QcInputcasesMapping;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 病历录入关系 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+public interface QcInputcasesMappingMapper extends BaseMapper<QcInputcasesMapping> {
+
+    public List<QcInputcasesMappingDTO> getQcInputMapping(Long textId);
+
+    public List<QcInputcasesMappingDTO> getInputMapping(String caseNumberId);
+}

+ 13 - 0
mrman-service/src/main/java/com/diagbot/service/ArRechomeService.java

@@ -1,10 +1,14 @@
 package com.diagbot.service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.entity.ArRechome;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,6 +20,7 @@ import java.util.List;
  * @author gaodm
  * @since 2020-01-17
  */
+@DS("slave")
 public interface ArRechomeService extends IService<ArRechome> {
     /**
      * 获取病案病历记录列表
@@ -31,4 +36,12 @@ public interface ArRechomeService extends IService<ArRechome> {
      * @return
      */
     BABLDetailDTO getBABLDetail(BABLVO bablvo);
+
+    /**
+     * 病案病历记录分页查询
+     *
+     * @param bazyPageVO
+     * @return
+     */
+    IPage<BABLDTO> getBAZYPage(@Param("bazyPageVO") BAZYPageVO bazyPageVO);
 }

+ 2 - 0
mrman-service/src/main/java/com/diagbot/service/BrRecdiagnoseService.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.diagbot.entity.BrRecdiagnose;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author gaodm
  * @since 2020-01-17
  */
+@DS("slave")
 public interface BrRecdiagnoseService extends IService<BrRecdiagnose> {
 
 }

+ 2 - 0
mrman-service/src/main/java/com/diagbot/service/BrRecinhosService.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.diagbot.entity.BrRecinhos;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author gaodm
  * @since 2020-01-17
  */
+@DS("slave")
 public interface BrRecinhosService extends IService<BrRecinhos> {
 
 }

+ 16 - 0
mrman-service/src/main/java/com/diagbot/service/CasesNumberService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.CasesNumber;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface CasesNumberService extends IService<CasesNumber> {
+
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/service/ModeService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.Mode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModeService extends IService<Mode> {
+
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/service/ModelMappingService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.ModelMapping;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病历内容 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+public interface ModelMappingService extends IService<ModelMapping> {
+
+}

+ 2 - 0
mrman-service/src/main/java/com/diagbot/service/MrMedicalrecordsService.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.diagbot.dto.BLJLDetailDTO;
 import com.diagbot.entity.MrMedicalrecords;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -15,6 +16,7 @@ import java.util.List;
  * @author gaodm
  * @since 2020-01-17
  */
+@DS("slave")
 public interface MrMedicalrecordsService extends IService<MrMedicalrecords> {
     /**
      * 获取病历记录列表

+ 2 - 0
mrman-service/src/main/java/com/diagbot/service/MrMrcontentService.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.diagbot.entity.MrMrcontent;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author gaodm
  * @since 2020-01-17
  */
+@DS("slave")
 public interface MrMrcontentService extends IService<MrMrcontent> {
 
 }

+ 18 - 0
mrman-service/src/main/java/com/diagbot/service/QcCasesEntryService.java

@@ -0,0 +1,18 @@
+package com.diagbot.service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.QcCasesEntry;
+
+/**
+ * <p>
+ * 病历条目 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+
+public interface QcCasesEntryService extends IService<QcCasesEntry> {
+
+}

+ 22 - 0
mrman-service/src/main/java/com/diagbot/service/QcCasesService.java

@@ -0,0 +1,22 @@
+package com.diagbot.service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.QcCasesDTO;
+import com.diagbot.entity.QcCases;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 病历 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+
+public interface QcCasesService extends IService<QcCases> {
+
+    public  List<QcCasesDTO>  getCasesLists(Long casesId);
+}

+ 16 - 0
mrman-service/src/main/java/com/diagbot/service/QcHospitalInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcHospitalInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 医院信息表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+public interface QcHospitalInfoService extends IService<QcHospitalInfo> {
+
+}

+ 23 - 0
mrman-service/src/main/java/com/diagbot/service/QcInputcasesMappingService.java

@@ -0,0 +1,23 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.QcInputcasesMappingDTO;
+import com.diagbot.entity.QcInputcasesMapping;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 病历录入关系 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+
+public interface QcInputcasesMappingService extends IService<QcInputcasesMapping> {
+
+    public List<QcInputcasesMappingDTO> getQcInputMappings(Long textId);
+
+    public List<QcInputcasesMappingDTO> getInputMapping(String caseNumberId);
+}

+ 18 - 0
mrman-service/src/main/java/com/diagbot/service/QcInputcasesService.java

@@ -0,0 +1,18 @@
+package com.diagbot.service;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.QcInputcases;
+
+/**
+ * <p>
+ * 病历录入 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+
+public interface QcInputcasesService extends IService<QcInputcases> {
+
+}

+ 13 - 0
mrman-service/src/main/java/com/diagbot/service/impl/ArRechomeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
 import com.diagbot.entity.ArRechome;
@@ -7,6 +8,8 @@ import com.diagbot.mapper.ArRechomeMapper;
 import com.diagbot.service.ArRechomeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,4 +42,14 @@ public class ArRechomeServiceImpl extends ServiceImpl<ArRechomeMapper, ArRechome
     public BABLDetailDTO getBABLDetail(BABLVO bablvo) {
         return this.baseMapper.getBABLDetail(bablvo);
     }
+
+    /**
+     * 病案病历记录分页查询
+     *
+     * @param bazyPageVO
+     * @return
+     */
+    public IPage<BABLDTO> getBAZYPage(@Param("bazyPageVO") BAZYPageVO bazyPageVO) {
+        return this.baseMapper.getBAZYPage(bazyPageVO);
+    }
 }

+ 20 - 0
mrman-service/src/main/java/com/diagbot/service/impl/CasesNumberServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.CasesNumber;
+import com.diagbot.mapper.CasesNumberMapper;
+import com.diagbot.service.CasesNumberService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@Service
+public class CasesNumberServiceImpl extends ServiceImpl<CasesNumberMapper, CasesNumber> implements CasesNumberService {
+
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/service/impl/ModeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.Mode;
+import com.diagbot.mapper.ModeMapper;
+import com.diagbot.service.ModeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@Service
+public class ModeServiceImpl extends ServiceImpl<ModeMapper, Mode> implements ModeService {
+
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/service/impl/ModelMappingServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.ModelMapping;
+import com.diagbot.mapper.ModelMappingMapper;
+import com.diagbot.service.ModelMappingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历内容 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2020-03-23
+ */
+@Service
+public class ModelMappingServiceImpl extends ServiceImpl<ModelMappingMapper, ModelMapping> implements ModelMappingService {
+
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/service/impl/QcCasesEntryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.QcCasesEntry;
+import com.diagbot.mapper.QcCasesEntryMapper;
+import com.diagbot.service.QcCasesEntryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历条目 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+@Service
+public class QcCasesEntryServiceImpl extends ServiceImpl<QcCasesEntryMapper, QcCasesEntry> implements QcCasesEntryService {
+
+}

+ 27 - 0
mrman-service/src/main/java/com/diagbot/service/impl/QcCasesServiceImpl.java

@@ -0,0 +1,27 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.QcCasesDTO;
+import com.diagbot.entity.QcCases;
+import com.diagbot.mapper.QcCasesMapper;
+import com.diagbot.service.QcCasesService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 病历 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+@Service
+public class QcCasesServiceImpl extends ServiceImpl<QcCasesMapper, QcCases> implements QcCasesService {
+
+
+    public List<QcCasesDTO> getCasesLists(Long casesId) {
+        return baseMapper.getCasesList(casesId);
+    }
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/service/impl/QcHospitalInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcHospitalInfo;
+import com.diagbot.mapper.QcHospitalInfoMapper;
+import com.diagbot.service.QcHospitalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 医院信息表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+@Service
+public class QcHospitalInfoServiceImpl extends ServiceImpl<QcHospitalInfoMapper, QcHospitalInfo> implements QcHospitalInfoService {
+
+}

+ 31 - 0
mrman-service/src/main/java/com/diagbot/service/impl/QcInputcasesMappingServiceImpl.java

@@ -0,0 +1,31 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.QcInputcasesMappingDTO;
+import com.diagbot.entity.QcInputcasesMapping;
+import com.diagbot.mapper.QcInputcasesMappingMapper;
+import com.diagbot.service.QcInputcasesMappingService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 病历录入关系 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+@Service
+public class QcInputcasesMappingServiceImpl extends ServiceImpl<QcInputcasesMappingMapper, QcInputcasesMapping> implements QcInputcasesMappingService {
+
+    @Override
+    public List<QcInputcasesMappingDTO> getInputMapping(String caseNumberId) {
+        return baseMapper.getInputMapping(caseNumberId);
+    }
+
+    public List<QcInputcasesMappingDTO> getQcInputMappings(Long textId){
+        return  baseMapper.getQcInputMapping(textId);
+    }
+}

+ 20 - 0
mrman-service/src/main/java/com/diagbot/service/impl/QcInputcasesServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.QcInputcases;
+import com.diagbot.mapper.QcInputcasesMapper;
+import com.diagbot.service.QcInputcasesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病历录入 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+@Service
+public class QcInputcasesServiceImpl extends ServiceImpl<QcInputcasesMapper, QcInputcases> implements QcInputcasesService {
+
+}

+ 11 - 0
mrman-service/src/main/java/com/diagbot/vo/BAZYPageVO.java

@@ -0,0 +1,11 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BAZYPageVO extends Page {
+    private String brbaxm;
+}

+ 30 - 0
mrman-service/src/main/java/com/diagbot/vo/QcInputMappingSaveVO.java

@@ -0,0 +1,30 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-11 9:01
+ */
+@Setter
+@Getter
+public class QcInputMappingSaveVO {
+
+    /**
+     * 病历id
+     */
+    private Long casesId;
+
+    /**
+     * 病历条目id
+     */
+    private Long casesEntryId;
+
+    /**
+     * 是否通过
+     */
+    private Integer pass;
+
+}

+ 19 - 0
mrman-service/src/main/java/com/diagbot/vo/QcInputcasesAllVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-11 10:43
+ */
+@Setter
+@Getter
+public class QcInputcasesAllVO {
+    private  Long textId;
+
+    private String caseNumber;
+
+    private String hospitalName;
+}

+ 17 - 0
mrman-service/src/main/java/com/diagbot/vo/QcInputcasesByIdVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-11 11:13
+ */
+@Setter
+@Getter
+public class QcInputcasesByIdVO {
+    private  String creator;
+    private  Long textId;
+    private  Long caseNumberId;
+}

+ 102 - 0
mrman-service/src/main/java/com/diagbot/vo/QcInputcasesSaveVO.java

@@ -0,0 +1,102 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-11 8:57
+ */
+@Setter
+@Getter
+public class QcInputcasesSaveVO {
+
+    /**
+     * 病例id
+     */
+    private Long id;
+    private Integer hospitalId;
+    /**
+     * 病历文本
+     */
+    private String text;
+
+    private String creator;
+    /**
+     * 临床用血审核
+     */
+    private String clinicalBlood;
+
+    /**
+     * 会诊
+     */
+    private String consultation;
+
+    /**
+     * 死亡病例讨论
+     */
+    private String deathCaseDiscuss;
+
+    /**
+     * 死亡记录
+     */
+    private String deathRecord;
+
+    /**
+     * 疑难病例讨论
+     */
+    private String difficultCaseDiscuss;
+
+    /**
+     * 值班交接班
+     */
+    private String dutyShiftSystem;
+
+    /**
+     * 首次病程录
+     */
+    private String firstCourseRecord;
+
+    /**
+     * 出院小结
+     */
+    private String leaveHospital;
+
+    /**
+     * 分级护理
+     */
+    private String nursingSystem;
+
+    /**
+     * 手术期间讨论
+     */
+    private String operationDiscussion;
+
+    /**
+     * 术前讨论
+     */
+    private String preOperativeDiscussion;
+
+    /**
+     * 三级查房
+     */
+    private String threeLevelWard;
+
+    /**
+     * 危急值报告
+     */
+    private String criticalValue;
+
+    private List<QcInputMappingSaveVO> qcInputMappingSaveVO;
+
+    private Long caseNumberId;
+
+    private String caseNumber;
+
+    private Long modeId;
+
+    private String isTag;
+}

+ 11 - 0
mrman-service/src/main/java/com/diagbot/vo/QcInputcasesVO.java

@@ -0,0 +1,11 @@
+package com.diagbot.vo;
+
+import com.diagbot.entity.QcInputcases;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-03-10 17:19
+ */
+public class QcInputcasesVO extends QcInputcases {
+}

+ 11 - 1
mrman-service/src/main/java/com/diagbot/web/ArRechomeController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.BABLDTO;
 import com.diagbot.dto.BABLDetailDTO;
@@ -11,6 +12,7 @@ import com.diagbot.facade.ArRechomeFacade;
 import com.diagbot.facade.MrMrcontentFacade;
 import com.diagbot.vo.BABLDetailVO;
 import com.diagbot.vo.BABLVO;
+import com.diagbot.vo.BAZYPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +32,7 @@ import java.util.List;
  * @since 2020-01-17
  */
 @RestController
-@Api(value = "病案首页信息API", tags = { "病案首页信息API" })
+@Api(value = "ORACLE-病案首页信息API", tags = { "ORACLE-病案首页信息API" })
 @RequestMapping("/arRechome")
 @SuppressWarnings("unchecked")
 public class ArRechomeController {
@@ -63,6 +65,14 @@ public class ArRechomeController {
         return RespDTO.onSuc(arRechomeFacade.getAllList());
     }
 
+    @ApiOperation(value = "病案病历记录分页查询[by:zhaops]",
+            notes = "病案病历记录分页查询")
+    @PostMapping("/getBAZYPage")
+    @SysLogger("getBAZYPage")
+    public RespDTO<IPage<BABLDTO>> getBAZYPage(@RequestBody BAZYPageVO bazyPageVO) {
+        return RespDTO.onSuc(arRechomeFacade.getBAZYPage(bazyPageVO));
+    }
+
     @ApiOperation(value = "获取病案详情[by:zhaops]",
             notes = "获取病案详情")
     @PostMapping("/getBABLContent")

+ 0 - 20
mrman-service/src/main/java/com/diagbot/web/BrRecdiagnoseController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 病案诊断信息 前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2020-01-17
- */
-@Controller
-@RequestMapping("/brRecdiagnose")
-public class BrRecdiagnoseController {
-
-}

+ 0 - 20
mrman-service/src/main/java/com/diagbot/web/BrRecinhosController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 病案住院信息 前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2020-01-17
- */
-@Controller
-@RequestMapping("/brRecinhos")
-public class BrRecinhosController {
-
-}

+ 0 - 20
mrman-service/src/main/java/com/diagbot/web/MrMedicalrecordsController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2020-01-17
- */
-@Controller
-@RequestMapping("/mrMedicalrecords")
-public class MrMedicalrecordsController {
-}

+ 0 - 20
mrman-service/src/main/java/com/diagbot/web/MrMrcontentController.java

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author gaodm
- * @since 2020-01-17
- */
-@Controller
-@RequestMapping("/mrMrcontent")
-public class MrMrcontentController {
-
-}

+ 53 - 0
mrman-service/src/main/java/com/diagbot/web/QcCasesController.java

@@ -0,0 +1,53 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.QcCasesAllDTO;
+import com.diagbot.dto.QcCasesDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.QcCasesFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 病历 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+@RestController
+@RequestMapping("/qcCases")
+@Api(value = "病历模块相关接口", tags = { "病历模块相关接口" })
+public class QcCasesController {
+
+    @Autowired
+    private QcCasesFacade qcCasesFacade;
+
+    @ApiOperation(value = "获取全部模块及条目[by:wangfeng]",
+            notes = "获取全部模块及条目")
+    @PostMapping("/getAll")
+    @SysLogger("getAll")
+    public RespDTO<List<QcCasesAllDTO>> getAll() {
+        List<QcCasesAllDTO> data =qcCasesFacade.getAlls();
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "获取全部模块[by:wangfeng]",
+            notes = "获取全部模块")
+    @PostMapping("/getCases")
+    @SysLogger("getCases")
+    public RespDTO<List<QcCasesDTO>> getCasesAlls() {
+
+        return RespDTO.onSuc(qcCasesFacade.getCasesAll());
+    }
+}

+ 22 - 0
mrman-service/src/main/java/com/diagbot/web/QcCasesEntryController.java

@@ -0,0 +1,22 @@
+package com.diagbot.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 病历条目 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+
+@RestController
+@RequestMapping("/qcCasesEntry")
+@Api(value = "病历条目相关接口", tags = { "病历条目相关接口" })
+public class QcCasesEntryController {
+
+}

+ 45 - 0
mrman-service/src/main/java/com/diagbot/web/QcHospitalInfoController.java

@@ -0,0 +1,45 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.QcHospitalInfoAllDTO;
+import com.diagbot.dto.QcInputcasesAllDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.QcHospitalInfoFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 医院信息表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-17
+ */
+
+@RestController
+@RequestMapping("/qcHospitalInfo")
+@Api(value = "医院信息相关接口", tags = { "医院信息相关接口" })
+public class QcHospitalInfoController {
+
+    @Autowired
+    QcHospitalInfoFacade qcHospitalInfoFacade;
+
+    @ApiOperation(value = "获取医院信息[by:wangfeng]",
+            notes = "获取医院信息")
+    @PostMapping("/getHospitalInfoAll")
+    @SysLogger("getHospitalInfoAll")
+    public RespDTO<List<QcHospitalInfoAllDTO>> getHospitalInfoAll() {
+        List<QcHospitalInfoAllDTO> data = qcHospitalInfoFacade.getHospitalInfoAll();
+        return RespDTO.onSuc(data);
+    }
+}

+ 122 - 0
mrman-service/src/main/java/com/diagbot/web/QcInputcasesController.java

@@ -0,0 +1,122 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.QcAllInputcasesDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.QcInputcasesFacade;
+import com.diagbot.vo.QcInputcasesAllVO;
+import com.diagbot.vo.QcInputcasesByIdVO;
+import com.diagbot.vo.QcInputcasesSaveVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 病历录入 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+@RestController
+@RequestMapping("/qcInputcases")
+@Api(value = "病历录入相关接口", tags = { "病历录入相关接口" })
+public class QcInputcasesController{
+
+    @Autowired
+    QcInputcasesFacade qcInputcasesFacade;
+
+    /*@ApiOperation(value = "获取全部病历录入[by:wangfeng]",
+            notes = "获取全部病历录入")
+    @PostMapping("/getInputcasesAll")
+    @SysLogger("getInputcasesAll")
+    public RespDTO<List<QcInputcasesAllDTO>> getInputcasesAll(@Valid @RequestBody QcInputcasesAllVO qcInputcasesAllVO) {
+        List<QcInputcasesAllDTO> data = qcInputcasesFacade.getInputcasesAlls(qcInputcasesAllVO.getTextId());
+        return RespDTO.onSuc(data);
+    }*/
+    @ApiOperation(value = "保存和修改全部病历录入[by:wangfeng]",
+            notes = "id; 病历id(保存不传,修改必传)医院Id:hospitalId;" +
+                    "入院记录: text;" +
+                    " 临床用血审核: clinicalBlood;" +
+                    "会诊: consultation;" +
+                    "死亡病例讨论: deathCaseDiscuss;" +
+                    "死亡记录:deathRecord;" +
+                    "疑难病例讨论:difficultCaseDiscuss;" +
+                    "值班交接班:dutyShiftSystem;" +
+                    "首次病程录: firstCourseRecord;" +
+                    "出院小结: leaveHospital;" +
+                    "分级护理:nursingSystem; " +
+                    "手术期间讨论: operationDiscussion;" +
+                    "术前讨论: preOperativeDiscussion;" +
+                    "三级查房:threeLevelWard; " +
+                    "危急值报告:criticalValue;" +
+                    "qcInputMappingSaveVO{textId: 病历文本id ;casesId: 模块id;casesEntryId: 条目id ;pass:是否通过"+
+                    "}")
+    @PostMapping("/getInputcasesAlls")
+    @SysLogger("getInputcasesAlls")
+    public RespDTO<Boolean> saveAndUpdata(@Valid @RequestBody QcInputcasesSaveVO qcInputcasesSaveVO) {
+        boolean res = qcInputcasesFacade.saveAndUpdatas(qcInputcasesSaveVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "删除病历录入[by:wangfeng]",
+            notes = "删除病历录入病历录入")
+    @PostMapping("/cancelById")
+    @SysLogger("cancelById")
+    public RespDTO<Boolean> cancelById(@Valid @RequestBody QcInputcasesByIdVO qcInputcasesByIdVO) {
+        boolean res = qcInputcasesFacade.cancelByIds(qcInputcasesByIdVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "删除病历录入[by:wangyu]",
+            notes = "删除病历录入病历录入")
+    @PostMapping("/deleteById")
+    @SysLogger("deleteById")
+    public RespDTO<Boolean> deleteById(@Valid @RequestBody QcInputcasesByIdVO qcInputcasesByIdVO) {
+        boolean res = qcInputcasesFacade.deleteById(qcInputcasesByIdVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "获取全部病历录入[by:wangyu]",
+            notes = "获取全部病历录入")
+    @PostMapping("/getAllInputcases")
+    @SysLogger("getAllInputcases")
+    public RespDTO<List<QcAllInputcasesDTO>> getAllInputcases(@Valid @RequestBody QcInputcasesAllVO qcInputcasesAllVO) {
+        List<QcAllInputcasesDTO> data = qcInputcasesFacade.getAllInputcases(qcInputcasesAllVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "保存和修改全部病历录入[by:wangfeng]",
+            notes = "id; 病历id(保存不传,修改必传)医院Id:hospitalId;" +
+                    "入院记录: text;" +
+                    " 临床用血审核: clinicalBlood;" +
+                    "会诊: consultation;" +
+                    "死亡病例讨论: deathCaseDiscuss;" +
+                    "死亡记录:deathRecord;" +
+                    "疑难病例讨论:difficultCaseDiscuss;" +
+                    "值班交接班:dutyShiftSystem;" +
+                    "首次病程录: firstCourseRecord;" +
+                    "出院小结: leaveHospital;" +
+                    "分级护理:nursingSystem; " +
+                    "手术期间讨论: operationDiscussion;" +
+                    "术前讨论: preOperativeDiscussion;" +
+                    "三级查房:threeLevelWard; " +
+                    "危急值报告:criticalValue;" +
+                    "qcInputMappingSaveVO{textId: 病历文本id ;casesId: 模块id;casesEntryId: 条目id ;pass:是否通过"+
+                    "}")
+    @PostMapping("/saveOrUpdata")
+    @SysLogger("saveOrUpdata")
+    public RespDTO<Boolean> saveOrUpdata(@Valid @RequestBody QcInputcasesSaveVO qcInputcasesSaveVO) {
+        boolean res = qcInputcasesFacade.saveOrUpdata(qcInputcasesSaveVO);
+        return RespDTO.onSuc(res);
+    }
+}

+ 22 - 0
mrman-service/src/main/java/com/diagbot/web/QcInputcasesMappingController.java

@@ -0,0 +1,22 @@
+package com.diagbot.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 病历录入关系 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-03-10
+ */
+
+@RestController
+@RequestMapping("/qcInputcasesMapping")
+@Api(value = "病历录入关系相关接口", tags = { "病历录入关系相关接口" })
+public class QcInputcasesMappingController {
+
+}

+ 11 - 0
mrman-service/src/main/resources/mapper/ArRechomeMapper.xml

@@ -49,6 +49,17 @@
         where t1.BASYID=t2.BASYID
     </select>
 
+    <!--住院记录分页查询-->
+    <select id="getBAZYPage" resultType="com.diagbot.dto.BABLDTO">
+        select
+            t1.BRBAXM,t1.BASYID,t2.BRZYID
+            from AR_RECHOME t1,BR_RECINHOS t2
+        where t1.BASYID=t2.BASYID
+        <if test="bazyPageVO.brbaxm != null and bazyPageVO.brbaxm !=''">
+            AND t1.BRBAXM like concat(concat('%',#{bazyPageVO.brbaxm}),'%')
+        </if>
+    </select>
+
     <!-- 病案首页基础信息 -->
     <select id="getBABLDetail" parameterType="com.diagbot.vo.BABLVO" resultType="com.diagbot.dto.BABLDetailDTO">
     SELECT

+ 19 - 0
mrman-service/src/main/resources/mapper/CasesNumberMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.CasesNumberMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.CasesNumber">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="case_number" property="caseNumber" />
+        <result column="is_tag" property="isTag" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 17 - 0
mrman-service/src/main/resources/mapper/ModeMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.ModeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Mode">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 19 - 0
mrman-service/src/main/resources/mapper/ModelMappingMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.ModelMappingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.ModelMapping">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="case_number_id" property="caseNumberId" />
+        <result column="mode_id" property="modeId" />
+        <result column="text" property="text" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 18 - 0
mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.QcCasesEntryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcCasesEntry">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="cases_id" property="casesId" />
+        <result column="name" property="name" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 35 - 0
mrman-service/src/main/resources/mapper/QcCasesMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.QcCasesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcCases">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="name" property="name"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <select id="getCasesList" parameterType="Long" resultType="com.diagbot.dto.QcCasesDTO">
+        SELECT
+        a.id as id,
+        a.name as casesName,
+        b.id as entryId,
+        b.name as entryName,
+        b.cases_id as casesId
+        FROM
+        qc_cases a
+        JOIN qc_cases_entry b
+        ON a.id = b.cases_id
+        WHERE a.is_deleted = "N"
+        AND b.is_deleted = "N"
+        <if test="casesId !=null">
+            AND a.id = #{casesId}
+        </if>
+
+    </select>
+</mapper>

+ 23 - 0
mrman-service/src/main/resources/mapper/QcHospitalInfoMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.QcHospitalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcHospitalInfo">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="address" property="address" />
+        <result column="spell" property="spell" />
+        <result column="status" property="status" />
+        <result column="order_no" property="orderNo" />
+        <result column="connect" property="connect" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 31 - 0
mrman-service/src/main/resources/mapper/QcInputcasesMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.QcInputcasesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcInputcases">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="text" property="text" />
+        <result column="clinical_blood" property="clinicalBlood" />
+        <result column="consultation" property="consultation" />
+        <result column="death_case_discuss" property="deathCaseDiscuss" />
+        <result column="death_record" property="deathRecord" />
+        <result column="difficult_case_discuss" property="difficultCaseDiscuss" />
+        <result column="duty_shift_system" property="dutyShiftSystem" />
+        <result column="first_course_record" property="firstCourseRecord" />
+        <result column="leave_hospital" property="leaveHospital" />
+        <result column="nursing_system" property="nursingSystem" />
+        <result column="operation_discussion" property="operationDiscussion" />
+        <result column="pre_operative_discussion" property="preOperativeDiscussion" />
+        <result column="three_level_ward" property="threeLevelWard" />
+        <result column="critical_value" property="criticalValue" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 64 - 0
mrman-service/src/main/resources/mapper/QcInputcasesMappingMapper.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.QcInputcasesMappingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcInputcasesMapping">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="text_id" property="textId"/>
+        <result column="cases_id" property="casesId"/>
+        <result column="cases_entry_id" property="casesEntryId"/>
+        <result column="pass" property="pass"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <select id="getQcInputMapping" parameterType="Long" resultType="com.diagbot.dto.QcInputcasesMappingDTO">
+
+        SELECT
+        a.id AS Id,
+        a.text_id AS textId,
+        a.cases_id AS casesId,
+        c.name AS casesName,
+        a.cases_entry_id AS casesEntryId,
+        b.name AS EntryName,
+        a.pass AS pass
+        FROM qc_inputcases_mapping a
+        JOIN qc_cases_entry b ON a.cases_entry_id = b.id
+        JOIN qc_cases c ON a.cases_id = c.id
+        WHERE a.is_deleted ="N"
+        AND b.is_deleted ="N"
+        AND c.is_deleted ="N"
+        <if test="textId != null ">
+            AND a.text_id = #{textId}
+        </if>
+
+    </select>
+
+    <select id="getInputMapping" parameterType="Long" resultType="com.diagbot.dto.QcInputcasesMappingDTO">
+
+        SELECT
+        a.id AS Id,
+        a.case_number_id AS caseNumberId,
+        a.cases_id AS casesId,
+        c.name AS casesName,
+        a.cases_entry_id AS casesEntryId,
+        b.name AS EntryName,
+        a.pass AS pass
+        FROM qc_inputcases_mapping a
+        JOIN qc_cases_entry b ON a.cases_entry_id = b.id
+        JOIN qc_cases c ON a.cases_id = c.id
+        JOIN qc_cases_number d ON a.case_number_id = d.id
+        WHERE a.is_deleted ="N"
+        AND b.is_deleted ="N"
+        AND c.is_deleted ="N"
+        <if test="caseNumberId != null ">
+            AND d.case_number LIKE CONCAT('%', #{caseNumberId},'%')
+        </if>
+
+    </select>
+</mapper>