From 4c44424fbf4153b1374ed80228bd49ae6e373f0e Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 4 Dec 2024 15:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientPreHospitalization.java | 2 + .../PatientQuestionOptionResult.java | 2 +- .../PatientQuestionSubjectResult.java | 2 +- .../service/aiob/impl/AIOBServiceImpl.java | 73 ++++++++----------- .../SignPatientManageRouteServiceImpl.java | 53 +++++++------- .../vo/patientinfo/PatientPortaitVo.java | 3 + .../PatientQuestionSubmitResultVO.java | 12 +++ .../SatisfactionSurveyVO.java | 3 + .../PatientVisitRecordVo.java | 3 + .../signpatientrecord/SignPatientListVo.java | 3 + .../PatientPreHospitalizationMapper.xml | 2 +- .../PatientQuestionOptionResultMapper.xml | 48 +++++++++++- .../PatientQuestionSubjectResultMapper.xml | 22 +++++- .../PatientQuestionSubmitResultMapper.xml | 43 ++++++++++- .../PatientVisitRecordMapper.xml | 2 +- .../SignPatientRecordMapper.xml | 2 +- 16 files changed, 192 insertions(+), 83 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java index d354e8bb..fc311618 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java @@ -166,4 +166,6 @@ public class PatientPreHospitalization extends BaseEntity { @ApiModelProperty("删除标识，0：未删除，1：已删除") private Integer delFlag; + @ApiModelProperty(value = "年龄") + private Integer age; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java index a699e6d6..7c366a83 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java @@ -118,7 +118,7 @@ public class PatientQuestionOptionResult extends BaseEntity { * 问卷题目选项表的ID * 2024/12/2 */ - private String questionSubjectOptionId; + private Long questionSubjectOptionId; @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java index a8ee2b6c..f8dd6f1c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java @@ -143,7 +143,7 @@ public class PatientQuestionSubjectResult extends BaseEntity { * 问卷题目选项表的ID * 2024/12/2 */ - private String questionSubjectOptionId; + private Long questionSubjectId; @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java index 87876c25..084a9023 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java @@ -7,18 +7,9 @@ import com.alibaba.fastjson2.JSONObject; import com.aliyuncs.exceptions.ClientException; import com.xinelu.common.config.AliYunSmsTwoConfig; import com.xinelu.common.config.SystemBusinessConfig; -import com.xinelu.common.constant.AiobTaskTypeContant; -import com.xinelu.common.constant.Constants; -import com.xinelu.common.constant.PhoneMessageRemindConstants; -import com.xinelu.common.constant.TaskCreateTypeConstant; -import com.xinelu.common.constant.TaskStatisticsTypeConstants; +import com.xinelu.common.constant.*; import com.xinelu.common.core.redis.RedisCache; -import com.xinelu.common.enums.ErrorStatusEnum; -import com.xinelu.common.enums.NodeExecuteResultStatusEnum; -import com.xinelu.common.enums.NodeExecuteStatusEnum; -import com.xinelu.common.enums.PhoneDialMethodEnum; -import com.xinelu.common.enums.PhoneRedialTimesEnum; -import com.xinelu.common.enums.TaskNodeTypeEnum; +import com.xinelu.common.enums.*; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.StringUtils; import com.xinelu.manage.domain.patientinfo.PatientInfo; @@ -36,12 +27,7 @@ import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; import com.xinelu.manage.domain.textmessage.TextMessage; -import com.xinelu.manage.dto.aiob.ActualTimeTaskDto; -import com.xinelu.manage.dto.aiob.AiobRecord; -import com.xinelu.manage.dto.aiob.CreateTaskDto; -import com.xinelu.manage.dto.aiob.CustomerInfoDto; -import com.xinelu.manage.dto.aiob.ImportTaskDto; -import com.xinelu.manage.dto.aiob.TaskCallbackDataDto; +import com.xinelu.manage.dto.aiob.*; import com.xinelu.manage.dto.patientquestionsubmitresult.PatientQuestionSubmitResultDTO; import com.xinelu.manage.dto.smssend.SmsInfoDTO; import com.xinelu.manage.mapper.labelfieldcontent.LabelFieldContentMapper; @@ -68,41 +54,29 @@ import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRo import com.xinelu.manage.vo.aiob.ImportTaskVo; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldInfoContentVo; import com.xinelu.manage.vo.questionsubject.QuestionSubjectVO; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigDecimal; -import java.net.HttpURLConnection; -import java.net.URL; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; +import org.springframework.http.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; +import javax.annotation.Resource; +import java.io.*; +import java.math.BigDecimal; +import java.net.HttpURLConnection; +import java.net.URL; +import java.time.LocalDateTime; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + /** * @description: 百度客悦·智能外呼平台Service实现 * @author: haown @@ -653,7 +627,20 @@ public class AIOBServiceImpl implements IAIOBService { patientQuestionOptionResult.setQuestionSubjectResultId(patientQuestionSubjectResult.getId()); patientQuestionOptionResults.add(patientQuestionOptionResult); }); - patientQuestionOptionResultMapper.saveQuestionOptionList(patientQuestionOptionResults); + //判断问卷 满意项与异常项 + if (CollectionUtils.isNotEmpty(patientQuestionOptionResults)) { + List remarkableFlag = patientQuestionOptionResults.stream().filter(Objects::nonNull).filter(item -> org.apache.commons.lang3.StringUtils.isBlank(item.getRemarkableFlag()) && Objects.nonNull(item.getOptionChooseSign()) && item.getOptionChooseSign().equals(0) && ContentedAndRemarkableFlagEnum.REMARKABLE.getInfo().equals(item.getRemarkableFlag())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(remarkableFlag)) { + patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.REMARKABLE.getInfo()); + } + List contentedFlag = patientQuestionOptionResults.stream().filter(Objects::nonNull).filter(item -> org.apache.commons.lang3.StringUtils.isBlank(item.getContentedFlag()) && Objects.nonNull(item.getOptionChooseSign()) && item.getOptionChooseSign().equals(0) && ContentedAndRemarkableFlagEnum.DISCONTENTED.getInfo().equals(item.getRemarkableFlag())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(contentedFlag)) { + patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.DISCONTENTED.getInfo()); + } + } + questionSubmitResultMapper.updatePatientQuestionSubmitResult(patientQuestionSubmitResult); + + patientQuestionOptionResultMapper.saveQuestionOptionList(patientQuestionOptionResults); totalScore[0] = totalScore[0].add(questionSubjectVO.getQuestionScore() == null ? BigDecimal.ZERO : questionSubjectVO.getQuestionScore()); } else { // 没问到问卷中的问题，则保存空问题+空选项 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index bdc78877..8e32f7b3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -10,11 +10,7 @@ import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; import com.xinelu.common.annotation.DataScope; import com.xinelu.common.config.AliYunSmsTwoConfig; -import com.xinelu.common.constant.TaskContentConstants; -import com.xinelu.common.constant.TaskCreateTypeConstant; -import com.xinelu.common.constant.TaskNodeTypeConstants; -import com.xinelu.common.constant.TaskStatisticsTypeConstants; -import com.xinelu.common.constant.TemplateTypeConstants; +import com.xinelu.common.constant.*; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.*; import com.xinelu.common.exception.ServiceException; @@ -78,17 +74,6 @@ import com.xinelu.manage.vo.specialdiseasenode.RouteTaskAuditVo; import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeAuditVo; import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseChildRouteAuditVo; import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteAuditVo; -import java.time.LocalDate; -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; -import java.util.stream.Collectors; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -97,6 +82,13 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; + /** * 签约患者管理任务路径Service业务层处理 @@ -434,15 +426,23 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout Long taskExecuteRecordId = insertPatientTaskExecuteRecord(dto, routeHandlePerson, time); PatientQuestionSubmitResult patientQuestionSubmitResult = new PatientQuestionSubmitResult(); BeanUtils.copyBeanProp(patientQuestionSubmitResult, dto); + List patientQuestionOptionResultsFlag = new ArrayList<>(); + patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); + patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); + dto.getSubjectResultDTOList().forEach(item -> patientQuestionOptionResultsFlag.addAll(item.getOptionResultList())); + if (CollectionUtils.isNotEmpty(patientQuestionOptionResultsFlag)) { + List remarkableFlag = patientQuestionOptionResultsFlag.stream().filter(Objects::nonNull).filter(item -> StringUtils.isBlank(item.getRemarkableFlag()) && Objects.nonNull(item.getOptionChooseSign()) && item.getOptionChooseSign().equals(0) && ContentedAndRemarkableFlagEnum.REMARKABLE.getInfo().equals(item.getRemarkableFlag())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(remarkableFlag)) { + patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.REMARKABLE.getInfo()); + } + List contentedFlag = patientQuestionOptionResultsFlag.stream().filter(Objects::nonNull).filter(item -> StringUtils.isBlank(item.getContentedFlag()) && Objects.nonNull(item.getOptionChooseSign()) && item.getOptionChooseSign().equals(0) && ContentedAndRemarkableFlagEnum.DISCONTENTED.getInfo().equals(item.getRemarkableFlag())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(contentedFlag)) { + patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.DISCONTENTED.getInfo()); + } + } patientQuestionSubmitResult.setCreateBy(routeHandlePerson); patientQuestionSubmitResult.setCreateTime(time); patientQuestionSubmitResult.setTaskExecuteRecordId(taskExecuteRecordId); - if (StringUtils.isBlank(dto.getContentedFlag())){ - patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); - } - if (StringUtils.isBlank(dto.getRemarkableFlag())){ - patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); - } // 新增患者问卷提交结果 if (patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult) <= 0) { throw new ServiceException("新增患者问卷提交结果失败"); @@ -459,6 +459,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout saveQuestionSubject.setQuestionSubmitResultId(patientQuestionSubmitResult.getId()); saveQuestionSubject.setCreateBy(routeHandlePerson); saveQuestionSubject.setCreateTime(time); + saveQuestionSubject.setQuestionSubjectId(questionSubjectResult.getId()); patientQuestionSubjectResults.add(saveQuestionSubject); patientQuestionOptionResults.addAll(questionSubjectResult.getOptionResultList()); } @@ -476,12 +477,14 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout saveQuestionOption.setQuestionSubjectResultId(patientQuestionSubjectResult.getId()); saveQuestionOption.setCreateTime(time); saveQuestionOption.setCreateBy(routeHandlePerson); - if (StringUtils.isBlank(patientQuestionOptionResult.getContentedFlag())){ + //2024-12-4 + if (StringUtils.isBlank(patientQuestionOptionResult.getContentedFlag())) { saveQuestionOption.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); } - if (StringUtils.isBlank(patientQuestionOptionResult.getRemarkableFlag())){ + if (StringUtils.isBlank(patientQuestionOptionResult.getRemarkableFlag())) { saveQuestionOption.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); } + saveQuestionOption.setQuestionSubjectOptionId(patientQuestionOptionResult.getId()); saveQuestionSubjectOptions.add(saveQuestionOption); } // 新增患者问卷题目选项提交结果 @@ -500,7 +503,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout * @param time 时间 * @param b 状态 */ - @Override + @Override public void shortMessageSendRecordExtracted(PatientQuestionSubmitResultDTO dto, LocalDateTime time, Boolean b, String createBy) { ShortMessageSendRecord shortMessageSendRecord = new ShortMessageSendRecord(); shortMessageSendRecord.setPatientId(dto.getPatientId()); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientPortaitVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientPortaitVo.java index e76bbdae..9ec7872d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientPortaitVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientinfo/PatientPortaitVo.java @@ -67,4 +67,7 @@ public class PatientPortaitVo { @ApiModelProperty("复诊信息") private List consultationInfo; + + @ApiModelProperty(value = "年龄") + private Integer age; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java index 43a557cb..2a61adf5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java @@ -47,6 +47,18 @@ public class PatientQuestionSubmitResultVO { @ApiModelProperty(value = "问卷总得分，根据患者提交问卷得出的分值") private BigDecimal totalScore; + /** + * 冗余:整个问卷中是否包含不满意项;DISCONTENTED:不满意;CONTENTED:满意;默认CONTENTED; + * 2024/12/2 + */ + private String contentedFlag; + + /** + * 冗余:整个问卷中是否包含异常项;REMARKABLE:异常的;ROUTINE:正常的;默认ROUTINE + * 2024/12/2 + */ + private String remarkableFlag; + List subjectResultList; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/SatisfactionSurveyVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/SatisfactionSurveyVO.java index d1385acb..8e732c57 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/SatisfactionSurveyVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/SatisfactionSurveyVO.java @@ -90,4 +90,7 @@ public class SatisfactionSurveyVO { */ @ApiModelProperty(value = "所属科室名称") private String departmentName; + + @ApiModelProperty(value = "年龄") + private Integer age; } 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 459783f8..25ddd702 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 @@ -183,4 +183,7 @@ public class PatientVisitRecordVo { @ApiModelProperty(value = "画像审核时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime portaitCheckDate; + + @ApiModelProperty(value = "年龄") + private Integer age; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java index b91313f4..41de3c26 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java @@ -212,4 +212,7 @@ public class SignPatientListVo { @ApiModelProperty(value = "服务周期单位") private String packageTermUnit; + + @ApiModelProperty(value = "年龄") + private Integer age; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml index 6eb3311f..a8bcfe40 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml @@ -290,7 +290,7 @@ select p.id,p.patient_id,patient.patient_name, patient.patient_phone,patient.card_no,patient.sex, - patient.birth_date,patient.family_member_phone,patient.address, + patient.birth_date,patient.family_member_phone,patient.address,patient.age, p.main_diagnosis,p.hospital_agency_id,p.hospital_agency_name, p.campus_agency_id,p.campus_agency_name, p.department_id,p.department_name,p.ward_id,p.ward_name, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml index 9e525634..92d791e5 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionoptionresult/PatientQuestionOptionResultMapper.xml @@ -20,6 +20,9 @@ + + + @@ -37,7 +40,10 @@ create_by, create_time, update_by, - update_time + update_time, + contented_flag, + remarkable_flag, + question_subject_option_id from patient_question_option_result @@ -75,6 +81,15 @@ and option_remark = #{optionRemark} + + and contented_flag = #{contentedFlag} + + + and remarkable_flag = #{remarkableFlag} + + + and question_subject_option_id = #{questionSubjectOptionId} + @@ -116,6 +131,12 @@ update_time, + contented_flag, + + remarkable_flag, + + question_subject_option_id, + #{questionSubjectResultId}, @@ -146,6 +167,12 @@ #{updateTime}, + #{contentedFlag}, + + #{remarkableFlag}, + + #{questionSubjectOptionId}, + @@ -162,7 +189,10 @@ option_sort, option_remark, create_by, - create_time + create_time, + contented_flag, + remarkable_flag, + question_subject_option_id ) values ( @@ -177,7 +207,10 @@ #{QuestionSubjectOption.optionSort}, #{QuestionSubjectOption.optionRemark}, #{QuestionSubjectOption.createBy}, - #{QuestionSubjectOption.createTime} + #{QuestionSubjectOption.createTime}, + #{QuestionSubjectOption.contentedFlag}, + #{QuestionSubjectOption.remarkableFlag}, + #{QuestionSubjectOption.questionSubjectOptionId} ) @@ -227,6 +260,15 @@ update_time = #{updateTime}, + contented_flag = + #{contentedFlag}, + + remarkable_flag = + #{remarkableFlag}, + + question_subject_option_id = + #{questionSubjectOptionId}, + where id = #{id} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml index 1805cc62..80d5464e 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.xml @@ -25,6 +25,7 @@ + @@ -47,7 +48,8 @@ create_by, create_time, update_by, - update_time + update_time, + question_subject_id from patient_question_subject_result @@ -100,6 +102,9 @@ and question_remark = #{questionRemark} + + and question_subject_id = #{questionSubjectId} + @@ -151,7 +156,9 @@ update_time, - + question_subject_id, + + #{questionSubmitResultId}, @@ -191,6 +198,8 @@ #{updateTime}, + #{questionSubjectId}, + @@ -213,7 +222,8 @@ question_sort, question_remark, create_by, - create_time + create_time, + question_subject_id ) values ( @@ -233,7 +243,8 @@ #{QuestionSubject.questionSort}, #{QuestionSubject.questionRemark}, #{QuestionSubject.createBy}, - #{QuestionSubject.createTime} + #{QuestionSubject.createTime}, + #{QuestionSubject.questionSubjectId} ) @@ -298,6 +309,9 @@ update_time = #{updateTime}, + question_subject_id = + #{questionSubjectId}, + where id = #{id} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml index 6e541f98..74355225 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml @@ -30,6 +30,8 @@ + + + + @@ -60,6 +64,7 @@ + @@ -76,6 +81,9 @@ + + + @@ -103,7 +111,9 @@ create_by, create_time, update_by, - update_time + update_time, + contented_flag, + remarkable_flag from patient_question_submit_result @@ -168,6 +178,12 @@ and total_score = #{totalScore} + + and contented_flag = #{contentedFlag} + + + and remarkable_flag = #{remarkableFlag} + @@ -231,6 +247,10 @@ update_time, + contented_flag, + + remarkable_flag, + #{taskExecuteRecordId}, @@ -283,6 +303,10 @@ #{updateTime}, + #{contentedFlag}, + + #{remarkableFlag}, + @@ -361,6 +385,12 @@ update_time = #{updateTime}, + contented_flag = + #{contentedFlag}, + + remarkable_flag = + #{remarkableFlag}, + where id = #{id} @@ -387,6 +417,8 @@ pqsm.questionnaire_description, pqsm.questionnaire_total_score, pqsm.total_score, + pqsm.contented_flag, + pqsm.remarkable_flag, pqsj.id subjectResult, pqsj.question_submit_result_id, pqsj.question_info_id, @@ -403,6 +435,7 @@ pqsj.question_score, pqsj.question_sort, pqsj.question_remark, + pqsj.question_subject_id, pqor.id, pqor.question_subject_result_id, pqor.questionnaire_subject_id, @@ -413,7 +446,10 @@ pqor.option_choose_sign, pqor.option_submit_answer, pqor.option_sort, - pqor.option_remark + pqor.option_remark, + pqor.contented_flag, + pqor.remarkable_flag, + pqor.question_subject_option_id FROM patient_question_submit_result pqsm LEFT JOIN patient_question_subject_result pqsj ON pqsm.id = pqsj.question_submit_result_id LEFT JOIN patient_question_option_result pqor ON pqor.question_subject_result_id = pqsj.id @@ -440,7 +476,8 @@ pi.visit_method, pi.patient_health_state, pi.hospital_agency_name, - pi.department_name + pi.department_name, + pi.age from patient_question_submit_result pqsr LEFT JOIN question_info qi on pqsr.question_info_id = qi.id LEFT JOIN patient_info pi ON pi.id = pqsr.patient_id 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 d1ad68ec..0a959e05 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -102,7 +102,7 @@ select patient.id as patientId, patient.resident_id, patient.patient_name, patient.patient_phone, patient.family_member_phone, patient.birth_date, patient.card_no, patient.sex, patient.address, patient.visit_method, 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, + patient.department_id, patient.department_name, patient.ward_id, patient.ward_name, patient.patient_source,patient.age, 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, sign.portait_check_status, sign.portait_check_date diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index d3f55192..6dfaace5 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -389,7 +389,7 @@