提交诊断依据列表,初步诊断列表

dev_2.0.0
liu 1 year ago
parent 937e8c713a
commit 1d942eeef7

@ -8,6 +8,7 @@ import java.io.Serializable;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -26,21 +27,25 @@ public class DiagnosisPrimaryRelation extends Model<DiagnosisPrimaryRelation> im
/**
* ID
*/
@ApiModelProperty("问诊流程ID,新增时不填")
private String processId;
/**
* ID
*/
@ApiModelProperty("初步诊断ID,新增时不填")
private String primaryId;
/**
* 1 (vp_diagnosis_qa_record) 2 (vp_diagnosis_physical_record) 3 (vp_diagnosis_ancillary_record)
*/
@ApiModelProperty("1 问诊 2 体格检查 3 辅助检查")
private Integer type;
/**
* ID
*/
@ApiModelProperty("关联关系ID")
private String relationId;
/**

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.Data;
import java.util.List;
import java.util.Set;
@Data
public class DiagnosticBasisForPrimaryResVO {
@ -27,8 +28,8 @@ public class DiagnosticBasisForPrimaryResVO {
@ApiModelProperty("初步诊断名称")
private String primaryName;
@ApiModelProperty("初步诊断ID")
private String primaryId;
@ApiModelProperty("初步诊断ID列表")
private List<String> primaryIdList;
@ApiModelProperty("是否是证实诊断依据(0否1是)")
private Integer basisConfirmFlag;

@ -40,7 +40,6 @@
null as locationName,
t4.name_zh_path as category,
t1.question as item,
null as primaryId,
t1.basis_confirm_flag as basisConfirmFlag,
t1.basis_identification_flag as basisIdentificationFlag
from vp_diagnosis_qa_record t1
@ -56,7 +55,6 @@
t2.location_name as locationName,
t3.type as category,
t3.tool_name as item,
t1.primary_id as primaryId,
t1.basis_confirm_flag as basisConfirmFlag,
t1.basis_identification_flag as basisIdentificationFlag
from vp_diagnosis_physical_record t1
@ -71,7 +69,6 @@
t2.location_name as locationName,
t2.type as category,
t2.item_name as item,
t1.primary_id as primaryId,
t1.basis_confirm_flag as basisConfirmFlag,
t1.basis_identification_flag as basisIdentificationFlag
from vp_diagnosis_ancillary_record t1

@ -4,6 +4,7 @@ package com.supervision.controller;
import com.supervision.model.DiagnosisPrimary;
import com.supervision.model.Disease;
import com.supervision.pojo.vo.DiagnosticBasisForPrimaryReqVO;
import com.supervision.pojo.vo.SaveDiagnosisPrimaryReqVO;
import com.supervision.vo.ask.DiagnosticBasisForPrimaryResVO;
import com.supervision.service.AskPrimaryService;
import com.supervision.vo.ask.DiagnosisPrimaryVO;
@ -43,10 +44,16 @@ public class AskPrimaryController {
@ApiOperation("新增初步诊断")
@PostMapping("savePrimary")
public void savePrimary(@RequestBody DiagnosisPrimary reqVO){
public void savePrimary(@RequestBody SaveDiagnosisPrimaryReqVO reqVO){
askPrimaryService.savePrimary(reqVO);
}
@ApiOperation("查询选择初步诊断关联的问诊记录")
@PostMapping("queryRecordForPrimaryChoose")
public void queryRecordForPrimaryChoose(String processId){
}
@ApiOperation("确认诊断时,修改初步诊断的信息")
@PostMapping("updatePrimaryByConfirm")
public void updatePrimaryByConfirm(@RequestBody DiagnosisPrimary reqVO){

@ -0,0 +1,18 @@
package com.supervision.pojo.vo;
import com.supervision.model.DiagnosisPrimary;
import com.supervision.model.DiagnosisPrimaryRelation;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
public class SaveDiagnosisPrimaryReqVO extends DiagnosisPrimary {
// 关联的初步诊断列表
private List<DiagnosisPrimaryRelation> primaryRecordList;
}

@ -3,6 +3,7 @@ package com.supervision.service;
import com.supervision.model.DiagnosisPrimary;
import com.supervision.model.Disease;
import com.supervision.pojo.vo.DiagnosticBasisForPrimaryReqVO;
import com.supervision.pojo.vo.SaveDiagnosisPrimaryReqVO;
import com.supervision.vo.ask.DiagnosticBasisForPrimaryResVO;
import com.supervision.vo.ask.DiagnosisPrimaryVO;
import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO;
@ -18,7 +19,7 @@ public interface AskPrimaryService {
void modifyPrimaryDiseaseInfo(ModifyPrimaryDiseaseInfoReqVO reqVO);
void savePrimary(DiagnosisPrimary reqVO);
void savePrimary(SaveDiagnosisPrimaryReqVO reqVO);
void updatePrimaryByConfirm(DiagnosisPrimary reqVO);

@ -1,9 +1,13 @@
package com.supervision.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.supervision.exception.BusinessException;
import com.supervision.model.*;
import com.supervision.model.Process;
import com.supervision.pojo.vo.DiagnosticBasisForPrimaryReqVO;
import com.supervision.pojo.vo.SaveDiagnosisPrimaryReqVO;
import com.supervision.vo.ask.DiagnosticBasisForPrimaryResVO;
import com.supervision.service.*;
import com.supervision.util.UserUtil;
@ -13,7 +17,8 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@ -31,6 +36,8 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
private final ProcessService processService;
private final DiagnosisPrimaryRelationService diagnosisPrimaryRelationService;
@Override
public List<DiagnosisPrimaryVO> queryAskPrimaryList(String processId) {
return diagnosisPrimaryService.queryAskPrimaryList(processId);
@ -49,17 +56,22 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
@Override
@Transactional(rollbackFor = Exception.class)
public void savePrimary(DiagnosisPrimary reqVO) {
reqVO.setExcludeFlag(null);
reqVO.setCreateUserId(UserUtil.getUser().getId());
diagnosisPrimaryService.save(reqVO);
public void savePrimary(SaveDiagnosisPrimaryReqVO reqVO) {
DiagnosisPrimary diagnosisPrimary = BeanUtil.toBean(reqVO, DiagnosisPrimary.class);
diagnosisPrimary.setExcludeFlag(null);
diagnosisPrimary.setCreateUserId(UserUtil.getUser().getId());
diagnosisPrimaryService.save(diagnosisPrimary);
// 然后开始保存初步诊断关键的诊断
List<DiagnosisPrimaryRelation> primaryRecordList = reqVO.getPrimaryRecordList();
primaryRecordList.forEach(e -> e.setPrimaryId(diagnosisPrimary.getId()));
diagnosisPrimaryRelationService.saveBatch(primaryRecordList);
}
@Override
public void updatePrimaryByConfirm(DiagnosisPrimary reqVO) {
diagnosisPrimaryService.lambdaUpdate().set(DiagnosisPrimary::getExcludeFlag,reqVO.getExcludeFlag())
.set(DiagnosisPrimary::getPatientDiseaseInfo,reqVO.getPatientDiseaseInfo())
.eq(DiagnosisPrimary::getId,reqVO.getId()).update();
diagnosisPrimaryService.lambdaUpdate().set(DiagnosisPrimary::getExcludeFlag, reqVO.getExcludeFlag())
.set(DiagnosisPrimary::getPatientDiseaseInfo, reqVO.getPatientDiseaseInfo())
.eq(DiagnosisPrimary::getId, reqVO.getId()).update();
}
@Override
@ -79,37 +91,62 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
/**
* ,
*
* @param processId ID
* @return
*/
@Override
public List<DiagnosticBasisForPrimaryResVO> queryDiagnosticBasisListForPrimary(String processId) {
return diagnosisPrimaryService.queryDiagnosticBasisListForPrimary(processId);
List<DiagnosticBasisForPrimaryResVO> resList = diagnosisPrimaryService.queryDiagnosticBasisListForPrimary(processId);
if (CollUtil.isEmpty(resList)) {
return resList;
}
// 找到process对应的所有的初步诊断
List<DiagnosisPrimaryVO> diagnosisPrimaryVOS = diagnosisPrimaryService.queryAskPrimaryList(processId);
Map<String, String> diseaseNameMap = diagnosisPrimaryVOS.stream().collect(Collectors.toMap(DiagnosisPrimaryVO::getId, DiagnosisPrimaryVO::getPrimaryDiseaseName));
// 首先根据诊断记录,找到对应的关联关系
Set<String> relationIdSet = resList.stream().map(DiagnosticBasisForPrimaryResVO::getId).collect(Collectors.toSet());
List<DiagnosisPrimaryRelation> relationList = diagnosisPrimaryRelationService.lambdaQuery().in(DiagnosisPrimaryRelation::getRelationId, relationIdSet).list();
// 根据relationId进行分组
Map<String, List<DiagnosisPrimaryRelation>> relationMap = relationList.stream().collect(Collectors.groupingBy(DiagnosisPrimaryRelation::getRelationId));
for (DiagnosticBasisForPrimaryResVO node : resList) {
List<DiagnosisPrimaryRelation> relationPrimaryList = relationMap.get(node.getId());
Set<String> primarySet = relationPrimaryList.stream().map(DiagnosisPrimaryRelation::getPrimaryId).collect(Collectors.toSet());
if (CollUtil.isNotEmpty(primarySet)) {
List<String> diseaseNameList = new ArrayList<>();
primarySet.forEach(e -> diseaseNameList.add(diseaseNameMap.get(e)));
node.setPrimaryIdList(new ArrayList<>(primarySet));
node.setPrimaryName(StrUtil.join(";", diseaseNameList));
}
}
return resList;
}
@Override
public void saveDiagnosticBasis(List<DiagnosticBasisForPrimaryReqVO> reqVO) {
for (DiagnosticBasisForPrimaryReqVO node : reqVO) {
if (1 == node.getType()){
diagnosisQaRecordService.lambdaUpdate().set(DiagnosisQaRecord::getBasisConfirmFlag,node.getBasisConfirmFlag())
.set(DiagnosisQaRecord::getBasisIdentificationFlag,node.getBasisIdentificationFlag())
.eq(DiagnosisQaRecord::getId,node.getId()).update();
if (1 == node.getType()) {
diagnosisQaRecordService.lambdaUpdate().set(DiagnosisQaRecord::getBasisConfirmFlag, node.getBasisConfirmFlag())
.set(DiagnosisQaRecord::getBasisIdentificationFlag, node.getBasisIdentificationFlag())
.eq(DiagnosisQaRecord::getId, node.getId()).update();
continue;
}
if (2 == node.getType()){
diagnosisPhysicalRecordService.lambdaUpdate().set(DiagnosisPhysicalRecord::getBasisConfirmFlag,node.getBasisConfirmFlag())
.set(DiagnosisPhysicalRecord::getBasisIdentificationFlag,node.getBasisIdentificationFlag())
.eq(DiagnosisPhysicalRecord::getId,node.getId()).update();
if (2 == node.getType()) {
diagnosisPhysicalRecordService.lambdaUpdate().set(DiagnosisPhysicalRecord::getBasisConfirmFlag, node.getBasisConfirmFlag())
.set(DiagnosisPhysicalRecord::getBasisIdentificationFlag, node.getBasisIdentificationFlag())
.eq(DiagnosisPhysicalRecord::getId, node.getId()).update();
continue;
}
if (3 == node.getType()){
diagnosisAncillaryRecordService.lambdaUpdate().set(DiagnosisAncillaryRecord::getBasisConfirmFlag,node.getBasisConfirmFlag())
.set(DiagnosisAncillaryRecord::getBasisIdentificationFlag,node.getBasisIdentificationFlag())
.eq(DiagnosisAncillaryRecord::getId,node.getId()).update();
if (3 == node.getType()) {
diagnosisAncillaryRecordService.lambdaUpdate().set(DiagnosisAncillaryRecord::getBasisConfirmFlag, node.getBasisConfirmFlag())
.set(DiagnosisAncillaryRecord::getBasisIdentificationFlag, node.getBasisIdentificationFlag())
.eq(DiagnosisAncillaryRecord::getId, node.getId()).update();
}
}
// 然后将process的状态改为诊毕
processService.lambdaUpdate().set(Process::getStatus,1).update();
processService.lambdaUpdate().set(Process::getStatus, 1).update();
}
}

Loading…
Cancel
Save