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 a842c682..bc2af38d 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 @@ -38,7 +38,6 @@ import com.xinelu.manage.dto.patientquestionoptionresult.PatientQuestionOptionRe import com.xinelu.manage.dto.patientquestionsubjectresult.PatientQuestionSubjectResultDTO; import com.xinelu.manage.dto.patientquestionsubmitresult.PatientQuestionSubmitResultDTO; import com.xinelu.manage.dto.signpatientmanageroutenode.CreateAiobActualTimeTaskDto; -import com.xinelu.manage.dto.signpatientmanageroutenode.PatientTaskDto; import com.xinelu.manage.dto.smssend.SmsInfoDTO; import com.xinelu.manage.mapper.labelfieldcontent.LabelFieldContentMapper; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; @@ -56,13 +55,11 @@ import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper; import com.xinelu.manage.mapper.signroutetriggercondition.SignRouteTriggerConditionMapper; import com.xinelu.manage.service.aiob.IAIOBService; import com.xinelu.manage.service.labelfieldcontent.ILabelFieldContentService; -import com.xinelu.manage.service.labelfieldcontent.impl.LabelFieldContentServiceImpl; import com.xinelu.manage.service.patienttaskstatistics.IPatientTaskStatisticsService; import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; import com.xinelu.manage.service.questioninfo.IQuestionInfoService; import com.xinelu.manage.service.signpatientmanageroute.ISignPatientManageRouteService; import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; -import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService; import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService; import com.xinelu.manage.vo.labelfieldcontent.LabelField; @@ -478,13 +475,11 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout @Override public AjaxResult selectFollowPatientInfo(Long id) { ManualFollowPatientVO patientVO = signPatientManageRouteMapper.selectFollowPatientInfo(id); - if (Objects.isNull(patientVO.getAge())) - // 设置年龄 - patientVO.setAge(AgeUtil.getAgeMonth(patientVO.getBirthDate().toString())); if (ObjectUtils.isEmpty(patientVO)) { return AjaxResult.error("患者信息不存在!"); } - if (Objects.nonNull(patientVO.getBirthDate())) { + if (Objects.isNull(patientVO.getAge()) && Objects.nonNull(patientVO.getBirthDate())) { + // 设置年龄 patientVO.setAge(AgeUtil.getAgeMonth(patientVO.getBirthDate().toString())); } return AjaxResult.success(patientVO); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/UploadRobotPublishRecordVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/UploadRobotPublishRecordVo.java index 54a040db..644c498a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/UploadRobotPublishRecordVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/UploadRobotPublishRecordVo.java @@ -99,7 +99,7 @@ public class UploadRobotPublishRecordVo { */ @ApiModelProperty(value = "调查分数") @Excel(name = "调查分数") - private BigDecimal SurveyScore; + private BigDecimal totalScore; /** * 反馈意见 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 9c0f86b5..e56ac1dc 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -1115,6 +1115,7 @@ pqsr.task_execute_record_id, pqsr.remarkable_flag, pqsr.id, + pqsr.total_score, pi.patient_phone, pi.patient_name, pi.id AS patientId,