提交merge1.3
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.Device;
|
||||
import com.openhis.administration.domain.Instrument;
|
||||
import com.openhis.web.Inspection.dto.InstrumentSelParam;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/18 15:38
|
||||
*/
|
||||
public interface IInstrumentManageAppService {
|
||||
|
||||
|
||||
R<?> getManageInit();
|
||||
|
||||
|
||||
R<?> getInstrumentPage(InstrumentSelParam InstrumentSelParam, String searchKey, Integer pageNo, Integer pageSize,
|
||||
HttpServletRequest request);
|
||||
|
||||
|
||||
R<?> updateOrAddInstrument(Instrument instrument);
|
||||
|
||||
R<?> getInstrumentOne(Long id);
|
||||
|
||||
R<?> editInstrumentStatus(List<Long> ids, Integer status);
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/16 15:36
|
||||
*/
|
||||
public interface ILaboratoryManageAppService {
|
||||
|
||||
R<?> getReportResultList(ReportResultManageDto reportResultManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
|
||||
|
||||
|
||||
R<?> getReportById(Long id);
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/29 16:00
|
||||
*/
|
||||
public interface ILisConfigManageAppService {
|
||||
|
||||
R<?> getDiseaseTreatmentPage(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam, String searchKey,
|
||||
Integer pageNo, Integer pageSize, HttpServletRequest request);
|
||||
|
||||
|
||||
R<?> getInfoList(String searchKey,String type);
|
||||
|
||||
R<?> getInfoDetail(Long id);
|
||||
|
||||
R<?> saveAll(LisConfigManageDto manageDto);
|
||||
|
||||
/**
|
||||
*
|
||||
* @param patientId 患者id
|
||||
* @param ServiceId 服务id
|
||||
* @param itemId 检验项目id
|
||||
* @return
|
||||
*/
|
||||
R<?>createAll(Long patientId,Long ServiceId, Long itemId);
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/23 16:32
|
||||
*/
|
||||
public interface IObservationManageAppService {
|
||||
|
||||
R<?> getManageInit();
|
||||
|
||||
|
||||
R<?> getObservationDefPage(ObservationDefSelParam ObservationDefSelParam, String searchKey, Integer pageNo, Integer pageSize,
|
||||
HttpServletRequest request);
|
||||
|
||||
|
||||
R<?> updateOrAddObservationDef(ObservationDefinition Observation);
|
||||
|
||||
R<?> getObservationDefOne(Long id);
|
||||
|
||||
R<?> editObservationDefStatus(List<Long> ids, Integer status);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/16 15:36
|
||||
*/
|
||||
public interface ISampleCollectAppManageAppService {
|
||||
|
||||
R<?> getSampleCollectList(SampleCollectManageDto sampleCollectManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request);
|
||||
|
||||
|
||||
R<?>updateSampleStatus(SampleCollectStatusRequest statusRequest);
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.openhis.web.Inspection.appservice;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/9 16:46
|
||||
*/
|
||||
public interface ISpecimenManageAppService {
|
||||
|
||||
|
||||
|
||||
R<?> getManageInit();
|
||||
|
||||
|
||||
R<?> getSpecimenPage(SpecimenDefSelParam specimenDefSelParam, String searchKey, Integer pageNo, Integer pageSize,
|
||||
HttpServletRequest request);
|
||||
|
||||
|
||||
R<?> updateOrAddSpecimen(SpecimenDefinition specimenDefinition);
|
||||
|
||||
R<?> getSpecimenOne(Long id);
|
||||
|
||||
R<?> editSpecimenStatus(List<Long> ids,Integer status);
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.MessageUtils;
|
||||
import com.openhis.administration.domain.Instrument;
|
||||
import com.openhis.administration.mapper.InstrumentMapper;
|
||||
import com.openhis.administration.service.IInstrumentService;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.InstrumentCategory;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisPageUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.IInstrumentManageAppService;
|
||||
import com.openhis.web.Inspection.dto.InstrumentManageDto;
|
||||
import com.openhis.web.Inspection.dto.InstrumentManageInitDto;
|
||||
import com.openhis.web.Inspection.dto.InstrumentSelParam;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* @Description 仪器信息
|
||||
* @Author
|
||||
* @Date 2025/9/18
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class InstrumentManageAppServiceImpl implements IInstrumentManageAppService {
|
||||
|
||||
private final IInstrumentService instrumentService ;
|
||||
private final InstrumentMapper instrumentMapper ;
|
||||
|
||||
|
||||
@Override
|
||||
public R<?> getManageInit() {
|
||||
InstrumentManageInitDto instrumentManageInitDto = new InstrumentManageInitDto();
|
||||
// 获取状态
|
||||
List<InstrumentManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
|
||||
.map(status -> new InstrumentManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
instrumentManageInitDto.setStatusFlagOptions(statusEnumOptions);
|
||||
// 获取仪器种类
|
||||
List<InstrumentManageInitDto.InstrumentType> typeList = Stream.of(com.openhis.common.enums.InstrumentCategory.values())
|
||||
.map(status -> new InstrumentManageInitDto.InstrumentType(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
instrumentManageInitDto.setInstrumentTypeList(typeList);
|
||||
// 获取仪器状态
|
||||
List<InstrumentManageInitDto.InstrumentStatusEnumOption> InstrumentStatusEnumOptions = Stream.of(com.openhis.common.enums.InstrumentStatus.values())
|
||||
.map(status -> new InstrumentManageInitDto.InstrumentStatusEnumOption(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
instrumentManageInitDto.setInstrumentStatusEnumList(InstrumentStatusEnumOptions);
|
||||
|
||||
return R.ok(instrumentManageInitDto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> getInstrumentPage(InstrumentSelParam InstrumentSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
|
||||
QueryWrapper<Instrument> queryWrapper = HisQueryUtils.buildQueryWrapper(InstrumentSelParam,
|
||||
searchKey, new HashSet<>(Arrays.asList( "instrument_name", "instrument_name")), request);
|
||||
Page<InstrumentManageDto> instrumentPage = HisPageUtils.selectPage(instrumentMapper, queryWrapper, pageNo, pageSize,InstrumentManageDto.class);
|
||||
instrumentPage.getRecords().forEach(instrumentManageDto -> {
|
||||
instrumentManageDto.setInstrumentTypeEnumText(EnumUtils.getInfoByValue(InstrumentCategory.class, instrumentManageDto.getInstrumentTypeEnum())) ;
|
||||
});
|
||||
|
||||
return R.ok(instrumentPage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> updateOrAddInstrument(Instrument instrument) {
|
||||
instrumentService.saveOrUpdate( instrument);
|
||||
return R.ok();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> getInstrumentOne(Long id)
|
||||
{
|
||||
Instrument byId = instrumentService.getById(id);
|
||||
InstrumentManageDto dto = new InstrumentManageDto();
|
||||
BeanUtils.copyProperties(byId,dto);
|
||||
return R.ok(dto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> editInstrumentStatus(List<Long> ids, Integer status) {
|
||||
List<Instrument> instrumentList = new CopyOnWriteArrayList<>();
|
||||
for (Long detail : ids) {
|
||||
Instrument instrument = new Instrument();
|
||||
instrument.setId(detail);
|
||||
instrument.setUsageStatusEnum(status);
|
||||
instrumentList.add(instrument);
|
||||
}
|
||||
return instrumentService.updateBatchById(instrumentList) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"仪器信息"})) : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.common.enums.AdministrativeGender;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.openhis.web.Inspection.mapper.LisReportMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description 样本采集
|
||||
* @Author
|
||||
* @Date 2025/10/16
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class LaboratoryManageAppService implements ILaboratoryManageAppService {
|
||||
|
||||
private final LisReportMapper reportMapper;
|
||||
@Override
|
||||
public R<?> getReportResultList(ReportResultManageDto reportResultManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
|
||||
QueryWrapper<ReportResultManageDto> queryWrapper =
|
||||
HisQueryUtils.buildQueryWrapper(reportResultManageDto,
|
||||
searchKey, new HashSet<>(Arrays.asList( "patient_name", "charge_name")), request);
|
||||
IPage<ReportResultManageDto> reportResultList = reportMapper.getReportResultList(new Page<>(pageNo, pageSize), queryWrapper);
|
||||
Long total = reportMapper.getReportResultListTotal(new Page<>(pageNo, pageSize), queryWrapper);
|
||||
reportResultList.getRecords().forEach(e -> {
|
||||
// 性别
|
||||
e.setGenderEnumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
|
||||
});
|
||||
if(total == null){
|
||||
//总条数为null
|
||||
total = 0L;
|
||||
}
|
||||
reportResultList.setTotal(total);
|
||||
return R.ok(reportResultList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> getReportById(Long id) {
|
||||
//根据id查询所有观测值
|
||||
List<ReportResultManageDto> list = reportMapper.getReportListById(new QueryWrapper<ReportResultManageDto>().eq("id", id));
|
||||
//打印组件配置
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,188 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.SecurityUtils;
|
||||
import com.openhis.administration.domain.Device;
|
||||
import com.openhis.administration.domain.DeviceDefinition;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.administration.service.IDeviceDefinitionService;
|
||||
import com.openhis.administration.service.IDeviceService;
|
||||
import com.openhis.administration.service.IObservationDefinitionService;
|
||||
import com.openhis.administration.service.ISpecimenDefinitionService;
|
||||
import com.openhis.common.enums.SpecCollectStatus;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.lab.domain.*;
|
||||
import com.openhis.lab.mapper.ActivityDefDeviceDefMapper;
|
||||
import com.openhis.lab.mapper.ActivityDefObservationDefMapper;
|
||||
import com.openhis.lab.mapper.ActivityDefSpecimenDefMapper;
|
||||
import com.openhis.lab.service.IObservationService;
|
||||
import com.openhis.lab.service.ISpecimenService;
|
||||
import com.openhis.web.Inspection.appservice.ILisConfigManageAppService;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageInitDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
import com.openhis.web.datadictionary.mapper.ActivityDefinitionManageMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.val;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/29
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class LisConfigManageAppServiceImpl implements ILisConfigManageAppService {
|
||||
|
||||
@Resource
|
||||
private ActivityDefinitionManageMapper activityDefinitionManageMapper;
|
||||
@Resource
|
||||
private ActivityDefDeviceDefMapper activityDefDeviceDefMapper;
|
||||
@Resource
|
||||
private ActivityDefObservationDefMapper activityDefObservationDefMapper;
|
||||
@Resource
|
||||
private ActivityDefSpecimenDefMapper activityDefSpecimenDefMapper;
|
||||
@Resource
|
||||
private IDeviceDefinitionService deviceDefinitionService;
|
||||
@Resource
|
||||
private ISpecimenDefinitionService specimenDefinitionService;
|
||||
@Resource
|
||||
private IObservationDefinitionService observationDefinitionService;
|
||||
@Resource
|
||||
private IObservationService observationService;
|
||||
@Resource
|
||||
private ISpecimenService specimenService;
|
||||
@Resource
|
||||
private IDeviceService deviceService;
|
||||
|
||||
|
||||
@Override
|
||||
public R<?> getDiseaseTreatmentPage(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
|
||||
// 构建查询条件
|
||||
QueryWrapper<DiagnosisTreatmentDto> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
|
||||
searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
|
||||
|
||||
// 分页查询
|
||||
IPage<DiagnosisTreatmentDto> diseaseTreatmentPage =
|
||||
activityDefinitionManageMapper.getDiseaseTreatmentPage(new Page<>(pageNo, pageSize), queryWrapper);
|
||||
|
||||
|
||||
|
||||
return R.ok(diseaseTreatmentPage);
|
||||
}
|
||||
|
||||
public R<?> getInfoList(String searchKey, String type) {
|
||||
LisConfigManageInitDto initDto = new LisConfigManageInitDto();
|
||||
initDto.setDeviceDefs(deviceDefinitionService.list());
|
||||
initDto.setObservationDefs(observationDefinitionService.list());
|
||||
initDto.setSpecimenDefs(specimenDefinitionService.list());
|
||||
if (searchKey == null || searchKey.isEmpty()) {
|
||||
// 如果searchKey为空，则查询所有
|
||||
return switch (type) {
|
||||
case "device" -> R.ok(deviceDefinitionService.list(new QueryWrapper<DeviceDefinition>().eq("status_enum",2)));
|
||||
case "observation" -> R.ok(observationDefinitionService.list(new QueryWrapper<ObservationDefinition>().eq("status_enum",2) ));
|
||||
case "specimen" -> R.ok(specimenDefinitionService.list(new QueryWrapper<SpecimenDefinition>().eq("status_enum",2)));
|
||||
default -> R.ok(initDto);
|
||||
};
|
||||
} else {
|
||||
// 如果searchKey不为空，则根据name模糊查询
|
||||
return switch (type) {
|
||||
case "device" ->
|
||||
R.ok(deviceDefinitionService.list((new QueryWrapper<DeviceDefinition>().like("name", searchKey).eq("status_enum",2))));
|
||||
case "observation" ->
|
||||
R.ok(observationDefinitionService.list((new QueryWrapper<ObservationDefinition>().like("name", searchKey).eq("status_enum",2))));
|
||||
case "specimen" ->
|
||||
R.ok(specimenDefinitionService.list((new QueryWrapper<SpecimenDefinition>().like("name", searchKey).eq("status_enum",2))));
|
||||
default -> R.ok();
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public R<?> getInfoDetail(Long id) {
|
||||
LisConfigManageDto manageDto = new LisConfigManageDto();
|
||||
manageDto.setActivityDefDeviceDefs(activityDefDeviceDefMapper.selectList(new QueryWrapper<ActivityDefDeviceDef>().eq("activity_definition_id", id)));
|
||||
manageDto.setActivityDefObservationDefs(activityDefObservationDefMapper.selectList(new QueryWrapper<ActivityDefObservationDef>().eq("activity_definition_id", id)));
|
||||
manageDto.setActivityDefSpecimenDefs(activityDefSpecimenDefMapper.selectList(new QueryWrapper<ActivityDefSpecimenDef>().eq("activity_definition_id", id)));
|
||||
return R.ok(manageDto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> saveAll(LisConfigManageDto manageDto) {
|
||||
//先全部删除项目下详情
|
||||
activityDefDeviceDefMapper.delete(new QueryWrapper<ActivityDefDeviceDef>().eq("activity_definition_id", manageDto.getId()));
|
||||
activityDefObservationDefMapper.delete(new QueryWrapper<ActivityDefObservationDef>().eq("activity_definition_id", manageDto.getId()));
|
||||
activityDefSpecimenDefMapper.delete(new QueryWrapper<ActivityDefSpecimenDef>().eq("activity_definition_id", manageDto.getId()));
|
||||
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
|
||||
// 根据ID查询【诊疗目录】详情
|
||||
DiagnosisTreatmentDto diseaseTreatmentOne = activityDefinitionManageMapper.getDiseaseTreatmentOne(manageDto.getId(), tenantId);
|
||||
manageDto.getActivityDefDeviceDefs().forEach(activityDefDeviceDef -> {
|
||||
activityDefDeviceDef.setActivityDefinitionId(manageDto.getId());
|
||||
activityDefDeviceDef.setActivityDefinitionName(diseaseTreatmentOne.getName());
|
||||
activityDefDeviceDefMapper.insert(activityDefDeviceDef);
|
||||
});
|
||||
manageDto.getActivityDefObservationDefs().forEach(activityDefObservationDef -> {
|
||||
activityDefObservationDef.setActivityDefinitionId(manageDto.getId());
|
||||
activityDefObservationDef.setActivityDefinitionName(diseaseTreatmentOne.getName());
|
||||
activityDefObservationDefMapper.insert(activityDefObservationDef);
|
||||
});
|
||||
manageDto.getActivityDefSpecimenDefs().forEach(activityDefSpecimenDef -> {
|
||||
activityDefSpecimenDef.setActivityDefinitionId(manageDto.getId());
|
||||
activityDefSpecimenDef.setActivityDefinitionName(diseaseTreatmentOne.getName());
|
||||
activityDefSpecimenDefMapper.insert(activityDefSpecimenDef);
|
||||
});
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> createAll(Long patientId,Long ServiceId, Long itemId) {
|
||||
// 根据ID查询检查项目详情
|
||||
List<ActivityDefDeviceDef> devices = activityDefDeviceDefMapper.selectList(new QueryWrapper<ActivityDefDeviceDef>().eq("activity_definition_id", itemId));
|
||||
List<ActivityDefObservationDef> observations= activityDefObservationDefMapper.selectList(new QueryWrapper<ActivityDefObservationDef>().eq("activity_definition_id", itemId));
|
||||
List<ActivityDefSpecimenDef> specimens = activityDefSpecimenDefMapper.selectList(new QueryWrapper<ActivityDefSpecimenDef>().eq("activity_definition_id", itemId));
|
||||
devices.forEach(activityDefDeviceDef -> {
|
||||
Device device = new Device();
|
||||
device.setDeviceDefId(activityDefDeviceDef.getDeviceDefinitionId());
|
||||
device.setName(activityDefDeviceDef.getDeviceDefinitionName());
|
||||
//TODO 器材实体待完善，生成器材请求
|
||||
|
||||
});
|
||||
observations.forEach(activityDefObservationDef -> {
|
||||
Observation observation = new Observation();
|
||||
//TODO 初始字段具体观测定义字段待完善
|
||||
observation.setPatientId(patientId);
|
||||
observation.setObservationDefinitionId(activityDefObservationDef.getObservationDefinitionId());
|
||||
observationService.save(observation);
|
||||
});
|
||||
specimens.forEach(activityDefSpecimenDef -> {
|
||||
Specimen specimen = new Specimen();
|
||||
//TODO 初始字段具体标本定义字段待完善
|
||||
specimen.setServiceId(ServiceId);
|
||||
specimen.setSpecimenDefinitionId(activityDefSpecimenDef.getSpecimenDefinitionId());
|
||||
specimen.setPatientId(patientId);
|
||||
specimen.setCollectionStatusEnum(SpecCollectStatus.PENDING.getValue());
|
||||
specimen.setSpecimenUnit(activityDefSpecimenDef.getSpecimenUnit());
|
||||
specimen.setSpecimenVolume(activityDefSpecimenDef.getSpecimenVolume());
|
||||
specimenService.save(specimen);
|
||||
});
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
|
||||
import com.core.common.utils.MessageUtils;
|
||||
import com.core.common.utils.bean.BeanUtils;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.administration.mapper.ObservationDefinitionMapper;
|
||||
import com.openhis.administration.service.IInstrumentService;
|
||||
import com.openhis.administration.service.IObservationDefinitionService;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.openhis.common.enums.ObservationType;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisPageUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.IObservationManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefManageDto;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefManageInitDto;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
|
||||
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/23
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class ObservationManageAppServiceImpl implements IObservationManageAppService
|
||||
{
|
||||
private final ObservationDefinitionMapper observationDefinitionMapper;
|
||||
|
||||
private final IObservationDefinitionService observationDefinitionService;
|
||||
|
||||
private final IInstrumentService instrumentService;
|
||||
|
||||
|
||||
@Override
|
||||
public R<?> getManageInit() {
|
||||
|
||||
ObservationDefManageInitDto observationDefManageInitDto = new ObservationDefManageInitDto();
|
||||
// 获取状态
|
||||
List<ObservationDefManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
|
||||
.map(status -> new ObservationDefManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
observationDefManageInitDto.setStatusFlagOptions(statusEnumOptions);
|
||||
//观测类型
|
||||
List<ObservationDefManageInitDto.ObservationTypeEnumOption> ObservationTypeEnumOptions = Stream.of(com.openhis.common.enums.ObservationType.values())
|
||||
.map(status -> new ObservationDefManageInitDto.ObservationTypeEnumOption(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
observationDefManageInitDto.setObservationTypeList(ObservationTypeEnumOptions);
|
||||
//仪器列表
|
||||
List<ObservationDefManageInitDto.InstrumentEnumOption> InstrumentEnumOptions = instrumentService.list().stream()
|
||||
.map(status -> new ObservationDefManageInitDto.InstrumentEnumOption(status.getId(), status.getInstrumentName()))
|
||||
.collect(Collectors.toList());
|
||||
observationDefManageInitDto.setInstrumentEnumOptionList(InstrumentEnumOptions);
|
||||
return R.ok(observationDefManageInitDto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> getObservationDefPage(ObservationDefSelParam ObservationDefSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
|
||||
|
||||
QueryWrapper<ObservationDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(ObservationDefSelParam,
|
||||
searchKey, new HashSet<>(Arrays.asList( "name", "code")), request);
|
||||
Page<ObservationDefManageDto> ObservationPage = HisPageUtils.selectPage(observationDefinitionMapper, queryWrapper, pageNo, pageSize, ObservationDefManageDto.class);
|
||||
ObservationPage.getRecords().forEach(item -> {
|
||||
item.setInstrumentId_dictText(instrumentService.getById(item.getInstrumentId()).getInstrumentName());
|
||||
item.setStatusEnumText(EnumUtils.getInfoByValue(PublicationStatus.class, item.getStatusEnum()));
|
||||
item.setObservationTypeEnumText(EnumUtils.getInfoByValue(ObservationType.class, item.getObservationTypeEnum()));
|
||||
});
|
||||
|
||||
return R.ok(ObservationPage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> updateOrAddObservationDef(ObservationDefinition Observation) {
|
||||
Observation.setDeleteFlag(DelFlag.NO.getCode());
|
||||
observationDefinitionService.saveOrUpdate(Observation);
|
||||
return R.ok(" 添加成功");
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> getObservationDefOne(Long id) {
|
||||
ObservationDefinition observationDefinition = observationDefinitionService.getById(id);
|
||||
ObservationDefManageDto dto = new ObservationDefManageDto();
|
||||
BeanUtils.copyProperties(observationDefinition,dto);
|
||||
return R.ok(dto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> editObservationDefStatus(List<Long> ids, Integer status) {
|
||||
List<ObservationDefinition> observationDefinitionList = new CopyOnWriteArrayList<>();
|
||||
for (Long detail : ids) {
|
||||
ObservationDefinition observationDefinition = new ObservationDefinition();
|
||||
observationDefinition.setId(detail);
|
||||
observationDefinition.setStatusEnum(status);
|
||||
observationDefinitionList.add(observationDefinition);
|
||||
}
|
||||
return observationDefinitionService.updateBatchById(observationDefinitionList) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"观测信息"}))
|
||||
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.common.enums.AdministrativeGender;
|
||||
import com.openhis.common.enums.SpecCollectStatus;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.lab.domain.Specimen;
|
||||
import com.openhis.lab.service.ISpecimenService;
|
||||
import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
import com.openhis.web.Inspection.mapper.SampleCollectMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @Description 样本采集
|
||||
* @Author
|
||||
* @Date 2025/10/16
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class SampleCollectManageAppService implements ISampleCollectAppManageAppService {
|
||||
|
||||
private final SampleCollectMapper sampleCollectMapper;
|
||||
|
||||
private final ISpecimenService specimenService;
|
||||
|
||||
@Override
|
||||
public R<?> getSampleCollectList(SampleCollectManageDto sampleCollectManageDto, Integer pageNo, Integer pageSize, String searchKey, HttpServletRequest request) {
|
||||
QueryWrapper<SampleCollectManageDto> queryWrapper =
|
||||
HisQueryUtils.buildQueryWrapper(sampleCollectManageDto,
|
||||
searchKey, new HashSet<>(Arrays.asList( "patient_name", "charge_name")), request);
|
||||
IPage<SampleCollectManageDto> sampleCollectList = sampleCollectMapper.getSampleCollectList(new Page<>(pageNo, pageSize), queryWrapper);
|
||||
Long total = sampleCollectMapper.getSampleCollectListTotal(new Page<>(pageNo, pageSize), queryWrapper);
|
||||
sampleCollectList.getRecords().forEach(e -> {
|
||||
// 性别
|
||||
e.setGenderEnumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
|
||||
// 采集状态
|
||||
e.setCollectionStatusEnumText(EnumUtils.getInfoByValue(SpecCollectStatus.class, e.getCollectionStatusEnum()));
|
||||
});
|
||||
if(total == null){
|
||||
//总条数为null
|
||||
total = 0L;
|
||||
}
|
||||
sampleCollectList.setTotal(total);
|
||||
return R.ok(sampleCollectList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> updateSampleStatus(SampleCollectStatusRequest statusRequest) {
|
||||
// 根据状态类型设置对应的状态值
|
||||
Integer status = switch (statusRequest.getType()) {
|
||||
case "待采集" -> SpecCollectStatus.PENDING.getValue();
|
||||
case "已采集" -> SpecCollectStatus.COLLECTED.getValue();
|
||||
case "已接收" -> SpecCollectStatus.RECEIVED.getValue();
|
||||
default -> 0;
|
||||
};
|
||||
|
||||
// 批量更新样本状态
|
||||
specimenService.listByIds(statusRequest.getIds()).forEach(specimen -> {
|
||||
Integer currentStatus = specimen.getCollectionStatusEnum(); // 获取当前样本状态
|
||||
// 如果传入状态是已接收，但当前状态是待采集，跳过更新
|
||||
if (Objects.equals(status, SpecCollectStatus.RECEIVED.getValue()) && Objects.equals(currentStatus, SpecCollectStatus.PENDING.getValue())) {
|
||||
return;
|
||||
}
|
||||
// 构建更新条件
|
||||
UpdateWrapper<Specimen> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.in("id", statusRequest.getIds()) // 设置批量更新的条件
|
||||
.set("collection_status_enum", status); // 设置更新的状态字段
|
||||
// 如果状态为已采集，且采集日期不为空，跳过采集日期的更新，仅更新状态
|
||||
if (Objects.equals(status, SpecCollectStatus.COLLECTED.getValue())) {
|
||||
if (specimen.getCollectionDate() == null) {
|
||||
// 如果采集日期为空，则设置当前日期
|
||||
updateWrapper.set("collection_date", new Date());
|
||||
}
|
||||
updateWrapper.set("received_date", null);
|
||||
} else if (Objects.equals(status, SpecCollectStatus.PENDING.getValue())) {
|
||||
updateWrapper.set("collection_date", null); // 清空采集日期
|
||||
} else if (Objects.equals(status, SpecCollectStatus.RECEIVED.getValue())) {
|
||||
updateWrapper.set("received_date", new Date());
|
||||
}
|
||||
// 执行更新
|
||||
specimenService.update(updateWrapper);
|
||||
});
|
||||
if (Objects.equals(status, SpecCollectStatus.RECEIVED.getValue())) {
|
||||
// TODO 接收样本后续逻辑
|
||||
System.err.println("接收样本后!!");
|
||||
|
||||
}
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
package com.openhis.web.Inspection.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.MessageUtils;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.administration.mapper.SpecimenDefinitionMapper;
|
||||
import com.openhis.administration.service.ISpecimenDefinitionService;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.common.enums.SpecimenType;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisPageUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.Inspection.appservice.ISpecimenManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefManageDto;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefManageInitDto;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* @Description
|
||||
* @Author
|
||||
* @Date 2025/9/9
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SpecimenManageAppServiceImpl implements ISpecimenManageAppService {
|
||||
|
||||
private final SpecimenDefinitionMapper specimenDefinitionMapper;
|
||||
|
||||
private final ISpecimenDefinitionService specimenDefinitionService;
|
||||
@Override
|
||||
public R<?> getManageInit() {
|
||||
SpecimenDefManageInitDto specimenDefManageInitDto = new SpecimenDefManageInitDto();
|
||||
|
||||
// 获取状态
|
||||
List<SpecimenDefManageInitDto.statusEnumOption> statusEnumOptions = Stream.of(PublicationStatus.values())
|
||||
.map(status -> new SpecimenDefManageInitDto.statusEnumOption(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
specimenDefManageInitDto.setStatusFlagOptions(statusEnumOptions);
|
||||
// 获取录种类
|
||||
List<SpecimenDefManageInitDto.SpecimenType> typeList = Stream.of(SpecimenType.values())
|
||||
.map(status -> new SpecimenDefManageInitDto.SpecimenType(status.getValue(), status.getInfo()))
|
||||
.collect(Collectors.toList());
|
||||
specimenDefManageInitDto.setSpecimenTypeList(typeList);
|
||||
|
||||
|
||||
return R.ok(specimenDefManageInitDto);
|
||||
}
|
||||
|
||||
/**
|
||||
* 样本目录查询
|
||||
* @param SpecimenDefSelParam 查询条件
|
||||
* @param searchKey 查询条件-模糊查询
|
||||
* @param pageNo 查询条件
|
||||
* @param pageSize 查询条件
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public R<?> getSpecimenPage(SpecimenDefSelParam SpecimenDefSelParam, String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request) {
|
||||
|
||||
QueryWrapper<SpecimenDefinition> queryWrapper = HisQueryUtils.buildQueryWrapper(SpecimenDefSelParam,
|
||||
searchKey, new HashSet<>(Arrays.asList("custom_code", "specimen_name", "py_str", "wb_str")), request);
|
||||
Page<SpecimenDefManageDto> specimenPage = HisPageUtils.selectPage(specimenDefinitionMapper, queryWrapper, pageNo, pageSize, SpecimenDefManageDto.class);
|
||||
specimenPage.getRecords().forEach(specimenDefManageDto -> {
|
||||
specimenDefManageDto.setSpecimenTypeEnumText(EnumUtils.getInfoByValue(SpecimenType.class, specimenDefManageDto.getSpecimenTypeEnum())) ;
|
||||
specimenDefManageDto.setStatusEnumText(EnumUtils.getInfoByValue(PublicationStatus.class, specimenDefManageDto.getStatusEnum()));
|
||||
});
|
||||
return R.ok(specimenPage);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public R<?> updateOrAddSpecimen(SpecimenDefinition specimenDefinition) {
|
||||
specimenDefinitionService.saveOrUpdate(specimenDefinition);
|
||||
return R.ok(" 添加成功");
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> getSpecimenOne(Long id) {
|
||||
SpecimenDefinition specimenDefinition = specimenDefinitionService.getById(id);
|
||||
return R.ok(specimenDefinition);
|
||||
}
|
||||
|
||||
@Override
|
||||
public R<?> editSpecimenStatus(List<Long> ids, Integer status) {
|
||||
List<SpecimenDefinition> specimenDefinitionList = new CopyOnWriteArrayList<>();
|
||||
for (Long detail : ids) {
|
||||
SpecimenDefinition specimenDefinition = new SpecimenDefinition();
|
||||
specimenDefinition.setId(detail);
|
||||
specimenDefinition.setStatusEnum(status);
|
||||
specimenDefinitionList.add(specimenDefinition);
|
||||
}
|
||||
return specimenDefinitionService.updateBatchById(specimenDefinitionList) ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"样本信息"}))
|
||||
: R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.Instrument;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.web.Inspection.appservice.IInstrumentManageAppService;
|
||||
import com.openhis.web.Inspection.dto.InstrumentSelParam;
|
||||
import com.openhis.web.Inspection.dto.InstrumentStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description 仪器器材信息
|
||||
* @Author
|
||||
* @Date 2025/9/18
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/inspection/instrument")
|
||||
@Slf4j
|
||||
@AllArgsConstructor
|
||||
public class InstrumentController {
|
||||
|
||||
|
||||
private final IInstrumentManageAppService appService;
|
||||
|
||||
|
||||
@GetMapping("/init")
|
||||
public R<?> getDiseaseTreatmentInit() {
|
||||
return appService.getManageInit();
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询样本类型分页列表
|
||||
*
|
||||
* @param pageNo 当前页码
|
||||
* @param pageSize 查询条数
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/information-page")
|
||||
public R<?> getInstrumentPage(InstrumentSelParam InstrumentSelParam,
|
||||
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
|
||||
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
|
||||
return appService.getInstrumentPage(InstrumentSelParam,searchKey, pageNo, pageSize, request);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/information")
|
||||
public R<?> editInstrument(@Validated @RequestBody Instrument instrument) {
|
||||
instrument.setDeleteFlag(DelFlag.NO.getCode());
|
||||
|
||||
return appService.updateOrAddInstrument(instrument);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/information-one")
|
||||
public R<?> getInstrument(@RequestParam Long id) {
|
||||
return appService.getInstrumentOne(id);
|
||||
}
|
||||
|
||||
@PostMapping("/information-status")
|
||||
public R<?> updateInstrumentStatus( @RequestBody InstrumentStatusRequest InstrumentStatusRequest ) {
|
||||
//默认停用
|
||||
Integer status = PublicationStatus.RETIRED.getValue();
|
||||
if("启用".equals( InstrumentStatusRequest.getType())){
|
||||
status = PublicationStatus.ACTIVE.getValue();
|
||||
}
|
||||
return appService.editInstrumentStatus(InstrumentStatusRequest.getIds(),status);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.appservice.ILaboratoryManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description 检测中心相关
|
||||
* @Author
|
||||
* @Date 2025/10/24
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/inspection/laboratory")
|
||||
@Slf4j
|
||||
@AllArgsConstructor
|
||||
public class LaboratoryController {
|
||||
private final ILaboratoryManageAppService appService;
|
||||
|
||||
@GetMapping("/information-page")
|
||||
public R<?> getReportResultPage(ReportResultManageDto reportResultManageDto, @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
@RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
|
||||
return appService.getReportResultList( reportResultManageDto, pageNo, pageSize, searchKey, request);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public R<?> getReportById(@PathVariable Long id) {
|
||||
// 调用 ReportService 获取报告数据
|
||||
return appService.getReportById(id);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.web.Inspection.appservice.ILisConfigManageAppService;
|
||||
import com.openhis.web.Inspection.dto.LisConfigManageDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description 检验定义配置
|
||||
* @Author
|
||||
* @Date 2025/9/29
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/inspection/lisConfig")
|
||||
@Slf4j
|
||||
@AllArgsConstructor
|
||||
public class LisConfigController {
|
||||
|
||||
|
||||
private ILisConfigManageAppService lisConfigManageAppService;
|
||||
|
||||
/**
|
||||
* @Description 获取检验项目列表
|
||||
* @Author
|
||||
* @Date 2025/9/29
|
||||
*/
|
||||
@RequestMapping("/init-page")
|
||||
public R<?> getDiseaseTreatmentList(DiagnosisTreatmentSelParam DiagnosisTreatmentSelParam, String searchKey,
|
||||
Integer pageNo, Integer pageSize, HttpServletRequest request) {
|
||||
return lisConfigManageAppService.getDiseaseTreatmentPage(DiagnosisTreatmentSelParam, searchKey, pageNo, pageSize, request);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据项目id获取详细
|
||||
* @return
|
||||
*/
|
||||
@GetMapping ("/info-detail")
|
||||
public R<?> getInfoDetail(Long id) {
|
||||
return lisConfigManageAppService.getInfoDetail(id);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping ("/init-list")
|
||||
public R<?> getInfoList(String searchKey,String type) {
|
||||
return lisConfigManageAppService.getInfoList(searchKey, type);
|
||||
|
||||
}
|
||||
/**
|
||||
* 修改检验配置
|
||||
* @param
|
||||
* @param manageDto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/saveAll")
|
||||
public R<?> saveInfo(@RequestBody LisConfigManageDto manageDto) {
|
||||
|
||||
return lisConfigManageAppService.saveAll(manageDto);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.web.Inspection.appservice.IObservationManageAppService;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefSelParam;
|
||||
import com.openhis.web.Inspection.dto.ObservationDefStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description 仪器器材信息
|
||||
* @Author
|
||||
* @Date 2025/9/18
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/inspection/observation")
|
||||
@Slf4j
|
||||
@AllArgsConstructor
|
||||
public class ObservationDefController {
|
||||
|
||||
|
||||
private final IObservationManageAppService appService;
|
||||
|
||||
|
||||
@GetMapping("/init")
|
||||
public R<?> getTreatmentInit() {
|
||||
return appService.getManageInit();
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询样本类型分页列表
|
||||
*
|
||||
* @param pageNo 当前页码
|
||||
* @param pageSize 查询条数
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/information-page")
|
||||
public R<?> getObservationPage(ObservationDefSelParam observationDefSelParam,
|
||||
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
|
||||
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
|
||||
return appService.getObservationDefPage(observationDefSelParam,searchKey, pageNo, pageSize, request);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/information")
|
||||
public R<?> editObservation(@Validated @RequestBody ObservationDefinition observation) {
|
||||
observation.setDeleteFlag(DelFlag.NO.getCode());
|
||||
|
||||
return appService.updateOrAddObservationDef(observation);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/information-one")
|
||||
public R<?> getObservation(@RequestParam Long id) {
|
||||
return appService.getObservationDefOne(id);
|
||||
}
|
||||
|
||||
@PostMapping("/information-status")
|
||||
public R<?> updateObservationStatus( @RequestBody ObservationDefStatusRequest observationDefStatusRequest) {
|
||||
//默认停用
|
||||
Integer status = PublicationStatus.RETIRED.getValue();
|
||||
if("启用".equals( observationDefStatusRequest.getType())){
|
||||
status = PublicationStatus.ACTIVE.getValue();
|
||||
}
|
||||
return appService.editObservationDefStatus(observationDefStatusRequest.getIds(),status);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.web.Inspection.appservice.ISampleCollectAppManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description 样本采集
|
||||
* @Author
|
||||
* @Date 2025/10/16
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/inspection/collection")
|
||||
@Slf4j
|
||||
@AllArgsConstructor
|
||||
public class SampleCollectController {
|
||||
|
||||
private final ISampleCollectAppManageAppService appService;
|
||||
|
||||
|
||||
@GetMapping("/information-page")
|
||||
public R<?> getSampleCollectPage(SampleCollectManageDto sampleCollectManageDto,@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
@RequestParam(name = "searchKey", required = false) String searchKey, HttpServletRequest request) {
|
||||
return appService.getSampleCollectList( sampleCollectManageDto, pageNo, pageSize, searchKey, request);
|
||||
}
|
||||
|
||||
@PostMapping("/information-status")
|
||||
public R<?> editSampleCollectStatus(@RequestBody SampleCollectStatusRequest statusRequest) {
|
||||
return appService.updateSampleStatus(statusRequest);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.openhis.web.Inspection.controller;
|
||||
|
||||
import com.core.common.core.domain.R;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.core.common.enums.DelFlag;
|
||||
import com.openhis.common.enums.PublicationStatus;
|
||||
import com.openhis.web.Inspection.appservice.ISpecimenManageAppService;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefSelParam;
|
||||
import com.openhis.web.Inspection.dto.SpecimenDefStatusRequest;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* @Description 样本定义相关
|
||||
* @Author
|
||||
* @Date 2025/9/9
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/inspection/specimen")
|
||||
@Slf4j
|
||||
@AllArgsConstructor
|
||||
public class SpecimenDefController {
|
||||
|
||||
private final ISpecimenManageAppService specimenManageAppService;
|
||||
|
||||
|
||||
@GetMapping("/init")
|
||||
public R<?> getDiseaseTreatmentInit() {
|
||||
return specimenManageAppService.getManageInit();
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询样本类型分页列表
|
||||
*
|
||||
* @param pageNo 当前页码
|
||||
* @param pageSize 查询条数
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/information-page")
|
||||
public R<?> getSpecimenPage(SpecimenDefSelParam specimenDefSelParam,
|
||||
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
|
||||
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
|
||||
return specimenManageAppService.getSpecimenPage(specimenDefSelParam,searchKey, pageNo, pageSize, request);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/information")
|
||||
public R<?> editSpecimen(@Validated @RequestBody SpecimenDefinition specimenDefinition) {
|
||||
specimenDefinition.setStatusEnum( PublicationStatus.ACTIVE.getValue());
|
||||
specimenDefinition.setDeleteFlag(DelFlag.NO.getCode());
|
||||
return specimenManageAppService.updateOrAddSpecimen(specimenDefinition);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/information-one")
|
||||
public R<?> getSpecimen(@RequestParam Long id) {
|
||||
return specimenManageAppService.getSpecimenOne(id);
|
||||
}
|
||||
|
||||
@PostMapping("/information-status")
|
||||
public R<?> updateSpecimenStatus( @RequestBody SpecimenDefStatusRequest specimenDefStatusRequest) {
|
||||
//默认停用
|
||||
Integer status = PublicationStatus.RETIRED.getValue();
|
||||
if("启用".equals( specimenDefStatusRequest.getType())){
|
||||
status = PublicationStatus.ACTIVE.getValue();
|
||||
}
|
||||
return specimenManageAppService.editSpecimenStatus(specimenDefStatusRequest.getIds(),status);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,108 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.openhis.common.annotation.Dict;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description 分页返回
|
||||
* @Author
|
||||
* @Date 2025/9/17
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class InstrumentManageDto {
|
||||
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
/** 仪器编号，唯一且不能为空 */
|
||||
private String instrumentCode;
|
||||
|
||||
/** 仪器名称，必填项 */
|
||||
private String instrumentName;
|
||||
|
||||
/** 仪器主编号 */
|
||||
private String instrumentMainCode;
|
||||
|
||||
/** 仪器类型，选择项 */
|
||||
private Integer instrumentTypeEnum;
|
||||
private String instrumentTypeEnumText;
|
||||
|
||||
/** 仪器型号 */
|
||||
private String instrumentModel;
|
||||
|
||||
/** 生产厂家 */
|
||||
private String manufacturer;
|
||||
|
||||
/** 仪器序列号 */
|
||||
private String serialNumber;
|
||||
|
||||
/** 购买公司 */
|
||||
private String purchasingCompany;
|
||||
|
||||
/** 联系人员 */
|
||||
private String contactPerson;
|
||||
|
||||
/** 购买日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date purchaseDate;
|
||||
|
||||
/** 原价格 */
|
||||
private BigDecimal originalPrice;
|
||||
|
||||
/** 成交价格 */
|
||||
private BigDecimal transactionPrice;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
/** 安装日期 */
|
||||
private Date installationDate;
|
||||
|
||||
/** 安装人员 */
|
||||
private String installationPerson;
|
||||
|
||||
/** 维护人员 */
|
||||
private String maintenancePerson;
|
||||
|
||||
/** 所属科室 */
|
||||
@Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long orgId;
|
||||
private String orgId_dictText;
|
||||
|
||||
/** 鉴定人员 */
|
||||
private String identificationPerson;
|
||||
|
||||
/** 记录温度 */
|
||||
private String recordedTemperature;
|
||||
|
||||
/** 仪器附件 */
|
||||
private String accessories;
|
||||
|
||||
/** 仪器状态 */
|
||||
private Integer instrumentStatusEnum;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
/** 报损日期 */
|
||||
private Date damageReportDate;
|
||||
|
||||
/** 可复查仪器 是否 */
|
||||
private Integer recheckableInstrumentEnum;
|
||||
|
||||
/** 使用状态，是否 */
|
||||
private Integer usageStatusEnum;
|
||||
|
||||
/** 停用原因 */
|
||||
private String decommissionReason;
|
||||
|
||||
/** 备注 */
|
||||
private String remarks;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author
|
||||
* @date
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class InstrumentManageInitDto {
|
||||
private List<statusEnumOption> statusFlagOptions;
|
||||
private List<InstrumentType> InstrumentTypeList;
|
||||
private List<InstrumentStatusEnumOption> InstrumentStatusEnumList;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@Data
|
||||
public static class statusEnumOption {
|
||||
private Integer value;
|
||||
private String info;
|
||||
public statusEnumOption(Integer value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class InstrumentStatusEnumOption {
|
||||
private Integer value;
|
||||
private String info;
|
||||
public InstrumentStatusEnumOption(Integer value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class InstrumentType {
|
||||
private Integer value;
|
||||
private String info;
|
||||
public InstrumentType(Integer value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* 样本定义分页检索条件
|
||||
*
|
||||
* @author lpt
|
||||
* @date 2025-02-25
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class InstrumentSelParam {
|
||||
|
||||
/** 仪器类型 */
|
||||
private Integer instrumentTypeEnum;
|
||||
|
||||
/** 状态 */
|
||||
private Integer statusEnum;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/18
|
||||
*/
|
||||
@Data
|
||||
public class InstrumentStatusRequest {
|
||||
private List<Long> ids;
|
||||
private String type;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.openhis.lab.domain.ActivityDefDeviceDef;
|
||||
import com.openhis.lab.domain.ActivityDefObservationDef;
|
||||
import com.openhis.lab.domain.ActivityDefSpecimenDef;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/30
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class LisConfigManageDto {
|
||||
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
private List<ActivityDefDeviceDef> activityDefDeviceDefs;
|
||||
|
||||
private List<ActivityDefObservationDef> activityDefObservationDefs;
|
||||
|
||||
private List<ActivityDefSpecimenDef> activityDefSpecimenDefs;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.openhis.administration.domain.DeviceDefinition;
|
||||
import com.openhis.administration.domain.ObservationDefinition;
|
||||
import com.openhis.administration.domain.SpecimenDefinition;
|
||||
import com.openhis.web.datadictionary.dto.DeviceManageDto;
|
||||
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/10
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class LisConfigManageInitDto {
|
||||
|
||||
private List <DeviceDefinition> deviceDefs;
|
||||
|
||||
private List<ObservationDefinition> observationDefs;
|
||||
|
||||
private List<SpecimenDefinition> specimenDefs;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.openhis.common.annotation.Dict;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description 分页返回
|
||||
* @Author
|
||||
* @Date 2025/9/17
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class ObservationDefManageDto {
|
||||
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
|
||||
/** 观测名称，用于标识观测的具体名称 */
|
||||
private String name;
|
||||
|
||||
/** 观测代码，用于唯一标识一个观测项 */
|
||||
private String code;
|
||||
|
||||
/** 观测类型，例如：实验室、临床症状等 */
|
||||
private Integer observationTypeEnum;
|
||||
private String observationTypeEnumText;
|
||||
|
||||
/** 参考范围，例如：3.0-6.0 mg/dL，用于指示正常范围 */
|
||||
private String referenceRange;
|
||||
|
||||
@Dict(dictTable = "adm_instrument", dictCode = "id", dictText = "instrument_name")
|
||||
/** 观测仪器id */
|
||||
private Long instrumentId;
|
||||
private String instrumentId_dictText;
|
||||
|
||||
/** 状态 */
|
||||
private Integer statusEnum;
|
||||
private String statusEnumText;
|
||||
|
||||
/** 删除状态） */
|
||||
private String deleteFlag;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author
|
||||
* @date
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class ObservationDefManageInitDto {
|
||||
private List<statusEnumOption> statusFlagOptions;
|
||||
private List<ObservationTypeEnumOption> ObservationTypeList;
|
||||
private List<InstrumentEnumOption> instrumentEnumOptionList;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@Data
|
||||
public static class statusEnumOption {
|
||||
private Integer value;
|
||||
private String info;
|
||||
public statusEnumOption(Integer value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class ObservationTypeEnumOption {
|
||||
private Integer value;
|
||||
private String info;
|
||||
public ObservationTypeEnumOption(Integer value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
@Data
|
||||
public static class InstrumentEnumOption {
|
||||
private Long value;
|
||||
private String info;
|
||||
public InstrumentEnumOption(Long value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* 样本定义分页检索条件
|
||||
*
|
||||
* @author lpt
|
||||
* @date 2025-02-25
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class ObservationDefSelParam {
|
||||
|
||||
/** 类型 */
|
||||
private Integer observationTypeEnum;
|
||||
|
||||
/** 状态 */
|
||||
private Integer statusEnum;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/18
|
||||
*/
|
||||
@Data
|
||||
public class ObservationDefStatusRequest {
|
||||
private List<Long> ids;
|
||||
private String type;
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/17
|
||||
*/
|
||||
@Data
|
||||
public class ReportResultManageDto {
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long parentId;
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
private String patientName; // 患者名称
|
||||
private String chargeName; // 项目名称
|
||||
private String specimenName; // 样本名称
|
||||
private String doctorName; // 开单医生
|
||||
private String observationName;//观测定义名称
|
||||
private String observationResult; // 观测结果
|
||||
private String referenceRange; // 参考范围
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String observationDate;//观测时间
|
||||
private Integer genderEnum; // 性别
|
||||
private String genderEnumText;// 性别文本
|
||||
private String technicianName;// 检查人员
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String authoredTime; // 开单时间
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import com.core.common.core.domain.entity.SysMenu;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/17
|
||||
*/
|
||||
@Data
|
||||
public class SampleCollectManageDto {
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long parentId;
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
private String patientName; // 患者名称
|
||||
private String chargeName; // 项目名称
|
||||
private String specimenName; // 样本名称
|
||||
private String doctorName; // 开单医生
|
||||
|
||||
private Integer specimenVolume; //样本量
|
||||
private String specimenUnit; //样本单位
|
||||
|
||||
private Integer genderEnum; // 性别
|
||||
private String genderEnumText;// 性别文本
|
||||
|
||||
private Integer collectionStatusEnum;//采集状态
|
||||
private String collectionStatusEnumText; // 采集状态文本
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date collectionDate; // 采集时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date receivedDate; // 接收时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private String authoredTime; // 开单时间
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/23
|
||||
*/
|
||||
@Data
|
||||
public class SampleCollectStatusRequest {
|
||||
private List<Long> ids;
|
||||
private String type;
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description 分页返回
|
||||
* @Author
|
||||
* @Date 2025/9/17
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class SpecimenDefManageDto {
|
||||
/** $column.columnComment */
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
/** 样本类型 */
|
||||
private Integer specimenTypeEnum;
|
||||
private String specimenTypeEnumText;
|
||||
|
||||
/** 样本名称 */
|
||||
private String specimenName;
|
||||
|
||||
/** 自定义码 */
|
||||
private String customCode;
|
||||
|
||||
/** 类型顺序 */
|
||||
private Integer typeOrder;
|
||||
|
||||
/** 外部代码 */
|
||||
private String externalCode;
|
||||
|
||||
/** 序号 */
|
||||
private Integer serialNumber;
|
||||
|
||||
/** 全网型 */
|
||||
private String globalType;
|
||||
|
||||
/** 拼音 */
|
||||
private String pyStr;
|
||||
|
||||
/** 五笔 */
|
||||
private String wbStr;
|
||||
|
||||
/** 样本类 */
|
||||
private String specimenClass;
|
||||
|
||||
/** 扩展类型 */
|
||||
private String extendedType;
|
||||
|
||||
/** WHONET代码 */
|
||||
private String whonetCode;
|
||||
|
||||
|
||||
/** 状态 */
|
||||
private Integer statusEnum;
|
||||
private String statusEnumText;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author
|
||||
* @date
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class SpecimenDefManageInitDto {
|
||||
private List<statusEnumOption> statusFlagOptions;
|
||||
private List<SpecimenType> SpecimenTypeList;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
@Data
|
||||
public static class statusEnumOption {
|
||||
private Integer value;
|
||||
private String info;
|
||||
public statusEnumOption(Integer value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class SpecimenType {
|
||||
private Integer value;
|
||||
private String info;
|
||||
List<SpecimenType> children = new ArrayList<>();
|
||||
|
||||
public SpecimenType(Integer value, String info) {
|
||||
this.value = value;
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* 样本定义分页检索条件
|
||||
*
|
||||
* @author lpt
|
||||
* @date 2025-02-25
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class SpecimenDefSelParam {
|
||||
|
||||
/** 样本类型 */
|
||||
private Integer specimenTypeEnum;
|
||||
|
||||
/** 状态 */
|
||||
private Integer statusEnum;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.openhis.web.Inspection.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/9/18
|
||||
*/
|
||||
@Data
|
||||
public class SpecimenDefStatusRequest {
|
||||
private List<Long> ids;
|
||||
private String type;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.openhis.web.Inspection.mapper;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/24 16:40
|
||||
*/
|
||||
public interface GroupRecMapper {
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.openhis.web.Inspection.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.openhis.web.Inspection.dto.ReportResultManageDto;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/11/5 9:36
|
||||
*/
|
||||
@Mapper
|
||||
public interface LisReportMapper {
|
||||
|
||||
IPage<ReportResultManageDto> getReportResultList(@Param("page") Page<ReportResultManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportResultManageDto> queryWrapper);
|
||||
|
||||
Long getReportResultListTotal (@Param("page")Page<ReportResultManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<ReportResultManageDto> queryWrapper);
|
||||
List<ReportResultManageDto> getReportListById(@Param(Constants.WRAPPER) QueryWrapper<ReportResultManageDto> queryWrapper);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.openhis.web.Inspection.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.openhis.web.Inspection.dto.SampleCollectManageDto;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* @Description TODO
|
||||
* @Author
|
||||
* @Date 2025/10/17 11:27
|
||||
*/
|
||||
@Mapper
|
||||
public interface SampleCollectMapper {
|
||||
IPage<SampleCollectManageDto> getSampleCollectList(@Param("page")Page<SampleCollectManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<SampleCollectManageDto> queryWrapper);
|
||||
|
||||
|
||||
Long getSampleCollectListTotal (@Param("page")Page<SampleCollectManageDto> page, @Param(Constants.WRAPPER) QueryWrapper<SampleCollectManageDto> queryWrapper);
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user