From f45b9d207ab668dbeeaac426f3a2bd6deb0b9b90 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Thu, 27 Jun 2024 17:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=AE=A1=E6=A0=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LabelFieldContentController.java | 3 +- .../ILabelFieldContentService.java | 4 +- .../impl/LabelFieldContentServiceImpl.java | 39 ++++++++++--------- .../PatientVisitRecordVo.java | 13 +++++++ .../PatientVisitRecordMapper.xml | 4 +- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java index 709ceb67..5c26a2de 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldcontent/LabelFieldContentController.java @@ -13,7 +13,6 @@ import com.xinelu.manage.service.labelfieldcontent.ILabelFieldContentService; import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; import com.xinelu.manage.vo.labelfieldcontent.LabelField; import java.util.List; -import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; @@ -128,7 +127,7 @@ public class LabelFieldContentController extends BaseController { * 画像查询 */ @GetMapping("/getPortaitByPatient") - public R>>>> getPortaitByPatient(Long patientId) { + public R>> getPortaitByPatient(Long patientId) { return R.ok(labelFieldContentService.getPortaitByPatient(patientId)); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java index 7328ce38..ea78045a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/ILabelFieldContentService.java @@ -5,9 +5,7 @@ import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; import com.xinelu.manage.dto.labelfieldcontent.LabelFieldContentAddDTO; import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; import com.xinelu.manage.vo.labelfieldcontent.LabelField; - import java.util.List; -import java.util.Map; /** * 标签字段内容信息Service接口 @@ -96,5 +94,5 @@ public interface ILabelFieldContentService { /** * 画像审核->查询患者画像信息 */ - List>>> getPortaitByPatient(Long patientId); + List> getPortaitByPatient(Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index 709c6ac8..4da08ece 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -3,6 +3,7 @@ package com.xinelu.manage.service.labelfieldcontent.impl; import com.alibaba.fastjson2.JSONObject; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.PatientSexEnum; +import com.xinelu.common.enums.PortraitStatusEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.BaseUtil; import com.xinelu.common.utils.SecurityUtils; @@ -25,7 +26,6 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -148,6 +148,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { BeanUtils.copyProperties(contentDTO, labelFieldContent); labelFieldContent.setFieldId(labelFieldContentAddDTO.getFieldId()); labelFieldContent.setFieldName(labelFieldContentAddDTO.getFieldName()); + labelFieldContent.setPortraitStatus(PortraitStatusEnum.INUSE.getInfo()); labelFieldContent.setCreateBy(SecurityUtils.getUsername()); labelFieldContent.setCreateTime(LocalDateTime.now()); if (labelFieldContentMapper.insertLabelFieldContent(labelFieldContent) <= 0) { @@ -285,28 +286,30 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { return AjaxResult.success(); } - @Override public List>>> getPortaitByPatient(Long patientId) { - List>>> retMap = new ArrayList<>(); - List labelFieldContents = labelFieldContentMapper.groupingValue(null, patientId, null); + @Override public List> getPortaitByPatient(Long patientId) { + //List>>> retMap = new ArrayList<>(); + List> retList = new ArrayList<>(); + List labelFieldContents = labelFieldContentMapper.groupingValue(0L, patientId, null); if (CollectionUtils.isEmpty(labelFieldContents)) { return null; } + retList.add(labelFieldContents); // 按照任务细分分组 - Map> groupByPartition = labelFieldContents.stream().collect(Collectors.groupingBy(GroupingValue::getTaskPartitionDictId)); + //Map> groupByPartition = labelFieldContents.stream().collect(Collectors.groupingBy(GroupingValue::getTaskPartitionDictId)); - for (Long taskPartitionDictId : groupByPartition.keySet()) { - Map>> retObj = new HashMap<>(); - List> lists = new ArrayList<>(); - // 按照sn分组 - List partitionList = groupByPartition.get(taskPartitionDictId); - Map> groupBySn = partitionList.stream().collect(Collectors.groupingBy(GroupingValue::getPortraitSn)); - for (String sn : groupBySn.keySet()) { - lists.add(groupBySn.get(sn)); - } - retObj.put(partitionList.get(0).getTaskPartitionDictName(), lists); - retMap.add(retObj); - } - return retMap; + //for (Long taskPartitionDictId : groupByPartition.keySet()) { + // Map>> retObj = new HashMap<>(); + // List> lists = new ArrayList<>(); + // // 按照sn分组 + // List partitionList = groupByPartition.get(taskPartitionDictId); + // Map> groupBySn = partitionList.stream().collect(Collectors.groupingBy(GroupingValue::getPortraitSn)); + // for (String sn : groupBySn.keySet()) { + // lists.add(groupBySn.get(sn)); + // } + // retObj.put(partitionList.get(0).getTaskPartitionDictName(), lists); + // retMap.add(retObj); + //} + return retList; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientvisitrecord/PatientVisitRecordVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientvisitrecord/PatientVisitRecordVo.java index d3b4b145..459783f8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientvisitrecord/PatientVisitRecordVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientvisitrecord/PatientVisitRecordVo.java @@ -170,4 +170,17 @@ public class PatientVisitRecordVo { /** 手术记录 */ @ApiModelProperty(value = "手术记录") private String surgicalRecord; + + /** + * 画像审核状态，同意：AGREE，不同意：DISAGREE + */ + @ApiModelProperty(value = "画像审核状态，同意：AGREE，不同意：DISAGREE") + private String portaitCheckStatus; + + /** + * 画像审核时间 + */ + @ApiModelProperty(value = "画像审核时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime portaitCheckDate; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index 2155ba94..1adb7abe 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -104,9 +104,11 @@ patient.hospital_agency_id, patient.hospital_agency_name, patient.campus_agency_id, patient.campus_agency_name, patient.department_id, patient.department_name, patient.ward_id, patient.ward_name, patient.patient_source, record.id as patientVisitRecordId, record.visit_method, record.visit_date, record.main_diagnosis, - record.admission_time, record.discharge_time, record.in_hospital_info, record.out_hospital_info, record.surgical_name, record.surgical_record + record.admission_time, record.discharge_time, record.in_hospital_info, record.out_hospital_info, record.surgical_name, record.surgical_record, + sign.portait_check_status, sign.portait_check_date from patient_info patient left join patient_visit_record record on patient.patient_visit_record_id = record.id + left join sign_patient_record sign on sign.id = patient.sign_patient_record_id where patient.id = #{patientId}