sql

pom.xml

@@ -20,7 +20,7 @@
 <!--        <module>pims</module>-->
 <!--        <module>health</module>-->
 <!--        <module>ct</module>-->
-<!--        <module>tcm</module>-->
+        <module>tcm</module>
 <!--        <module>ocr</module>-->
 
     </modules>

tcm/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
   rabbitmq:
 #    host: 192.144.182.42
 #    host: test.tall.wiki
-    host: 192.168.31.13
+    host: 192.168.4.113
     password: 111111
     port: 5672
     username: admin

tcm/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: dev
+    include: common, util-dev
 

tcm/src/main/resources/druid-dev.yml

@@ -16,8 +16,8 @@ spring:
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
 #      password: 37080c1f223685592316b02dad8816c019290a476e54ebb638f9aa3ba8b6bdb9
-#      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
-      password: 6ba13d9930a6ad888a3704376c920a75
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+#      password: 6ba13d9930a6ad888a3704376c920a75
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -29,11 +29,11 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-#      url: jdbc:mysql://49.233.89.188:3306/tcm?useUnicode=true&characterEncoding=UTF-8
-      url: jdbc:mysql://49.232.6.143:3306/tcm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://49.233.89.188:3306/tcm?useUnicode=true&characterEncoding=UTF-8
+#      url: jdbc:mysql://49.232.6.143:3306/tcm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
 #      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME
-#      env: CCSENS_TALL
-      env: CCSENS_GREENVALLEY
+      env: CCSENS_TALL
+#      env: CCSENS_GREENVALLEY

tcm/src/main/resources/mapper_dao/PatientDao.xml

@@ -52,7 +52,7 @@
             tpi.user_id as userId,
             d.`name` as doctorName
         FROM
-            t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id
+            t_patient_information tpi left join t_inpatient ti on ti.rec_status IN ( 0, 1 ) and ti.id=tpi.inpatient_id
             left join t_hospital th on th.rec_status=0 and th.id=tpi.hospital_id
         LEFT JOIN t_doctor d on tpi.user_id = d.user_id and d.rec_status = 0
         WHERE