Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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

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<List<HospitalVo.SelHospitalVo>> selHospatil() {

tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java

@@ -43,6 +43,8 @@ public class StatisticVo {
         private Long inpatientId;
         @ApiModelProperty("试题数量")
         private List<SelGroupList> list;
+        @ApiModelProperty("对照组名称")
+        private String name;
     }
     @Data
     @ApiModel("病例分析详细数量")

tcm/src/main/java/com/ccsens/tcm/service/PatientService.java

@@ -267,6 +267,7 @@ public class PatientService implements IPatientService {
         List<StatisticVo.SelGroupNum> selGroupNumsList= new ArrayList<StatisticVo.SelGroupNum>();
         if(param.getInpatientId()!=null && param.getInpatientId().length==0) {
             StatisticVo.SelGroupNum selGroupNum =new StatisticVo.SelGroupNum();
+            selGroupNum.setName("总人数");
             List<StatisticVo.SelGroupList> 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<StatisticVo.SelGroupList> 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);

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

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

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

@@ -175,7 +175,7 @@
         </if>
         <if test="testQuestionsId==null or testQuestionsId==0">
             SELECT
-            '' as content,
+            '总人数' as content,
             ti.name,
             count( * ) AS nums
             FROM