Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

This commit is contained in:
haown 2024-07-15 17:09:06 +08:00
commit 107b369de8

View File

@ -294,6 +294,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
if (StringUtils.isBlank(portraitSnVO.getPortraitSn())) { if (StringUtils.isBlank(portraitSnVO.getPortraitSn())) {
portraitSnVO.setPortraitSn(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"))); portraitSnVO.setPortraitSn(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")));
portraitSnVO.getGroupingValues().forEach(item -> item.setPortraitSn(portraitSnVO.getPortraitSn())); portraitSnVO.getGroupingValues().forEach(item -> item.setPortraitSn(portraitSnVO.getPortraitSn()));
portraitSnVO.getGroupingValues().forEach(item -> item.setLabelFieldContentId(null));
} }
groupingValues.addAll(portraitSnVO.getGroupingValues()); groupingValues.addAll(portraitSnVO.getGroupingValues());
TimeUnit.MILLISECONDS.sleep(10); TimeUnit.MILLISECONDS.sleep(10);
@ -324,8 +325,8 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
insertGroupingValues.add(groupingValue); insertGroupingValues.add(groupingValue);
} }
if (Objects.nonNull(groupingValue.getLabelFieldContentId())) { if (Objects.nonNull(groupingValue.getLabelFieldContentId())) {
groupingValue.setCreateTime(LocalDateTime.now()); groupingValue.setUpdateTime(LocalDateTime.now());
groupingValue.setCreateBy(SecurityUtils.getUsername()); groupingValue.setUpdateBy(SecurityUtils.getUsername());
groupingValue.setPortraitStatus(PortraitStatusEnum.INUSE.getInfo()); groupingValue.setPortraitStatus(PortraitStatusEnum.INUSE.getInfo());
updateGroupingValues.add(groupingValue); updateGroupingValues.add(groupingValue);
} }