diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java index 7b04a04..9c7083c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java @@ -6,26 +6,21 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; /** -* -* 患者信息表-调试 AddDTO -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 患者信息表-调试 AddDTO + * + * @author AutoGenerator + * @since 2023-08-29 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="AddOcrBasicTestDTO对象", description="患者信息表-调试") +@ApiModel(value = "AddOcrBasicTestDTO对象", description = "患者信息表-调试") public class AddOcrBasicTestDTO implements Serializable { @ApiModelProperty(value = "id") @@ -64,11 +59,4 @@ public class AddOcrBasicTestDTO implements Serializable { @ApiModelProperty(value = "分段完成时间") private Date ocrFinishTime; - @ApiModelProperty(value = "创建时间") - private Date createTime; - - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - } diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java index 1ae9764..02a6e74 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java @@ -1,30 +1,31 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.segmentation.ocrbasic.AddOcrBasicDTO; +import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; import com.docus.server.entity.segmentation.OcrBasic; - import com.docus.server.dto.segmentation.ocrbasic.AddOcrBasicDTO; - import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; - import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; import com.docus.server.vo.segmentation.ocrbasic.OcrBasicVO; - import org.mapstruct.Mapper; +import org.mapstruct.MappingTarget; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; import java.util.List; /** -* -* 患者信息表 服务转换器 -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 患者信息表 服务转换器 + * + * @author AutoGenerator + * @since 2023-08-29 + */ @Mapper public interface OcrBasicConvert { OcrBasicConvert INSTANCE = Mappers.getMapper(OcrBasicConvert.class); + @Mappings({}) + OcrBasic convertDO(AddOcrBasicDTO addOcrBasicDTO, @MappingTarget OcrBasic ocrBasic); + @Mappings({}) OcrBasic convertDO(AddOcrBasicDTO addOcrBasicDTO); diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java index d35d277..2e972e6 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java @@ -1,25 +1,23 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.segmentation.ocrbasictest.AddOcrBasicTestDTO; +import com.docus.server.dto.segmentation.ocrbasictest.EditOcrBasicTestDTO; import com.docus.server.entity.segmentation.OcrBasicTest; - import com.docus.server.dto.segmentation.ocrbasictest.AddOcrBasicTestDTO; - import com.docus.server.dto.segmentation.ocrbasictest.EditOcrBasicTestDTO; - import com.docus.server.dto.segmentation.ocrbasictest.DeleteOcrBasicTestDTO; import com.docus.server.vo.segmentation.ocrbasictest.OcrBasicTestVO; - import org.mapstruct.Mapper; +import org.mapstruct.MappingTarget; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; import java.util.List; /** -* -* 患者信息表-调试 服务转换器 -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 患者信息表-调试 服务转换器 + * + * @author AutoGenerator + * @since 2023-08-29 + */ @Mapper public interface OcrBasicTestConvert { @@ -28,6 +26,9 @@ public interface OcrBasicTestConvert { @Mappings({}) OcrBasicTest convertDO(AddOcrBasicTestDTO addOcrBasicTestDTO); + @Mappings({}) + OcrBasicTest convertDO(AddOcrBasicTestDTO addOcrBasicTestDTO, @MappingTarget OcrBasicTest ocrBasicTest); + @Mappings({}) OcrBasicTest convertDO(EditOcrBasicTestDTO editOcrBasicTestDTO); diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java index 119528d..5e54f55 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java @@ -62,4 +62,12 @@ public interface IOcrBasicService { * @return 分页列表 */ PageResult search(SearchDTO searchDTO); + + /** + * 新增或修改 + * + * @param addOcrBasicDTO 编辑参数 + * @return 成功或失败 + */ + boolean saveOrUpdate(AddOcrBasicDTO addOcrBasicDTO); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java index a3424d7..7842a3d 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java @@ -47,6 +47,14 @@ public interface IOcrBasicTestService { */ boolean edit(EditOcrBasicTestDTO editOcrBasicTestDTO); + /** + * 新增或修改 + * + * @param editOcrBasicTestDTO 编辑参数 + * @return 成功或失败 + */ + boolean saveOrUpdate(AddOcrBasicTestDTO editOcrBasicTestDTO); + /** * 批量删除 * diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java index f770db7..dba9891 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java @@ -40,8 +40,7 @@ public class CommonService { addOcrBasicDTO.setInpatientNo(request.getInpatientNo()); addOcrBasicDTO.setName(request.getName()); - - iOcrBasicTestService.add(addOcrBasicDTO); + iOcrBasicTestService.saveOrUpdate(addOcrBasicDTO); AddOcrFileInfoTestDTO addOcrFileInfoDTO = new AddOcrFileInfoTestDTO(); @@ -75,7 +74,7 @@ public class CommonService { addOcrBasicDTO.setInpatientNo(request.getInpatientNo()); addOcrBasicDTO.setName(request.getName()); - iOcrBasicService.add(addOcrBasicDTO); + iOcrBasicService.saveOrUpdate(addOcrBasicDTO); AddOcrFileInfoDTO addOcrFileInfoDTO = new AddOcrFileInfoDTO(); diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java index d93aab2..f5846ab 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java @@ -1,5 +1,6 @@ package com.docus.server.service.impl; +import com.docus.core.util.DateUtil; import com.docus.infrastructure.redis.service.IdService; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; @@ -131,6 +132,23 @@ public class OcrBasicServiceImpl implements IOcrBasicService { // return iOcrBasicDao.edit(ocrBasic); } + @Override + @Transactional(rollbackFor = Exception.class) + public boolean saveOrUpdate(AddOcrBasicDTO editOcrBasicDTO) { + OcrBasic ocrBasic = OcrBasicConvert.INSTANCE.convertDO(editOcrBasicDTO); + OcrBasic ocrBasicDO = iOcrBasicDao.findOneBy("patientId", ocrBasic.getPatientId()); + if (null == ocrBasicDO) { + ocrBasic.setId(idService.getDateSeq()); + return iOcrBasicDao.add(ocrBasic); + } else { + Long id = ocrBasicDO.getId(); + OcrBasic ocrBasicPO = OcrBasicConvert.INSTANCE.convertDO(editOcrBasicDTO, ocrBasicDO); + ocrBasicPO.setId(id); + ocrBasicPO.setUpdateTime(DateUtil.now()); + return iOcrBasicDao.edit(ocrBasicPO); + } + } + /** * 批量删除 * diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java index 1b1a8b2..c7b61a6 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java @@ -1,5 +1,6 @@ package com.docus.server.service.impl; +import com.docus.core.util.DateUtil; import com.docus.infrastructure.redis.service.IdService; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; @@ -131,6 +132,29 @@ public class OcrBasicTestServiceImpl implements IOcrBasicTestService { // return iOcrBasicTestDao.edit(ocrBasicTest); } + /** + * 编辑 + * + * @param editOcrBasicTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean saveOrUpdate(AddOcrBasicTestDTO editOcrBasicTestDTO) { + OcrBasicTest ocrBasicTest = OcrBasicTestConvert.INSTANCE.convertDO(editOcrBasicTestDTO); + OcrBasicTest ocrBasicTestDO = iOcrBasicTestDao.findOneBy("patientId", ocrBasicTest.getPatientId()); + if (null == ocrBasicTestDO) { + ocrBasicTest.setId(idService.getDateSeq()); + return iOcrBasicTestDao.add(ocrBasicTest); + } else { + Long id = ocrBasicTestDO.getId(); + OcrBasicTest ocrBasicTestPO = OcrBasicTestConvert.INSTANCE.convertDO(editOcrBasicTestDTO, ocrBasicTestDO); + ocrBasicTestPO.setId(id); + ocrBasicTestPO.setUpdateTime(DateUtil.now()); + return iOcrBasicTestDao.edit(ocrBasicTestPO); + } + } + /** * 批量删除 *