diff --git a/pims/src/main/resources/mybatis/mybatis-config.xml b/pims/src/main/resources/mybatis/mybatis-config.xml index 06ec6488..8e2f63c5 100644 --- a/pims/src/main/resources/mybatis/mybatis-config.xml +++ b/pims/src/main/resources/mybatis/mybatis-config.xml @@ -46,7 +46,7 @@ - + diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common diff --git a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java index 23f71a8f..7d2024e2 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java @@ -81,4 +81,22 @@ public class StatisticalAnalysisController { log.info("查找每个医院的病例完成情况"); return JsonResponse.newInstance().ok(completeDoctors); } + @MustLogin + @ApiOperation(value = "临近任务统计", notes = "1007:") + @RequestMapping(value = "/adjacentTasks", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> adjacentTasks(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("临近任务统计：{}",params); + PageInfo recentAnalysisVOPageInfo=patientService.adjacentTasks(params.getParam(),params.getUserId()); + log.info("临近任务统计：{}",params); + return JsonResponse.newInstance().ok(recentAnalysisVOPageInfo); + } +// @MustLogin +// @ApiOperation(value = "进行中患者进度", notes = "1007:") +// @RequestMapping(value = "/selPatientProgress", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse> selPatientProgress(@ApiParam @Validated @RequestBody QueryDto params){ +// log.info("进行中患者进度：{}",params); +// PageInfo recentAnalysisVOPageInfo=patientService.selPatientProgress(params.getParam()); +// log.info("进行中患者进度：{}",params); +// return JsonResponse.newInstance().ok(recentAnalysisVOPageInfo); +// } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java index 9bbac284..f168bd47 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/StatisticDto.java @@ -5,12 +5,29 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; +import java.net.Inet4Address; import java.util.Date; import java.util.List; @Data public class StatisticDto { + @Data + @ApiModel("临近任务请求参数") + public static class RecentAnalysisDto{ + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + @ApiModelProperty("发病时间id，这个不用传") + private Long testQuestionsId; + } + @Data @ApiModel("每日病例统计传参") public static class SelCount{ 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 c0faf38a..2eaeaf1b 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 @@ -95,4 +95,22 @@ public class StatisticVo { @ApiModelProperty("废弃的") private Integer discarded; } + @Data + @ApiModel("临近任务-返回参数") + public static class RecentAnalysisVO{ + @ApiModelProperty("日期") + private Date shijian; + @ApiModelProperty("住院号") + private String hospitalization; + @ApiModelProperty("任务") + private String task; + } + @Data + @ApiModel("患者进度返回参数") + public static class PatientProgressVo{ + @ApiModelProperty("患者姓名") + private String name; + @ApiModelProperty("患者id") + private Long id; + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java index 5a6e0b79..08d556fb 100644 --- a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java +++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java @@ -62,4 +62,6 @@ public interface PatientDao { List selBiologicalSamples(BiologicalSamplesDto.SelBiolog param); List selAllYBS(); + + List adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java index fd4b850b..73df8c74 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -5,6 +5,7 @@ import com.ccsens.tcm.bean.dto.ConRecDto; import com.ccsens.tcm.bean.dto.PatientDto; import com.ccsens.tcm.bean.dto.StatisticDto; import com.ccsens.tcm.bean.vo.*; +import com.ccsens.util.bean.dto.QueryDto; import com.github.pagehelper.PageInfo; import java.util.List; @@ -62,4 +63,6 @@ public interface IPatientService { HospitalVo.SelHospitalVo getHospitalByProjectId(Long projectId); List selAllYBS(); + + PageInfo adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId); } 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 671c8d43..25e41bd8 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -13,6 +13,7 @@ import com.ccsens.tcm.persist.mapper.*; import com.ccsens.tcm.uitl.Constant; import com.ccsens.util.CodeEnum; import com.ccsens.util.RedisUtil; +import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -26,9 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; @Slf4j @Service @@ -113,6 +112,22 @@ public class PatientService implements IPatientService { Inpatient inpatient = inpatientMapper.selectByPrimaryKey(patientInformation.getInpatientId()); //下面是对试题进行提交 if(param.getList().size()>0) { + //在这个地方修改其中得集合 + List saveCaseMesSigList= param.getList(); + Set stringSet=new HashSet(); + saveCaseMesSigList.forEach(saveCaseMesSig -> { + if(saveCaseMesSig.getContentsType()==(byte)0){ + stringSet.add(saveCaseMesSig.getTestQuestionsId()+"-"+saveCaseMesSig.getContents()); + } + }); + for (int i = param.getList().size() - 1; i >= 0; i--) { + if(param.getList().get(i).getContentsType()==(byte) 1){ + if(!stringSet.contains(param.getList().get(i).getTestQuestionsId()+"-"+param.getList().get(i).getContents())){ + param.getList().remove(i); + } + } + } + for (int i = 0; i < param.getList().size(); i++) { // //先查询试题id，查看试题需要记录的次数 // ReportCode reportCode = reportCodeMapper.selectByPrimaryKey(param.getList().get(i).getTestQuestionsId()); @@ -360,4 +375,15 @@ public class PatientService implements IPatientService { List selBiologNumsList= patientDao.selAllYBS(); return selBiologNumsList; } + + @Override + public PageInfo adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId) { + Long disease_time=Long.parseLong(String.valueOf(redisUtil.get(Constant.Redis.DISEASE_TIME))); + param.setTestQuestionsId(disease_time); + PageHelper.startPage(param.getPageNum(),param.getPageSize()); + List recentAnalysisVOS= patientDao.adjacentTasks(param,userId); + return new PageInfo<>(recentAnalysisVOS); + } + + } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index 9d43a8eb..4fbe97b5 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -158,8 +158,9 @@ + \ No newline at end of file