From aa634ded42bd64252bb892e2c6c49072a0908735 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 26 Feb 2021 11:56:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=89=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tcm/src/main/java/com/ccsens/tcm/api/HospatilController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tcm/src/main/java/com/ccsens/tcm/api/HospatilController.java b/tcm/src/main/java/com/ccsens/tcm/api/HospatilController.java index 771e24a7..23569fec 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/HospatilController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/HospatilController.java @@ -27,7 +27,6 @@ public class HospatilController { @Resource private IPatientService patientService; - @MustLogin @ApiOperation(value = "查询医院列表", notes = "w:医院列表查询") @RequestMapping(value = "/selHospatil", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) public JsonResponse> selHospatil() { From b41806bbcc5acf093bf0d6129b5dddc297b8c1e9 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 26 Feb 2021 15:27:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java | 2 ++ tcm/src/main/java/com/ccsens/tcm/service/PatientService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java index 54fe2aad..8d27fa62 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java @@ -43,6 +43,8 @@ public class StatisticVo { private Long inpatientId; @ApiModelProperty("试题数量") private List list; + @ApiModelProperty("对照组名称") + private String name; } @Data @ApiModel("病例分析详细数量") diff --git a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java index 0163fcf9..ea9ba0a8 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -267,6 +267,7 @@ public class PatientService implements IPatientService { List selGroupNumsList= new ArrayList(); if(param.getInpatientId()!=null && param.getInpatientId().length==0) { StatisticVo.SelGroupNum selGroupNum =new StatisticVo.SelGroupNum(); + selGroupNum.setName("总人数"); List selGroupList= patientDao.countAnalysis(param.getConditionList(),param.getConditionListDate(),null,param.getTestQuestionsId(),param.getHospitalization(),param.getInputStatus(),param.getHospitalId()); selGroupNum.setInpatientId(null); selGroupNum.setList(selGroupList); @@ -275,6 +276,7 @@ public class PatientService implements IPatientService { } for (int i = 0; i < param.getInpatientId().length; i++) { StatisticVo.SelGroupNum selGroupNum =new StatisticVo.SelGroupNum(); + selGroupNum.setName(inpatientMapper.selectByPrimaryKey(param.getInpatientId()[i]).getName()); List selGroupList= patientDao.countAnalysis(param.getConditionList(),param.getConditionListDate(),param.getInpatientId()[i],param.getTestQuestionsId(),param.getHospitalization(),param.getInputStatus(),param.getHospitalId()); selGroupNum.setInpatientId(param.getInpatientId()[i]); selGroupNum.setList(selGroupList); From 45384035d16149e2e65786d0cff12148ea910cbb Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 26 Feb 2021 18:00:50 +0800 Subject: [PATCH 3/3] tijiaodaima --- cloudutil/src/main/resources/application-util-test.yml | 2 +- tcm/src/main/resources/application-test.yml | 6 +++--- tcm/src/main/resources/druid-test.yml | 4 ++-- tcm/src/main/resources/mapper_dao/PatientDao.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 5c829176..763f5b33 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -82,7 +82,7 @@ eureka: service-url: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ - defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ + defaultZone: http://admin:admin@49.232.6.143:7010/eureka/ # defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server diff --git a/tcm/src/main/resources/application-test.yml b/tcm/src/main/resources/application-test.yml index 92d2cc05..2e527a77 100644 --- a/tcm/src/main/resources/application-test.yml +++ b/tcm/src/main/resources/application-test.yml @@ -28,11 +28,11 @@ swagger: enable: true eureka: instance: - ip-address: 192.168.0.99 + ip-address: 49.232.6.143 file: path: /home/cloud/tcm/uploads/ - domain: https://test.tall.wiki/gateway/tcm/ - imgDomain: https://test.tall.wiki/gateway/tcm/uploads/ + domain: https://www.sxwikionline.com/gateway/tcm/ + imgDomain: https://www.sxwikionline.com/gateway/tcm/uploads/ day: one: 9 two: 30 diff --git a/tcm/src/main/resources/druid-test.yml b/tcm/src/main/resources/druid-test.yml index 9210cf42..9c2a7d09 100644 --- a/tcm/src/main/resources/druid-test.yml +++ b/tcm/src/main/resources/druid-test.yml @@ -15,7 +15,7 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 + password: poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://test.tall.wiki/tcm?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://127.0.0.1/tcm?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index 51c9e569..07e96ca2 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -175,7 +175,7 @@ SELECT - '' as content, + '总人数' as content, ti.name, count( * ) AS nums FROM