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

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author wang
@@ -50,4 +51,12 @@ public class BiologicalSamplesController {
         log.info("查询生物样本完成");
         return JsonResponse.newInstance().ok(selBiologPageInfo);
     }
+    @MustLogin
+    @ApiOperation(value = "统计生物样本数量", notes = "w:统计每个医院的生物样本的数量")
+    @RequestMapping(value = "/selAllYBS", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<BiologicalSamplesVo.SelBiologNums>> selAllYBS(){
+        List<BiologicalSamplesVo.SelBiologNums> selBiologNumsList=patientService.selAllYBS();
+        return JsonResponse.newInstance().ok(selBiologNumsList);
+    }
+
 }

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

@@ -18,4 +18,14 @@ public class BiologicalSamplesVo {
         @ApiModelProperty("采集时间")
         private Integer collectTime;
     }
+    @Data
+    @ApiModel("统计医院生物样本数量")
+    public static class SelBiologNums{
+        @ApiModelProperty("医院名称")
+        private String name;
+        @ApiModelProperty("医院id")
+        private Long id;
+        @ApiModelProperty("生物样本数量")
+        private Integer nums;
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.ccsens.tcm.bean.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -12,9 +14,17 @@ public class StatisticVo {
     @ApiModel("每日分析数量统计")
     public static class SelCountS{
         @ApiModelProperty("新建的病例")
-        private Integer newNums;
+        private List<StatisticVo.Shuliang> newNums;
         @ApiModelProperty("已完成的病例")
-        private Integer overNums;
+        private List<StatisticVo.Shuliang> overNums;
+    }
+    @Data
+    @ApiModel("每日统计的数量")
+    public static class Shuliang{
+        @ApiModelProperty("时间")
+        private String shijian;
+        @ApiModelProperty("数量")
+        private Integer nums;
     }
     @Data
     @ApiModel("病例分析")

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

@@ -24,7 +24,7 @@ public interface PatientDao {
 
     List<PatientVo.SelPatient> selPatientInformationList(PatientDto.SelPatientList param);
 
-    Integer countCase(@Param("param") StatisticDto.SelCount param,@Param("inputStatus") byte inputStatus);
+    List<StatisticVo.Shuliang> countCase(@Param("param") StatisticDto.SelCount param,@Param("inputStatus") byte inputStatus);
 
     /**
      *
@@ -60,4 +60,6 @@ public interface PatientDao {
     List<StatisticVo.CompleteDoctor> completeDoctor(@Param("hospitalId")Long hospitalId);
 
     List<BiologicalSamplesVo.selBiolog> selBiologicalSamples(BiologicalSamplesDto.SelBiolog param);
+
+    List<BiologicalSamplesVo.SelBiologNums> selAllYBS();
 }

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

@@ -60,4 +60,6 @@ public interface IPatientService {
      * @return 返回医院信息
      */
     HospitalVo.SelHospitalVo getHospitalByProjectId(Long projectId);
+
+    List<BiologicalSamplesVo.SelBiologNums> selAllYBS();
 }

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

@@ -354,4 +354,10 @@ public class PatientService implements IPatientService {
         }
         return selHospitalVo;
     }
+
+    @Override
+    public List<BiologicalSamplesVo.SelBiologNums> selAllYBS() {
+        List<BiologicalSamplesVo.SelBiologNums> selBiologNumsList=  patientDao.selAllYBS();
+        return selBiologNumsList;
+    }
 }

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

@@ -135,8 +135,8 @@
             </if>
         </if>
     </select>
-    <select id="countCase" resultType="java.lang.Integer">
-        select count(*) as nums from t_patient_information tpi
+    <select id="countCase" resultType="com.ccsens.tcm.bean.vo.StatisticVo$Shuliang">
+        select DATE_FORMAT(tpi.update_at,'%Y-%d-%m') as shijian,count(*) as nums from t_patient_information tpi
         where tpi.rec_status=0
         <if test="param.userId!=null and param.userId!=0 ">
             and tpi.user_id=#{param.userId}
@@ -153,6 +153,7 @@
         <if test="param.endDate!=null">
             and tpi.update_at &lt; #{param.endDate}
         </if>
+        GROUP BY shijian
     </select>
     <select id="countAnalysis" resultType="com.ccsens.tcm.bean.vo.StatisticVo$SelGroupList">
         <if test="testQuestionsId!=null and testQuestionsId!=0">
@@ -342,4 +343,11 @@
             and tbs.collect_time=#{collectTime}
         </if>
     </select>
+    <select id="selAllYBS" resultType="com.ccsens.tcm.bean.vo.BiologicalSamplesVo$SelBiologNums">
+        select th.id,th.name,count(*) as nums from t_biological_samples tbs
+        left join t_patient_information tpi on tpi.id = tbs.patient_information_id and tpi.rec_status=0
+        left join t_hospital th on th.id=tpi.hospital_id and th.rec_status=0
+        where tbs.rec_status=0
+        group by th.id
+    </select>
 </mapper>