From 0736acd0dadd4417aaf859db55fb17feee1a7d5f Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 3 Feb 2021 10:58:10 +0800 Subject: [PATCH] =?UTF-8?q?20210203=E6=9F=A5=E8=AF=A2=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E7=97=85=E4=BE=8B=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tcm/api/ConferenceRecordsController.java | 19 ++++++++++++ .../api/StatisticalAnalysisController.java | 18 ++++++------ .../com/ccsens/tcm/bean/dto/ConRecDto.java | 21 ++++++++++++++ .../com/ccsens/tcm/bean/dto/StatisticDto.java | 2 -- .../com/ccsens/tcm/bean/vo/StatisticVo.java | 19 ++++++++++++ .../ccsens/tcm/persist/dao/PatientDao.java | 7 +++++ .../ccsens/tcm/service/ConferenceService.java | 15 ++++++++++ .../tcm/service/IConferenceService.java | 4 +++ .../ccsens/tcm/service/IPatientService.java | 7 +++++ .../com/ccsens/tcm/service/ImportService.java | 2 +- .../ccsens/tcm/service/PatientService.java | 9 +++++- .../java/com/ccsens/tcm/uitl/Constant.java | 2 ++ .../main/resources/mapper_dao/PatientDao.xml | 29 +++++++++++++++++++ 13 files changed, 141 insertions(+), 13 deletions(-) create mode 100644 tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java create mode 100644 tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java diff --git a/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java b/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java index c564ba21..153282c6 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java @@ -2,7 +2,10 @@ package com.ccsens.tcm.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.tcm.bean.dto.ConRecDto; +import com.ccsens.tcm.bean.dto.StatisticDto; import com.ccsens.tcm.bean.vo.ConRecVo; +import com.ccsens.tcm.bean.vo.StatisticVo; +import com.ccsens.tcm.service.IConferenceService; import com.ccsens.tcm.service.IPatientService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; @@ -18,6 +21,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 @@ -29,6 +33,10 @@ import javax.annotation.Resource; public class ConferenceRecordsController { @Resource private IPatientService patientService; + @Resource + private IConferenceService conferenceService; + + @MustLogin @ApiOperation(value = "查询会议记录", notes = "w:根据会议记录查询条件查询会议记录") @RequestMapping(value = "/selConRec", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -38,4 +46,15 @@ public class ConferenceRecordsController { log.info("查询会议记录基本信息成功"); return JsonResponse.newInstance().ok(selConRecVoPageInfo); } + + +// @MustLogin +// @ApiOperation(value = "添加会议记录", notes = "zy:") +// @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse saveConference(@ApiParam @Validated @RequestBody QueryDto params) { +// log.info("统计每个医院的完成情况：{}",params); +// ConRecVo.SelConRecVo saveConference = patientService.saveConference(params.getParam()); +// log.info("查找每个医院的病例完成情况"); +// return JsonResponse.newInstance().ok(saveConference); +// } } 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 863fb40e..1fdf90fb 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java @@ -64,13 +64,13 @@ public class StatisticalAnalysisController { return JsonResponse.newInstance().ok(completeHospital); } -// @MustLogin -// @ApiOperation(value = "统计医生的病例的完成情况", notes = "zy:") -// @RequestMapping(value = "/doctor/complete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) -// public JsonResponse completeDoctor(@ApiParam @Validated @RequestBody QueryDto params) { -// log.info("统计每个医院的完成情况：{}",params); -// List completeHospital = patientService.completeHospital(); -// log.info("查找每个医院的病例完成情况"); -// return JsonResponse.newInstance().ok(completeHospital); -// } + @MustLogin + @ApiOperation(value = "统计医生的病例的完成情况", notes = "zy:") + @RequestMapping(value = "/doctor/complete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse completeDoctor(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("统计每个医院的完成情况：{}",params); + List completeDoctors = patientService.completeDoctor(params.getParam()); + log.info("查找每个医院的病例完成情况"); + return JsonResponse.newInstance().ok(completeDoctors); + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java index e0fbb0ab..4c92cbfa 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/ConRecDto.java @@ -39,4 +39,25 @@ public class ConRecDto { @ApiModelProperty("每页数量") private Integer pageSize=10; } + + @Data + @ApiModel("查询会议记录搜索条件") + public static class SaveConference { + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("开始时间") + private Date startTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("结束时间") + private Date endTime; + @ApiModelProperty("会议地点") + private String place; + @ApiModelProperty("主持人") + private String host; + @ApiModelProperty("'参会人'") + private String participants; + @ApiModelProperty("内容") + private String discussionContent; + @ApiModelProperty("内容") + private String meetingMinutes; + } } 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 66c8f763..14e0098d 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 @@ -46,7 +46,5 @@ public class StatisticDto { @NotNull(message = "医院id不能为空") @ApiModelProperty("医院id") private Long hospitalId; - @ApiModelProperty("主治大夫id 为空则查询全部") - private Long userId; } } 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 793c663b..ccf36e79 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 @@ -62,4 +62,23 @@ public class StatisticVo { @ApiModelProperty("废弃的") private Integer discarded; } + + @Data + @ApiModel("医院的的病例完成情况") + public static class CompleteDoctor{ + @ApiModelProperty("医生id") + private Long doctorId; + @ApiModelProperty("医院名") + private String doctorName; + @ApiModelProperty("已完成") + private Integer completed; + @ApiModelProperty("未完成") + private Integer unfinished; + @ApiModelProperty("进行中") + private Integer underway; + @ApiModelProperty("数据采集超时") + private Integer overtime; + @ApiModelProperty("废弃的") + private Integer discarded; + } } 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 a0eee0b7..3b16e917 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 @@ -37,4 +37,11 @@ public interface PatientDao { * @return 返回完成情况按医院分组 */ List completeHospital(); + + /** + * 查看医院下的每个医生的完成情况 + * @param hospitalId 医院id + * @return 返回完成情况按医生分组 + */ + List completeDoctor(@Param("hospitalId")Long hospitalId); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java new file mode 100644 index 00000000..510c42fe --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java @@ -0,0 +1,15 @@ +package com.ccsens.tcm.service; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class ConferenceService implements IConferenceService{ +} diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java new file mode 100644 index 00000000..36ff7597 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java @@ -0,0 +1,4 @@ +package com.ccsens.tcm.service; + +public interface IConferenceService { +} 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 1256d8cd..7c1a6c72 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -41,4 +41,11 @@ public interface IPatientService { * @return 返回每个医院的名字和 */ List completeHospital(); + + /** + * 统计医院下的每个医生的完成情况 + * @param param 医院id + * @return 返回每个医生的完成情况 + */ + List completeDoctor(StatisticDto.CompleteDoctor param); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java index d4bb3f2e..b8a79eae 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java @@ -218,7 +218,7 @@ public class ImportService implements IImportService { question.setSort(sort); question.setType(objs.length>4 && StringUtil.checkNum(String.valueOf(objs[4]), false) ? Byte.parseByte(String.valueOf(objs[4])) : Constant.Question.QUESTION_SHOW_TYPE); question.setUnits(objs.length>5 && StringUtils.isEmpty(objs[5]) ? Constant.STRING_DEFAULT : String.valueOf(objs[5])); - question.setSearchCriteria(objs.length>6 && StringUtil.checkNum(String.valueOf(objs[6]), false) ? Byte.parseByte(String.valueOf(objs[6])) : Constant.Question.QUESTION_SHOW_TYPE); + question.setSearchCriteria(objs.length>6 && StringUtil.checkNum(String.valueOf(objs[6]), false) ? Byte.parseByte(String.valueOf(objs[6])) : Constant.Question.SEARCH_CRITERIA); question.setRemark(objs.length > 8 && !StringUtils.isEmpty(objs[8]) ? (String) objs[8] : Constant.STRING_DEFAULT); question.setRelevanceOptionId(optionId == null ? 0 : optionId); 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 62d5bc5f..5ca64b9c 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -241,7 +241,14 @@ public class PatientService implements IPatientService { */ @Override public List completeHospital() { - return patientDao.completeHospital(); } + + /** + * 查看医院下每个医生的完成情况 + */ + @Override + public List completeDoctor(StatisticDto.CompleteDoctor param) { + return patientDao.completeDoctor(param.getHospitalId()); + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/uitl/Constant.java b/tcm/src/main/java/com/ccsens/tcm/uitl/Constant.java index c9466f2c..fd33bcce 100644 --- a/tcm/src/main/java/com/ccsens/tcm/uitl/Constant.java +++ b/tcm/src/main/java/com/ccsens/tcm/uitl/Constant.java @@ -45,6 +45,8 @@ public class Constant { public final static String ALL = "all"; /**默认题目类型*/ public final static byte QUESTION_SHOW_TYPE = 1; + /**默认不是搜索类型*/ + public final static byte SEARCH_CRITERIA =0; /**默认选项类型*/ public final static byte RULE_TYPE_DEFAULT = 1; /**测评分类*/ diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index a3d6c70b..1f640b30 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -183,4 +183,33 @@ GROUP BY t.hospital_id + \ No newline at end of file