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 59cb41c7..0928237b 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java @@ -71,7 +71,7 @@ public class ConferenceRecordsController { @MustLogin @ApiOperation(value = "查看会议记录", notes = "zy:") @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + public JsonResponse getConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("统计每个医院的完成情况：{}",params); ConRecVo.SelConRecVo selConRecVo = conferenceService.getConference(params.getParam()); log.info("查找每个医院的病例完成情况"); diff --git a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java index f865fab8..46fe5b40 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java @@ -41,6 +41,16 @@ public class PatientController { log.info("添加患者基本信息成功"); return JsonResponse.newInstance().ok(); } + + @MustLogin + @ApiOperation(value = "修改患者的完成状态", notes = "w:修改患者的完成状态") + @RequestMapping(value = "/upPatientMes", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse upPatientMes(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("修改患者基本信息：{}",params); + patientService.upPatientMes(params.getParam(),params.getUserId()); + log.info("修改患者基本信息成功"); + return JsonResponse.newInstance().ok(); + } @MustLogin @ApiOperation(value = "查询患者基本信息", notes = "w:查询患者基本信息") @RequestMapping(value = "/selPatientMes", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) 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 ccf5741e..8fcc3ee7 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 @@ -48,6 +48,14 @@ public class ConRecDto { @NotNull(message = "任务id不能为空") @ApiModelProperty("任务id") private Long taskId; + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务开始时间") + private Date taskStartTime; + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务结束时间") + private Date taskEndTimek; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("开始时间") private Date startTime; @@ -78,4 +86,16 @@ public class ConRecDto { @ApiModelProperty("任务id") private Long taskId; } + @Data + @ApiModel("查看会议记录dto") + public class GetConference { + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务开始时间") + private Date taskStartTime; + @NotNull + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务结束时间") + private Date taskEndTimek; + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java index 1451ba1d..e530909d 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java @@ -147,4 +147,14 @@ public class PatientDto { @ApiModelProperty("结束时间，必须填") private String endTime=""; } + @Data + @ApiModel("修改病人的状态") + public static class UpPatient { + @NotNull + @ApiModelProperty("病人id") + private Long id; + @NotNull + @ApiModelProperty("录入状态：0：新建 1：数据搜集中 2数据搜集完成 3数据搜集超时 4：废弃") + private Byte inputStatus; + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java index bb5adf4e..437d1e41 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecords.java @@ -8,6 +8,10 @@ public class ConferenceRecords implements Serializable { private Long taskId; + private Date taskStartTime; + + private Date taskEndTime; + private Date startTime; private Date endTime; @@ -48,6 +52,22 @@ public class ConferenceRecords implements Serializable { this.taskId = taskId; } + public Date getTaskStartTime() { + return taskStartTime; + } + + public void setTaskStartTime(Date taskStartTime) { + this.taskStartTime = taskStartTime; + } + + public Date getTaskEndTime() { + return taskEndTime; + } + + public void setTaskEndTime(Date taskEndTime) { + this.taskEndTime = taskEndTime; + } + public Date getStartTime() { return startTime; } @@ -144,6 +164,8 @@ public class ConferenceRecords implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", taskId=").append(taskId); + sb.append(", taskStartTime=").append(taskStartTime); + sb.append(", taskEndTime=").append(taskEndTime); sb.append(", startTime=").append(startTime); sb.append(", endTime=").append(endTime); sb.append(", place=").append(place); diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java index 642b351e..5a9e342f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsExample.java @@ -225,6 +225,126 @@ public class ConferenceRecordsExample { return (Criteria) this; } + public Criteria andTaskStartTimeIsNull() { + addCriterion("task_start_time is null"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeIsNotNull() { + addCriterion("task_start_time is not null"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeEqualTo(Date value) { + addCriterion("task_start_time =", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeNotEqualTo(Date value) { + addCriterion("task_start_time <>", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeGreaterThan(Date value) { + addCriterion("task_start_time >", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeGreaterThanOrEqualTo(Date value) { + addCriterion("task_start_time >=", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeLessThan(Date value) { + addCriterion("task_start_time <", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeLessThanOrEqualTo(Date value) { + addCriterion("task_start_time <=", value, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeIn(List values) { + addCriterion("task_start_time in", values, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeNotIn(List values) { + addCriterion("task_start_time not in", values, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeBetween(Date value1, Date value2) { + addCriterion("task_start_time between", value1, value2, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskStartTimeNotBetween(Date value1, Date value2) { + addCriterion("task_start_time not between", value1, value2, "taskStartTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeIsNull() { + addCriterion("task_end_time is null"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeIsNotNull() { + addCriterion("task_end_time is not null"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeEqualTo(Date value) { + addCriterion("task_end_time =", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeNotEqualTo(Date value) { + addCriterion("task_end_time <>", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeGreaterThan(Date value) { + addCriterion("task_end_time >", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeGreaterThanOrEqualTo(Date value) { + addCriterion("task_end_time >=", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeLessThan(Date value) { + addCriterion("task_end_time <", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeLessThanOrEqualTo(Date value) { + addCriterion("task_end_time <=", value, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeIn(List values) { + addCriterion("task_end_time in", values, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeNotIn(List values) { + addCriterion("task_end_time not in", values, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeBetween(Date value1, Date value2) { + addCriterion("task_end_time between", value1, value2, "taskEndTime"); + return (Criteria) this; + } + + public Criteria andTaskEndTimeNotBetween(Date value1, Date value2) { + addCriterion("task_end_time not between", value1, value2, "taskEndTime"); + return (Criteria) this; + } + public Criteria andStartTimeIsNull() { addCriterion("start_time is null"); return (Criteria) this; diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsWithBLOBs.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsWithBLOBs.java deleted file mode 100644 index 69a18558..00000000 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ConferenceRecordsWithBLOBs.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ccsens.tcm.bean.po; - -import java.io.Serializable; - -public class ConferenceRecordsWithBLOBs extends ConferenceRecords implements Serializable { - private String discussionContent; - - private String meetingMinutes; - - private static final long serialVersionUID = 1L; - - public String getDiscussionContent() { - return discussionContent; - } - - public void setDiscussionContent(String discussionContent) { - this.discussionContent = discussionContent == null ? null : discussionContent.trim(); - } - - public String getMeetingMinutes() { - return meetingMinutes; - } - - public void setMeetingMinutes(String meetingMinutes) { - this.meetingMinutes = meetingMinutes == null ? null : meetingMinutes.trim(); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", discussionContent=").append(discussionContent); - sb.append(", meetingMinutes=").append(meetingMinutes); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java index ae6f88ec..9e913781 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java @@ -1,9 +1,12 @@ 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; + @Data public class BiologicalSamplesVo { @Data @@ -17,6 +20,9 @@ public class BiologicalSamplesVo { private Byte sampleType; @ApiModelProperty("采集时间") private Integer collectTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + private Date updateAt; } @Data @ApiModel("统计医院生物样本数量") diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java index 1ab3944e..cd027395 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -19,6 +20,12 @@ public class ConRecVo { private Long id; @ApiModelProperty("任务id") private Long taskId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务开始时间") + private Date taskStartTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("任务结束时间") + private Date taskEndTimek; @ApiModelProperty("会议开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java index 18fcb320..bf753325 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java @@ -33,6 +33,9 @@ public class PatientVo { private String hosName; @ApiModelProperty("搜集次数") private Integer collectionNum; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + private Date updateAt; } @Data @ApiModel("经过搜索条件查询的患者集合") diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java index 323c180d..bf56ed49 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java @@ -60,10 +60,10 @@ public class ConferenceService implements IConferenceService{ } @Override - public ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param) { + public ConRecVo.SelConRecVo getConference(ConRecDto.GetConference param) { ConRecVo.SelConRecVo selConRecVo = new ConRecVo.SelConRecVo(); ConferenceRecordsExample conferenceRecordsExample = new ConferenceRecordsExample(); - conferenceRecordsExample.createCriteria().andTaskIdEqualTo(param.getTaskId()); + conferenceRecordsExample.createCriteria().andTaskStartTimeGreaterThan(param.getTaskStartTime()).andTaskEndTimeLessThan(param.getTaskEndTimek()); List conferenceRecordsList = conferenceRecordsMapper.selectByExample(conferenceRecordsExample); if(CollectionUtil.isNotEmpty(conferenceRecordsList)){ BeanUtil.copyProperties(conferenceRecordsList.get(0),selConRecVo); diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java index 9ef05d66..7ecaf59f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java @@ -24,5 +24,5 @@ public interface IConferenceService { * @param param 任务id * @return 返回会议内容 */ - ConRecVo.SelConRecVo getConference(ConRecDto.ConferenceTask param); + ConRecVo.SelConRecVo getConference(ConRecDto.GetConference param); } 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 8ec3feb2..3239e86a 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -80,4 +80,6 @@ public interface IPatientService { List stringLists(Long testQuestionsId); List selByHosAllYBS(Long id); + + void upPatientMes(PatientDto.UpPatient 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 acc0f559..12e990f1 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -419,5 +419,16 @@ public class PatientService implements IPatientService { return patientDao.selByHosAllYBS(id); } + @Override + public void upPatientMes(PatientDto.UpPatient param, Long userId) { + PatientInformationExample patientInformationExample=new PatientInformationExample(); + patientInformationExample.createCriteria().andIdEqualTo(param.getId()).andRecStatusEqualTo((byte)0); + PatientInformation patientInformation=new PatientInformation(); + patientInformation.setId(param.getId()); + patientInformation.setInputStatus(param.getInputStatus()); + patientInformation.setUserId(userId); + patientInformationMapper.updateByExampleSelective(patientInformation,patientInformationExample); + } + } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index ed90bd3e..26999425 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -46,7 +46,8 @@ tpi.hospital_id AS hospitalId, th.name as hosName, ti.name, - ti.collection_num as collectionNum + ti.collection_num as collectionNum, + tpi.update_at as updateAt FROM t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id left join t_hospital th on th.rec_status=0 and th.id=tpi.hospital_id @@ -141,6 +142,7 @@ ) t ) + order by tpi.update_at desc select @@ -109,26 +111,35 @@ - insert into t_conference_records (id, task_id, start_time, - end_time, place, host, - participants, discussion_content, meeting_minutes, - user_id, created_at, update_at, - rec_status) - values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP}, - #{endTime,jdbcType=TIMESTAMP}, #{place,jdbcType=VARCHAR}, #{host,jdbcType=VARCHAR}, - #{participants,jdbcType=VARCHAR}, #{discussionContent,jdbcType=VARCHAR}, #{meetingMinutes,jdbcType=VARCHAR}, - #{userId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updateAt,jdbcType=TIMESTAMP}, - #{recStatus,jdbcType=TINYINT}) + + SELECT LAST_INSERT_ID() + + insert into t_conference_records (task_id, task_start_time, task_end_time, + start_time, end_time, place, + host, participants, discussion_content, + meeting_minutes, user_id, created_at, + update_at, rec_status) + values (#{taskId,jdbcType=BIGINT}, #{taskStartTime,jdbcType=TIMESTAMP}, #{taskEndTime,jdbcType=TIMESTAMP}, + #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{place,jdbcType=VARCHAR}, + #{host,jdbcType=VARCHAR}, #{participants,jdbcType=VARCHAR}, #{discussionContent,jdbcType=VARCHAR}, + #{meetingMinutes,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updateAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + SELECT LAST_INSERT_ID() + insert into t_conference_records - - id, - task_id, + + task_start_time, + + + task_end_time, + start_time, @@ -164,12 +175,15 @@ - - #{id,jdbcType=BIGINT}, - #{taskId,jdbcType=BIGINT}, + + #{taskStartTime,jdbcType=TIMESTAMP}, + + + #{taskEndTime,jdbcType=TIMESTAMP}, + #{startTime,jdbcType=TIMESTAMP}, @@ -220,6 +234,12 @@ task_id = #{record.taskId,jdbcType=BIGINT}, + + task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP}, + + + task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP}, + start_time = #{record.startTime,jdbcType=TIMESTAMP}, @@ -262,6 +282,8 @@ update t_conference_records set id = #{record.id,jdbcType=BIGINT}, task_id = #{record.taskId,jdbcType=BIGINT}, + task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP}, + task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP}, start_time = #{record.startTime,jdbcType=TIMESTAMP}, end_time = #{record.endTime,jdbcType=TIMESTAMP}, place = #{record.place,jdbcType=VARCHAR}, @@ -283,6 +305,12 @@ task_id = #{taskId,jdbcType=BIGINT}, + + task_start_time = #{taskStartTime,jdbcType=TIMESTAMP}, + + + task_end_time = #{taskEndTime,jdbcType=TIMESTAMP}, + start_time = #{startTime,jdbcType=TIMESTAMP}, @@ -322,6 +350,8 @@ update t_conference_records set task_id = #{taskId,jdbcType=BIGINT}, + task_start_time = #{taskStartTime,jdbcType=TIMESTAMP}, + task_end_time = #{taskEndTime,jdbcType=TIMESTAMP}, start_time = #{startTime,jdbcType=TIMESTAMP}, end_time = #{endTime,jdbcType=TIMESTAMP}, place = #{place,jdbcType=VARCHAR},