linjj
/
docus-collector2.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改文件上传和基础信息bug

Browse Source
segment2.0
linrf 2 years ago
parent f8a8095330
commit ec5ca3c635
8 changed files with 88 additions and 41 deletions
Show Stats Download Patch File Download Diff File

24
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java
Unescape Escape View File

@ -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;
}

21
docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java
Unescape Escape View File

@ -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);

21
docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java
Unescape Escape View File

@ -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);

8
docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java
Unescape Escape View File

@ -62,4 +62,12 @@ public interface IOcrBasicService {
* @return 分页列表
*/
PageResult<OcrBasicVO> search(SearchDTO searchDTO);
/**
* 新增或修改
*
* @param addOcrBasicDTO 编辑参数
* @return 成功或失败
*/
boolean saveOrUpdate(AddOcrBasicDTO addOcrBasicDTO);
}

8
docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java
Unescape Escape View File

@ -47,6 +47,14 @@ public interface IOcrBasicTestService {
*/
boolean edit(EditOcrBasicTestDTO editOcrBasicTestDTO);
/**
* 新增或修改
*
* @param editOcrBasicTestDTO 编辑参数
* @return 成功或失败
*/
boolean saveOrUpdate(AddOcrBasicTestDTO editOcrBasicTestDTO);
/**
* 批量删除
*

5
docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java
Unescape Escape View File

@ -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();

18
docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java
Unescape Escape View File

@ -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);
}
}
/**
* 批量删除
*

24
docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java
Unescape Escape View File

@ -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);
}
}
/**
* 批量删除
*

Write Preview
Loading…
Cancel
Save