Browse Source

生产

master
zhizhi wu 5 years ago
parent
commit
7c5cad64e4
  1. 6
      ht/src/main/java/com/ccsens/ht/service/PatientReportService.java
  2. 2
      ht/src/main/resources/application-prod.yml
  3. 4
      tall/src/main/resources/application-common.yml
  4. 8
      tall/src/main/resources/application-prod.yml

6
ht/src/main/java/com/ccsens/ht/service/PatientReportService.java

@ -168,9 +168,11 @@ public class PatientReportService implements IPatientReportService {
List<HtDoctor> doctors = htDoctorMapper.selectByExample(doctorExample);
log.info("当前用户是否为医生:{}", CollectionUtil.isNotEmpty(doctors));
if (query.getPatientId() != null) {
reportExample.createCriteria().andPatientIdEqualTo(query.getPatientId()).andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo("");
reportExample.createCriteria().andPatientIdEqualTo(query.getPatientId());
//.andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo("");
} else if (CollectionUtil.isNotEmpty(doctors)) {
reportExample.createCriteria().andDoctorIdEqualTo(doctors.get(0).getId()).andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo("");
reportExample.createCriteria().andDoctorIdEqualTo(doctors.get(0).getId());
//.andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo("");
} else {
log.info("既无病人信息,有无医生信息,不允许查询");
throw new BaseException(CodeEnum.PARAM_ERROR);

2
ht/src/main/resources/application-prod.yml

@ -21,7 +21,7 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
password: ''
password: 'areowqr!@43ef'
port: 6379
timeout: 1000ms

4
tall/src/main/resources/application-common.yml

@ -24,7 +24,5 @@ spring:
multipart:
max-file-size: 10MB
max-request-size: 100MB
snowflake:
datacenterId: 1
workerId: 1

8
tall/src/main/resources/application-prod.yml

@ -3,6 +3,9 @@ server:
servlet:
context-path: /v1.0
spring:
snowflake:
datacenterId: 1
workerId: 1
application:
name: tall
datasource:
@ -21,12 +24,15 @@ spring:
max-idle: 10
max-wait: -1ms
min-idle: 0
password: ''
password: 'areowqr!@43ef'
port: 6379
timeout: 1000ms
swagger:
enable: false
eureka:
instance:
# www.tall.wiki
ip-address: 140.143.228.3
# ip-address: 192.144.182.42
gatewayUrl: https://www.tall.wiki/gateway/
Loading…
Cancel
Save