修改生物样本搜索结果排序

tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java

@@ -59,9 +59,9 @@ public class StatisticalAnalysisController {
     @MustLogin
     @ApiOperation(value = "统计病例的完成情况", notes = "zy:")
     @RequestMapping(value = "/complete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<StatisticVo.StatisticsComplete> statisticsComplete(@ApiParam @Validated @RequestBody QueryDto<StatisticDto.Complete> params) {
+    public JsonResponse<List<StatisticVo.StatisticsComplete>> statisticsComplete(@ApiParam @Validated @RequestBody QueryDto<StatisticDto.Complete> params) {
         log.info("统计病例的完成情况：{}",params);
-        StatisticVo.StatisticsComplete statisticsComplete = patientService.statisticsComplete(params.getParam());
+        List<StatisticVo.StatisticsComplete> statisticsComplete = patientService.statisticsComplete(params.getParam());
         log.info("查找统计病例的完成情况");
         return JsonResponse.newInstance().ok(statisticsComplete);
     }

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

@@ -60,16 +60,12 @@ public class StatisticVo {
     @Data
     @ApiModel("统计病例的完成情况")
     public static class StatisticsComplete{
-        @ApiModelProperty("已完成")
+        @ApiModelProperty("输入状态")
-        private Integer completed;
+        private Byte id;
-        @ApiModelProperty("未完成")
+        @ApiModelProperty("新建")
-        private Integer unfinished;
+        private String name;
-        @ApiModelProperty("进行中")
+        @ApiModelProperty("数量")
-        private Integer underway;
+        private Integer nums;
-        @ApiModelProperty("数据采集超时")
-        private Integer overtime;
-        @ApiModelProperty("废弃的")
-        private Integer discarded;
     }
 
     @Data

tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java

@@ -45,7 +45,7 @@ public interface PatientDao {
      * @param userId 主治医生id
      * @return 返回完成情况
      */
-    StatisticVo.StatisticsComplete statisticsComplete(@Param("hospitalId")Long hospitalId, @Param("userId")Long userId);
+    List<StatisticVo.StatisticsComplete> statisticsComplete(@Param("hospitalId")Long hospitalId, @Param("userId")Long userId);
 
     /**
      * 查询各个医院的病例完成情况

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

@@ -43,7 +43,7 @@ public interface IPatientService {
      * @param param 搜索的条件
      * @return 返回完成的情况
      */
-    StatisticVo.StatisticsComplete statisticsComplete(StatisticDto.Complete param);
+    List<StatisticVo.StatisticsComplete> statisticsComplete(StatisticDto.Complete param);
 
     /**
      * 统计各个医院的病例完成情况

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

@@ -308,7 +308,7 @@ public class PatientService implements IPatientService {
      * 统计病例完成情况
      */
     @Override
-    public StatisticVo.StatisticsComplete statisticsComplete(StatisticDto.Complete param) {
+    public List<StatisticVo.StatisticsComplete> statisticsComplete(StatisticDto.Complete param) {
         return patientDao.statisticsComplete(param.getHospitalId(),param.getUserId());
     }
 
@@ -347,7 +347,7 @@ public class PatientService implements IPatientService {
 
     @Override
     public PageInfo<BiologicalSamplesVo.selBiolog> selBiologicalSamples(BiologicalSamplesDto.SelBiolog param, Long userId) {
-        PageHelper.startPage(param.getPageNum(),param.getPageSize());
+        PageHelper.startPage(param.getPageNum(),param.getPageSize(),"tbs.update_at desc");
         List<BiologicalSamplesVo.selBiolog> selBiologs=  patientDao.selBiologicalSamples(param);
         return new PageInfo<>(selBiologs);
     }

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

@@ -309,16 +309,17 @@
         </if>
     </select>
     <select id="statisticsComplete" resultType="com.ccsens.tcm.bean.vo.StatisticVo$StatisticsComplete">
+
         SELECT
-        MAX(CASE t.input_status WHEN 0 THEN nums ELSE 0 END ) unfinished,
+        input_status as id,
-        MAX(CASE t.input_status WHEN 1 THEN nums ELSE 0 END ) underway,
+        (case input_status
-        MAX(CASE t.input_status WHEN 2 THEN nums ELSE 0 END ) completed,
+        when 0 THEN '新建'
-        MAX(CASE t.input_status WHEN 3 THEN nums ELSE 0 END ) overtime,
+        when 1 then '数据搜集中'
-        MAX(CASE t.input_status WHEN 4 THEN nums ELSE 0 END ) discarded
+        when 2 then '数据搜集完成'
-        FROM(
+        when 3 then '数据搜集超时'
-        SELECT
+        when 4 then '废弃'
-            input_status,
+        END) as  name,
-            count(*) as nums
+        count(*) as nums
         FROM
             t_patient_information
         WHERE
@@ -328,7 +329,7 @@
             </if>
         GROUP BY
             input_status
-        ) t
+
     </select>
     <select id="completeHospital" resultType="com.ccsens.tcm.bean.vo.StatisticVo$CompleteHospital">
         SELECT