From b2ee16ceb6c4914d7ad1801d69aeb2edccd8e410 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 15 Nov 2023 17:06:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BA=BA=E5=91=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AppOrderEvaluateServiceImpl.java | 4 +++ .../impl/NursingOrderServiceImpl.java | 15 ++++------ .../impl/HospitalPersonInfoServiceImpl.java | 30 +++++++++++-------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java index f60a958..258fe6e 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java @@ -61,6 +61,10 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService { @Transactional(rollbackFor = Exception.class) @Override public AjaxResult insertAppointmentEvaluate(OrderEvaluateInfo orderEvaluateInfo) { + OrderEvaluateAndPictureDTO orderEvaluate = appOrderEvaluateMapper.selectOrderEvaluateAndPictureByOrderNo(orderEvaluateInfo.getOrderNo()); + if (Objects.nonNull(orderEvaluate)) { + return AjaxResult.error("当前订单已评价！"); + } AppointmentOrder appointmentOrder = appointmentOrderMapper.selectAppointmentOrderById(null, orderEvaluateInfo.getOrderNo()); if (Objects.isNull(appointmentOrder) || StringUtils.isBlank(appointmentOrder.getOrderStatus()) || !appointmentOrder.getOrderStatus().equals(OrderStatusEnum.COMPLETE.getInfo())) { return AjaxResult.error("当前订单未服务完成，不能评价！"); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java index 694da46..5634abf 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java @@ -30,21 +30,16 @@ import com.xinelu.manage.service.hospitalinfo.IHospitalInfoService; import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.service.patientinfo.IPatientInfoService; import com.xinelu.manage.vo.patientinfo.PatientInfoVO; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -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.StringUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; + /** * @Description 订单分页 * @Author ZhangHeng diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java index 096403d..4b16edc 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java @@ -48,7 +48,6 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService private RegexUtil regexUtil; @Resource private HospitalPersonCertificateMapper hospitalPersonCertificateMapper; - @Resource private SysUserMapper userMapper; @@ -112,7 +111,12 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService return AjaxResult.error("咨询费用不能为0或者负数，请重新输入"); } //创建人 创建时间 科室人员编码 - hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone()); + if (StringUtils.equals("2", hospitalPersonInfo.getStatus()) && StringUtils.isBlank(hospitalPersonInfo.getPersonAccount())){ + hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone()); + } + if (StringUtils.equals("2", hospitalPersonInfo.getStatus()) && StringUtils.isBlank(hospitalPersonInfo.getPersonPassword())){ + hospitalPersonInfo.setPersonPassword("Abc@123"); + } hospitalPersonInfo.setPersonCode(Constants.PERSON_CODE + generateSystemCodeUtil.generateSystemCode(Constants.PERSON_CODE)); hospitalPersonInfo.setCreateTime(LocalDateTime.now()); hospitalPersonInfo.setCreateBy(SecurityUtils.getUsername()); @@ -135,9 +139,8 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService } // 保存到sys_user表 SysUser sysUser = new SysUser(); - sysUser.setUserName(hospitalPersonInfo.getPersonPhone()); - sysUser.setPhonenumber(hospitalPersonInfo.getPersonPhone()); - sysUser.setPassword(SecurityUtils.encryptPassword("Abc@123")); + sysUser.setUserName(hospitalPersonInfo.getPersonAccount()); + sysUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); sysUser.setNickName(hospitalPersonInfo.getPersonName()); sysUser.setHospitalPersonId(hospitalPersonInfo.getId()); sysUser.setHospitalId(hospitalPersonInfo.getHospitalId()); @@ -169,7 +172,12 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService return AjaxResult.error("咨询费用不能为0或者负数，请重新输入"); } //修改人 修改时间 - hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone()); + if (StringUtils.equals("2", hospitalPersonInfo.getStatus()) && StringUtils.isBlank(hospitalPersonInfo.getPersonAccount())){ + hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone()); + } + if (StringUtils.equals("2", hospitalPersonInfo.getStatus()) && StringUtils.isBlank(hospitalPersonInfo.getPersonPassword())){ + hospitalPersonInfo.setPersonPassword("Abc@123"); + } hospitalPersonInfo.setUpdateTime(LocalDateTime.now()); hospitalPersonInfo.setUpdateBy(SecurityUtils.getUsername()); hospitalPersonInfoMapper.updateHospitalPersonInfo(hospitalPersonInfo); @@ -179,9 +187,8 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService List userList = userMapper.selectUserList(sysUser); if (CollectionUtils.isEmpty(userList)) { SysUser newUser = new SysUser(); - newUser.setUserName(hospitalPersonInfo.getPersonPhone()); - newUser.setPhonenumber(hospitalPersonInfo.getPersonPhone()); - newUser.setPassword(SecurityUtils.encryptPassword("Abc@123")); + newUser.setUserName(hospitalPersonInfo.getPersonAccount()); + newUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); newUser.setNickName(hospitalPersonInfo.getPersonName()); newUser.setHospitalPersonId(hospitalPersonInfo.getId()); newUser.setHospitalId(hospitalPersonInfo.getHospitalId()); @@ -190,9 +197,8 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService userMapper.insertUser(newUser); } else { SysUser updUser = userList.get(0); - updUser.setUserName(hospitalPersonInfo.getPersonPhone()); - updUser.setPhonenumber(hospitalPersonInfo.getPersonPhone()); - updUser.setPassword(SecurityUtils.encryptPassword("Abc@123")); + updUser.setUserName(hospitalPersonInfo.getPersonAccount()); + updUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); updUser.setNickName(hospitalPersonInfo.getPersonName()); updUser.setHospitalPersonId(hospitalPersonInfo.getId()); updUser.setHospitalId(hospitalPersonInfo.getHospitalId());