报告打印统计
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
This commit is contained in:
parent
4962c79588
commit
c2c53271d4
@ -26,11 +26,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
|
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||||
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
||||||
|
|
||||||
@ -73,6 +75,14 @@ public class PatientexamlistController {
|
|||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PutMapping("/updateExamItemName")
|
||||||
|
@Operation(summary = "更新ExamItemName")
|
||||||
|
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:update')")
|
||||||
|
public CommonResult<Boolean> updateExamItemNameById(@RequestParam("id") String id, @RequestParam("examItemName") String examItemName) {
|
||||||
|
patientexamlistService.updateExamItemNameById(id, examItemName);
|
||||||
|
return success(true);
|
||||||
|
}
|
||||||
|
|
||||||
@DeleteMapping("/delete")
|
@DeleteMapping("/delete")
|
||||||
@Operation(summary = "删除PACS检查列表")
|
@Operation(summary = "删除PACS检查列表")
|
||||||
@Parameter(name = "id", description = "编号", required = true)
|
@Parameter(name = "id", description = "编号", required = true)
|
||||||
@ -109,15 +119,13 @@ public class PatientexamlistController {
|
|||||||
doList = pageResult.getList().stream()
|
doList = pageResult.getList().stream()
|
||||||
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US")))
|
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
} else if (devicetype != null && !devicetype.trim().isEmpty())//表示只查询影像的数据
|
||||||
else if(devicetype!=null&&!devicetype.trim().isEmpty())//表示只查询影像的数据
|
|
||||||
{
|
{
|
||||||
// 筛选条件:
|
// 筛选条件:
|
||||||
doList = pageResult.getList().stream()
|
doList = pageResult.getList().stream()
|
||||||
.filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().contains("US")))
|
.filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().contains("US")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
} else //devicetype为空,查询全部数据
|
||||||
else //devicetype为空,查询全部数据
|
|
||||||
{
|
{
|
||||||
doList = pageResult.getList();
|
doList = pageResult.getList();
|
||||||
}
|
}
|
||||||
@ -150,6 +158,7 @@ public class PatientexamlistController {
|
|||||||
patientexamlistService.dicomDataSync();
|
patientexamlistService.dicomDataSync();
|
||||||
return success(true);
|
return success(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/dicomDataRefresh")
|
@GetMapping("/dicomDataRefresh")
|
||||||
@Operation(summary = "dicomj检查后数据刷新")
|
@Operation(summary = "dicomj检查后数据刷新")
|
||||||
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
|
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
|
||||||
@ -185,8 +194,7 @@ public class PatientexamlistController {
|
|||||||
//先拿orgid查询出来对应的org表的上级机构代码
|
//先拿orgid查询出来对应的org表的上级机构代码
|
||||||
String hiorgid = OrgService.GetOrgHiORGId(orgId);
|
String hiorgid = OrgService.GetOrgHiORGId(orgId);
|
||||||
log.debug("查询出来对应的org表的上级机构代码" + hiorgid);
|
log.debug("查询出来对应的org表的上级机构代码" + hiorgid);
|
||||||
if (!hiorgid.isEmpty())
|
if (!hiorgid.isEmpty()) {
|
||||||
{
|
|
||||||
PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
|
PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
|
||||||
updateReqVO.setId(id);
|
updateReqVO.setId(id);
|
||||||
updateReqVO.setHighLevelOrgId(hiorgid);
|
updateReqVO.setHighLevelOrgId(hiorgid);
|
||||||
@ -233,6 +241,4 @@ public class PatientexamlistController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
@ -6,10 +6,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|||||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||||
import cn.iocoder.yudao.module.tblist.dal.dataobject.patientexamlist.PatientexamlistDO;
|
import cn.iocoder.yudao.module.tblist.dal.dataobject.patientexamlist.PatientexamlistDO;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.*;
|
||||||
import cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist.vo.*;
|
import cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist.vo.*;
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
import org.apache.ibatis.annotations.Select;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PACS检查列表 Mapper
|
* PACS检查列表 Mapper
|
||||||
@ -18,6 +16,9 @@ import org.apache.ibatis.annotations.Select;
|
|||||||
*/
|
*/
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
|
public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
|
||||||
|
//更新
|
||||||
|
@Update(" UPDATE tb_patientexamlist t1 SET t1.examItemName=#{examItemName} WHERE t1.ID=#{id} ")
|
||||||
|
int updateExamItemNameById(@Param("id") String id, @Param("examItemName") String examItemName);
|
||||||
|
|
||||||
//IllnessCasePageReqVO分页
|
//IllnessCasePageReqVO分页
|
||||||
default PageResult<PatientexamlistDO> selectPage(IllnessCasePageReqVO reqVO) {
|
default PageResult<PatientexamlistDO> selectPage(IllnessCasePageReqVO reqVO) {
|
||||||
|
@ -77,10 +77,19 @@ public interface PatientexamlistService extends IService<PatientexamlistDO> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void dicomDataSync();
|
void dicomDataSync();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新examItemName
|
||||||
|
*
|
||||||
|
* @param
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void updateExamItemNameById(String id, String examItemName);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 刷新dicom分检数据至tb_patientexamlist
|
* 刷新dicom分检数据至tb_patientexamlist
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
boolean dicomDataRefresh(String orgId);
|
boolean dicomDataRefresh(String orgId);
|
||||||
|
|
||||||
boolean insertbatch(List<PatientexamlistDO> doList);
|
boolean insertbatch(List<PatientexamlistDO> doList);
|
||||||
}
|
}
|
@ -163,19 +163,22 @@ public class PatientexamlistServiceImpl extends ServiceImpl<PatientexamlistMappe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateExamItemNameById(String id, String examItemName) {
|
||||||
|
validatePatientexamlistExists(id);
|
||||||
|
patientexamlistMapper.updateExamItemNameById(id, examItemName);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean dicomDataRefresh(String orgId) {
|
public boolean dicomDataRefresh(String orgId) {
|
||||||
//先查询所有的状态是分检的数据并且是检查时间为空的数据
|
//先查询所有的状态是分检的数据并且是检查时间为空的数据
|
||||||
List<PatientexamlistDO> doList = patientexamlistMapper.GetSortingDataList(orgId);
|
List<PatientexamlistDO> doList = patientexamlistMapper.GetSortingDataList(orgId);
|
||||||
boolean bol = false;
|
boolean bol = false;
|
||||||
if(!doList.isEmpty())
|
if (!doList.isEmpty()) { //更新数据集合
|
||||||
{ //更新数据集合
|
|
||||||
List<PatientexamlistDO> aDo = new ArrayList<>();
|
List<PatientexamlistDO> aDo = new ArrayList<>();
|
||||||
for (PatientexamlistDO patientexamlistDO:doList)
|
for (PatientexamlistDO patientexamlistDO : doList) {
|
||||||
{
|
|
||||||
List<DicomstudiesDO> dicomstudiesDOS = dicomworklistMapper.GetInstaDicomStudiesData(patientexamlistDO.getRegId(), patientexamlistDO.getExamId(), orgId);
|
List<DicomstudiesDO> dicomstudiesDOS = dicomworklistMapper.GetInstaDicomStudiesData(patientexamlistDO.getRegId(), patientexamlistDO.getExamId(), orgId);
|
||||||
if(!dicomstudiesDOS.isEmpty())
|
if (!dicomstudiesDOS.isEmpty()) {
|
||||||
{
|
|
||||||
String seim = dicomworklistMapper.GetSeDcByPatientIDAndStudyInsta(dicomstudiesDOS.get(0).getPatientID(), dicomstudiesDOS.get(0).getStudyInsta());
|
String seim = dicomworklistMapper.GetSeDcByPatientIDAndStudyInsta(dicomstudiesDOS.get(0).getPatientID(), dicomstudiesDOS.get(0).getStudyInsta());
|
||||||
PatientexamlistDO examdo = new PatientexamlistDO();
|
PatientexamlistDO examdo = new PatientexamlistDO();
|
||||||
examdo.setId(patientexamlistDO.getId());
|
examdo.setId(patientexamlistDO.getId());
|
||||||
@ -185,8 +188,7 @@ public class PatientexamlistServiceImpl extends ServiceImpl<PatientexamlistMappe
|
|||||||
aDo.add(examdo);
|
aDo.add(examdo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!aDo.isEmpty())
|
if (!aDo.isEmpty()) {
|
||||||
{
|
|
||||||
bol = updateBatchById(aDo);
|
bol = updateBatchById(aDo);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user