Browse Source

add 看护人列表

18339543638 3 years ago
parent
commit
045121fe50

+ 6 - 8
nb-admin/src/main/resources/application-dev.yml

@@ -14,14 +14,12 @@ app:
   cachePrefix: ${app.name}:dev
 # MinIO相关配置
 minio:
-  upload:
-    endpoint: 192.168.100.32
-    port: 7001
-    secure: false
-  down:
-    endpoint: 192.168.100.32
-    port: 7001
-    secure: false
+  uploadEndpoint: 192.168.100.32
+  uploadPort: 7001
+  uploadSecure: false
+  downEndpoint: 192.168.100.32
+  downPort: 7002
+  downSecure: false
   accessKey: nbnetpump
   secretKey: tuoren123
   bucketName: ${app.name}-${profiles.active}-bucket

+ 2 - 1
nb-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   application:
     name: nb
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
 
@@ -24,6 +24,7 @@ server:
     threads:
       io: 16
       worker: 256
+    no-request-timeout: 3m
 tio:
   websocket:
     server:

+ 2 - 1
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/his/HisScriptSession.java

@@ -184,7 +184,8 @@ public class HisScriptSession {
         }
         DeferredResult<R<BusClinicEntity>> result = new DeferredResult<>(unit.toMillis(timeout));
         if(!online){
-            BusClinicEntity clinic = clinicService.recentClinicByPatientCode(hospitalId, patientCode);
+            BusPatientEntity patient = patientService.getOneByHospitalAndPatientCode(hospitalId, patientCode);
+            BusClinicEntity clinic = clinicService.getById(patient.getClinicId());
             if(clinic==null){
                 result.setResult(R.fail(""));
             }else {