diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java index 1d665ac..513acd1 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java @@ -19,9 +19,9 @@ import com.xinelu.common.enums.GooodsOrderStatusEnum; import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.AgeUtil; -import com.xinelu.manage.domain.appointmentorder.AppointmentOrder; import com.xinelu.common.utils.http.HttpService; import com.xinelu.common.utils.spring.SpringUtils; +import com.xinelu.manage.domain.appointmentorder.AppointmentOrder; import com.xinelu.manage.domain.goodsOrder.GoodsOrder; import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.sysarea.SysAreaMapper; @@ -184,6 +184,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService { PatientAndDiseaseVO patientDisease = nurseAppLoginMapper.getPatientDiseaseByPatientId(patientId); if (Objects.nonNull(patientDisease) && Objects.nonNull(patientDisease.getBirthDate())) { patientDisease.setAge(AgeUtil.getAgeMonth(String.valueOf(patientDisease.getBirthDate()))); + patientDisease.setId(patientId); } if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getDisease())) { patientDisease.setDiseaseList(Arrays.stream(patientDisease.getDisease().split(",")) @@ -241,7 +242,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService { signNo = null; } // 不一致才更新签约编号 - if(!String.valueOf(signNo).equals(String.valueOf(patientDisease.getSignNo()))) { + if (!String.valueOf(signNo).equals(String.valueOf(patientDisease.getSignNo()))) { patientInfoMapper.updateSignNo(patientDisease.getPatientId(), signNo); patientDisease.setSignNo(signNo); } diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java index 6b3fe54..0c6b461 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java @@ -16,6 +16,12 @@ import java.util.List; @Data public class PatientAndDiseaseVO implements Serializable { private static final long serialVersionUID = 695364456232491661L; + + /** + * 被护理人基本信息表id(前端使用=patientId) + */ + private Long id; + /** * 被护理人基本信息表id */