lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

批量修改
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Details
Java CI with Maven / build (17) (push) Waiting to run
Details
Java CI with Maven / build (8) (push) Waiting to run
Details
yudao-ui-admin CI / build (14.x) (push) Waiting to run
Details
yudao-ui-admin CI / build (16.x) (push) Waiting to run
Details

Browse Source
This commit is contained in:
旺仔 2024-08-14 12:04:37 +08:00
parent fb5108c8a2
commit 5a6995e357
20 changed files with 430 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/ApplyformController.java
View File

@ -80,6 +80,13 @@ public class ApplyformController {
return success(applyformService.createApplyform(createReqVO));
}
@PostMapping("/createReservationInfo")
@Operation(summary = "创建预约登记")
@PreAuthorize("@ss.hasPermission('applyregistration:applyform:create')")
public CommonResult<List<String>> createApplyform(@Valid @RequestBody ReservationInfoSaveReqVO createReqVO) {
return success(applyformService.createApplyform(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新申请登记记录")
@PreAuthorize("@ss.hasPermission('applyregistration:applyform:update')")
@ -121,13 +128,11 @@ public class ApplyformController {
@Operation(summary = "导出申请登记记录 Excel")
@PreAuthorize("@ss.hasPermission('applyregistration:applyform:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportApplyformExcel(@Valid ApplyformPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
public void exportApplyformExcel(@Valid ApplyformPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<ApplyformDO> list = applyformService.getApplyformPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "申请登记记录.xls", "数据", ApplyformRespVO.class,
BeanUtils.toBean(list, ApplyformRespVO.class));
ExcelUtils.write(response, "申请登记记录.xls", "数据", ApplyformRespVO.class, BeanUtils.toBean(list, ApplyformRespVO.class));
}
@GetMapping("/getdevice")
@ -155,8 +160,7 @@ public class ApplyformController {
AdminUserDO user = userService.getUser(getLoginUserId());
String device = deviceVO.getDevice();
if (!device.isEmpty()) {
LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
String[] result = device.split("\\|");
ApplyformSaveReqVO updateReqVO = new ApplyformSaveReqVO();
updateReqVO.setId(deviceVO.getID());
@ -245,8 +249,7 @@ public class ApplyformController {
//获取当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId());
//当前时间
LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
LocalDateTime dateTime = LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
//循环传递进来的参数 赋值
for (deviceupVO s : deviceVOList) {
//新增对象

2
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/devicevo/DeviceVO.java
View File

@ -78,6 +78,6 @@ public class DeviceVO {
* Scheduled Station AE Title:客户端的AETitle:设备操作台电脑的 AETitle
*/
@Schema(description = "AETitle")
private String ScheduledAET;
private String scheduledAET;
}

68
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/applyform/vo/ReservationInfoSaveReqVO.java Normal file
View File

@ -0,0 +1,68 @@
package cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.*;
import java.util.List;
@Schema(description = "管理后台 - 预约登记 ReservationInfoSaveReqVO")
@Data
public class ReservationInfoSaveReqVO {
@Schema(description = "登记单号", example = "10624")
private String regId;
@Schema(description = "登记来源")
private String regSource;
@Schema(description = "examIdBase", example = "17552")
private String examIdBase;
@Schema(description = "患者姓名", example = "王五")
private String pname;
@Schema(description = "性别")
private String gender;
@Schema(description = "患者联系电话")
private String contactTel;
@Schema(description = "出生日期")
private LocalDateTime birthday;
@Schema(description = "检查设备ID", example = "26048")
private String deviceId;
@Schema(description = "检查设备名称", example = "张三")
private String deviceName;
@Schema(description = "开单医生科室")
private String billDoctorDepartment;
@Schema(description = "开单医生")
private String billgDoctor;
@Schema(description = "登记时间")
private LocalDateTime regDate;
@Schema(description = "备注")
private String remark;
@Schema(description = "examItems")
private List<ExamItem> examItems;
@Schema(description = "机构ID")
private String orgId;
/**内部类**/
@Data
public static class ExamItem {
private String examItemCode;
private String examItemName;
}
}

18
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/device/vo/DevicePageReqVO.java
View File

@ -4,6 +4,7 @@ import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.*;
import java.time.LocalDateTime;
@ -16,14 +17,11 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
public class DevicePageReqVO extends PageParam {
/*******在用参数******/
@Schema(description = "设备信息描述", example = "设备名称、编号、型号")
private String deviceDesc;
@Schema(description = "设备名称", example = "赵六")
private String deviceName;
@Schema(description = "设备唯一编号", example = "25589")
private String deviceId;
@Schema(description = "DR CT MR 超声等类别", example = "2")
private String deviceType;
@Schema(description = "设备型号")
private String deviceModel;
@ -34,18 +32,20 @@ public class DevicePageReqVO extends PageParam {
@Schema(description = "设备归属科室")
private String deviceDepartment;
@Schema(description = "设备唯一编号", example = "25589")
private String deviceId;
@Schema(description = "设备信息描述", example = "设备名称、编号、型号")
private String deviceDesc;
@Schema(description = "机构ID", example = "18179")
private String orgId;
/*******备选参数******/
@Schema(description = "设备生产商")
private String deviceMaker;
@Schema(description = "DR CT MR 超声等类别", example = "2")
private String deviceType;
@Schema(description = "设备状态：0：失效，1：正常，设备故障或者淘汰，此状态置为 0", example = "1")
private String deviceStatus;

6
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/controller/admin/device/vo/DeviceSaveReqVO.java
View File

@ -2,8 +2,11 @@ package cn.iocoder.yudao.module.applyregistration.controller.admin.device.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.*;
import java.time.LocalDateTime;
@ -56,6 +59,9 @@ public class DeviceSaveReqVO {
@Schema(description = "备注", example = "随便")
private String remark;
@Schema(description = "scheduledAET")
private String scheduledAET;
@Schema(description = "设备位置：XX楼XX室..")
private String deviceLocalAddress;

9
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/dal/dataobject/applyform/ApplyformDO.java
View File

@ -1,12 +1,14 @@
package cn.iocoder.yudao.module.applyregistration.dal.dataobject.applyform;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@ -22,7 +24,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ApplyformDO {
public class ApplyformDO {
/**
* 主键
@ -139,5 +141,10 @@ public class ApplyformDO {
*/
@TableField("deviceDepartmentCode")
private String deviceDepartmentCode;
/**
* 备注
*/
@TableField("remark")
private String remark;
}

14
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/dal/device/DeviceDO.java
View File

@ -13,7 +13,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor
public class DeviceDO {
@TableId(value="ID",type = IdType.INPUT)
@TableId(value = "ID", type = IdType.INPUT)
private String ID;
/**
@ -104,6 +104,11 @@ public class DeviceDO {
*/
@TableField("remark")
private String remark;
/**
* scheduledAET
*/
@TableField("scheduledAET")
private String scheduledAET;
/**
* 设备位置：XX楼XX室..
*/
@ -126,10 +131,5 @@ public class DeviceDO {
*/
@TableField("deleteDate")
private LocalDateTime deleteDate;
/**
*
*/
@TableField("ScheduledAET")
private String ScheduledAET;
}

30
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/dal/device/Mapper/DeviceMapper.java
View File

@ -2,18 +2,42 @@ package cn.iocoder.yudao.module.applyregistration.dal.device.Mapper;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.*;
import cn.iocoder.yudao.framework.mybatis.core.query.*;
import cn.iocoder.yudao.module.applyregistration.controller.admin.device.vo.*;
import cn.iocoder.yudao.module.applyregistration.dal.device.DeviceDO;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@Mapper
@InterceptorIgnore(tenantLine = "true")
public interface DeviceMapper extends BaseMapperX<DeviceDO>
{
public interface DeviceMapper extends BaseMapperX<DeviceDO> {
//更新
@Update(" UPDATE tb_device t1 SET \n" +
"t1.deviceName=#{deviceName},t1.deviceStatus=#{deviceStatus},t1.deviceType=#{deviceType},t1.deviceModel=#{deviceModel},\n" +
"t1.madeCompany=#{madeCompany},t1.madeCompanyTel=#{madeCompanyTel},t1.saleCompany=#{saleCompany},t1.saleCompanyTel=#{saleCompanyTel},\n" +
"t1.ScheduledAET=#{scheduledAET},t1.remark=#{remark},t1.departmentCode=#{departmentCode},t1.orgId=#{orgId},t1.deviceDepartment=#{deviceDepartment}\n" +
"WHERE t1.ID=#{id} ")
int updateDataById(DeviceSaveReqVO device);
//删除
@Update(" UPDATE tb_device t1 SET t1.isDelete=#{isdelete},t1.deletePerson=#{deletePerson},t1.deleteDate=#{deleteDate} WHERE t1.ID=#{ID} ")
int deleteDataById(DeviceDO device);
//分页查询
default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>()
.neIfPresent(DeviceDO::getIsdelete, '1')
.likeIfPresent(DeviceDO::getDeviceName, reqVO.getDeviceName())
.likeIfPresent(DeviceDO::getDeviceModel, reqVO.getDeviceModel())
.eqIfPresent(DeviceDO::getDeviceType, reqVO.getDeviceType())
.eqIfPresent(DeviceDO::getDepartmentCode, reqVO.getDepartmentCode())
.orderByAsc(DeviceDO::getDeviceName));
}
//获取机构表里的上级机构
List<DeviceDO> SelectDevice(@Param("orgId") String orgId);

11
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/service/applyform/ApplyformService.java
View File

@ -1,4 +1,5 @@
package cn.iocoder.yudao.module.applyregistration.service.applyform;
import java.util.List;
import java.util.*;
@ -17,7 +18,7 @@ import javax.validation.Valid;
* @author 李晓东
*/
//
public interface ApplyformService extends IService<ApplyformDO>{
public interface ApplyformService extends IService<ApplyformDO> {
/**
@ -28,6 +29,14 @@ public interface ApplyformService extends IService<ApplyformDO>{
*/
String createApplyform(@Valid ApplyformSaveReqVO createReqVO);
/**
* 创建申请登记记录
*
* @param createReqVO 创建信息
* @return 编号集合
*/
List<String> createApplyform(@Valid ReservationInfoSaveReqVO createReqVO);
/**
* 更新申请登记记录
*

62
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/service/applyform/ApplyformServiceImpl.java
View File

@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.applyregistration.service.applyform;
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
import cn.iocoder.yudao.module.applyregistration.controller.admin.applyform.devicevo.deviceupVO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -9,6 +11,8 @@ import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
@ -22,6 +26,7 @@ import cn.iocoder.yudao.module.applyregistration.dal.mysql.applyform.ApplyformMa
import javax.annotation.Resource;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
/**
* 申请登记记录 Service 实现类
@ -30,11 +35,14 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
*/
@Service
@Validated
public class ApplyformServiceImpl extends ServiceImpl<ApplyformMapper,ApplyformDO> implements ApplyformService {
public class ApplyformServiceImpl extends ServiceImpl<ApplyformMapper, ApplyformDO> implements ApplyformService {
@Resource
private ApplyformMapper applyformMapper;
@Resource
private AdminUserService userService;
@Override
public String createApplyform(ApplyformSaveReqVO createReqVO) {
// 插入
@ -44,6 +52,54 @@ public class ApplyformServiceImpl extends ServiceImpl<ApplyformMapper,ApplyformD
return applyform.getId();
}
@Override
public List<String> createApplyform(ReservationInfoSaveReqVO createReqVO) {
List<String> ids = new ArrayList<>();
//当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId());
//当前时间
LocalDateTime dateTime = null;
//生成UUID
UUID guid = null;
//num
int num = 0;
//VO转DO
ApplyformDO applyform = BeanUtils.toBean(createReqVO, ApplyformDO.class);
applyform.setPName(createReqVO.getPname());
applyform.setOrgId(user.getOrgId());
if (createReqVO.getExamItems() != null && createReqVO.getExamItems().size() > 0) {
for (ReservationInfoSaveReqVO.ExamItem item : createReqVO.getExamItems()) {
//当前时间
dateTime = LocalDateTime.parse(
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
);
//生成UUID
guid = UUID.randomUUID();
//num
num++;
applyform.setId(guid.toString());
applyform.setCreateDate(dateTime);
applyform.setExamId(createReqVO.getExamIdBase() + num);
applyform.setExamItemCode(item.getExamItemCode());
applyform.setExamItemName(item.getExamItemName());
ids.add(applyform.getId());
applyformMapper.insert(applyform);
}
}
if (!(ids != null && ids.size() > 0))
ids = Collections.emptyList();
return ids;
}
@Override
public void updateApplyform(ApplyformSaveReqVO updateReqVO) {
// 校验存在
@ -63,7 +119,7 @@ public class ApplyformServiceImpl extends ServiceImpl<ApplyformMapper,ApplyformD
private void validateApplyformExists(String id) {
if (applyformMapper.selectById(id) == null) {
throw exception(new ErrorCode(1,""));
throw exception(new ErrorCode(1, ""));
}
}
@ -77,6 +133,4 @@ public class ApplyformServiceImpl extends ServiceImpl<ApplyformMapper,ApplyformD
return applyformMapper.selectPage(pageReqVO);
}
}

29
yudao-module-applyregistration/yudao-module-applyregistration-biz/src/main/java/cn/iocoder/yudao/module/applyregistration/service/applyform/device/DeviceServiceImpl.java
View File

@ -42,9 +42,9 @@ public class DeviceServiceImpl implements DeviceService {
//当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId());
//当前时间
LocalDateTime dateTime= LocalDateTime.parse(
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
LocalDateTime dateTime = LocalDateTime.parse(
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
);
//生成UUID
UUID guid = UUID.randomUUID();
@ -65,10 +65,8 @@ public class DeviceServiceImpl implements DeviceService {
public void updateDevice(DeviceSaveReqVO updateReqVO) {
//校验存在
validateExists(updateReqVO.getId());
//VO转DO
DeviceDO deviceDO = BeanUtils.toBean(updateReqVO, DeviceDO.class);
DeviceMapper.updateById(deviceDO);
DeviceMapper.updateDataById(updateReqVO);
}
@Override
@ -78,19 +76,19 @@ public class DeviceServiceImpl implements DeviceService {
//当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId());
//当前时间
LocalDateTime dateTime= LocalDateTime.parse(
LocalDateTime dateTime = LocalDateTime.parse(
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
);
//创建DO
DeviceDO deviceDO=new DeviceDO();
DeviceDO deviceDO = new DeviceDO();
deviceDO.setID(id);
deviceDO.setDeleteDate(dateTime);
deviceDO.setDeletePerson(user.getUsername());
deviceDO.setIsdelete("1");
DeviceMapper.updateById(deviceDO);
DeviceMapper.deleteDataById(deviceDO);
}
@Override
@ -100,23 +98,18 @@ public class DeviceServiceImpl implements DeviceService {
@Override
public List<DeviceDO> getDevicelist(String orgId) {
return DeviceMapper.SelectDevice(orgId);
return DeviceMapper.SelectDevice(orgId);
}
@Override
public PageResult<DeviceDO> getDevicePage(DevicePageReqVO pageReqVO) {
return DeviceMapper.selectPage(pageReqVO, new LambdaQueryWrapperX<DeviceDO>()
.likeIfPresent(DeviceDO::getDeviceDepartment, pageReqVO.getDeviceDepartment())
.likeIfPresent(DeviceDO::getDeviceName, pageReqVO.getDeviceDesc())
.likeIfPresent(DeviceDO::getDeviceId, pageReqVO.getDeviceDesc())
.likeIfPresent(DeviceDO::getDeviceModel, pageReqVO.getDeviceDesc())
.eq(DeviceDO::getIsdelete, '0'));
return DeviceMapper.selectPage(pageReqVO);
}
//其它方法
private void validateExists(String id) {
if (DeviceMapper.selectById(id) == null) {
throw exception(new ErrorCode(1,"ID为空"));
throw exception(new ErrorCode(1, "ID为空"));
}
}

7
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/exampart/vo/ExampartSaveReqVO.java
View File

@ -2,8 +2,11 @@ package cn.iocoder.yudao.module.system.controller.admin.exampart.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.*;
import java.time.*;
@ -11,13 +14,13 @@ import java.time.*;
@Data
public class ExampartSaveReqVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "29261")
@Schema(description = "主键", example = "29261")
private String id;
@Schema(description = "检查部位名称", example = "张三")
private String examPartName;
@Schema(description = "检查部位代码", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "检查部位代码")
private String examPartCode;
@Schema(description = "机构ID", example = "23373")

24
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/exampart/ExampartMapper.java
View File

@ -1,11 +1,14 @@
package cn.iocoder.yudao.module.system.dal.mysql.exampart;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.query.*;
import cn.iocoder.yudao.framework.mybatis.core.mapper.*;
import cn.iocoder.yudao.module.system.controller.admin.exampart.vo.*;
import cn.iocoder.yudao.module.system.dal.dataobject.exampart.ExampartDO;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Update;
import java.util.*;
/**
@ -17,4 +20,21 @@ import java.util.*;
@Mapper
public interface ExampartMapper extends BaseMapperX<ExampartDO> {
//更新
@Update(" UPDATE tb_exampart t1 SET t1.examPartCode=#{examPartCode},t1.examPartName=#{examPartName},t1.remark=#{remark},t1.orgId=#{orgId} WHERE t1.ID=#{id} ")
int updateDataById(ExampartSaveReqVO exampart);
//删除
@Update(" UPDATE tb_exampart t1 SET t1.isDelete=#{isDelete},t1.deletePerson=#{deletePerson},t1.deleteDate=#{deleteDate} WHERE t1.ID=#{ID} ")
int deleteDataById(ExampartDO exampart);
//分页查询
default PageResult<ExampartDO> selectPage(ExampartPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ExampartDO>()
.neIfPresent(ExampartDO::getIsDelete, '1')
.likeIfPresent(ExampartDO::getExamPartName, reqVO.getExamPartName())
.likeIfPresent(ExampartDO::getExamPartCode, reqVO.getExamPartCode())
.orderByAsc(ExampartDO::getExamPartName));
}
}

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/exampart/ExampartServiceImpl.java
View File

@ -44,9 +44,9 @@ public class ExampartServiceImpl implements ExampartService {
//当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId());
//当前时间
LocalDateTime dateTime= LocalDateTime.parse(
LocalDateTime dateTime = LocalDateTime.parse(
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
);
//生成UUID
UUID guid = UUID.randomUUID();
@ -66,10 +66,8 @@ public class ExampartServiceImpl implements ExampartService {
public void updateExampart(ExampartSaveReqVO updateReqVO) {
//校验存在
validateExists(updateReqVO.getId());
//VO转DO
ExampartDO exampartDO = BeanUtils.toBean(updateReqVO, ExampartDO.class);
exampartMapper.updateById(exampartDO);
exampartMapper.updateDataById(updateReqVO);
}
@Override
@ -79,19 +77,19 @@ public class ExampartServiceImpl implements ExampartService {
//当前登陆用户
AdminUserDO user = userService.getUser(getLoginUserId());
//当前时间
LocalDateTime dateTime= LocalDateTime.parse(
LocalDateTime dateTime = LocalDateTime.parse(
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
);
//创建DO
ExampartDO exampartDO=new ExampartDO();
ExampartDO exampartDO = new ExampartDO();
exampartDO.setID(id);
exampartDO.setDeleteDate(dateTime);
exampartDO.setDeletePerson(user.getUsername());
exampartDO.setIsDelete("1");
exampartMapper.updateById(exampartDO);
exampartMapper.deleteDataById(exampartDO);
}
@Override
@ -106,16 +104,13 @@ public class ExampartServiceImpl implements ExampartService {
@Override
public PageResult<ExampartDO> getExampartPage(ExampartPageReqVO pageReqVO) {
return exampartMapper.selectPage(pageReqVO, new LambdaQueryWrapperX<ExampartDO>()
.likeIfPresent(ExampartDO::getExamPartName, pageReqVO.getExamPartName())
.likeIfPresent(ExampartDO::getExamPartCode, pageReqVO.getExamPartCode())
.eq(ExampartDO::getIsDelete, '0'));
return exampartMapper.selectPage(pageReqVO);
}
//其它方法
private void validateExists(String id) {
if (exampartMapper.selectById(id) == null) {
throw exception(new ErrorCode(1,"ID为空"));
throw exception(new ErrorCode(1, "ID为空"));
}
}

16
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java
View File

@ -127,6 +127,22 @@ public class PatientexamlistController {
return success(BeanUtils.toBean(pageResult, PatientexamlistRespVO.class));
}
@GetMapping("/pageIllnessCase")
@Operation(summary = "获得PACS病例管理分页")
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
public CommonResult<PageResult<PatientexamlistDO>> getIllnessCasePage(@Valid IllnessCasePageReqVO pageReqVO) {
PageResult<PatientexamlistDO> pageResult = patientexamlistService.getIllnessCasePage(pageReqVO);
return success(pageResult);
}
@GetMapping("/pageReportPrintStatistics")
@Operation(summary = "获得PACS报告打印统计分页")
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
public CommonResult<PageResult<PatientexamlistDO>> getReportPrintStatisticsPage(@Valid ReportPrintPageReqVO pageReqVO) {
PageResult<PatientexamlistDO> pageResult = patientexamlistService.getReportPrintStatisticsPage(pageReqVO);
return success(pageResult);
}
@GetMapping("/export-excel")
@Operation(summary = "导出PACS检查列表 Excel")
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:export')")

57
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/IllnessCasePageReqVO.java Normal file
View File

@ -0,0 +1,57 @@
package cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist.vo;
import cn.iocoder.yudao.framework.common.pojo.*;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.*;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - PACS检查列表分页 IllnessCasePageReqVO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class IllnessCasePageReqVO extends PageParam {
@Schema(description = "登记单号")
private String regId;
@Schema(description = "检查ID：体检编号、住院号、门诊号等", example = "26467")
private String examId;
@Schema(description = "检查开始日期:年月日时分秒")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime examDate_ge;
@Schema(description = "检查结束日期:年月日时分秒")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime examDate_le;
@Schema(description = "设备类型：CT DR MR B超 彩超等", example = "2")
private String deviceType;
@Schema(description = "影像设备名称")
private String deviceName;
@Schema(description = "阴性阳性标记：0 为阴性， 1为阳性")
private String diagFlag;
@Schema(description = "检查项目名称", example = "张三")
private String examItemName;
@Schema(description = "报告状态", example = "1")
private String reportstatus;
@Schema(description = "患者姓名", example = "赵六")
private String pname;
@Schema(description = "性别")
private String gender;
@Schema(description = "机构ID", example = "29289")
private String orgId;
@Schema(description = "机构名称", example = "芋艿")
private String orgName;
}

46
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/vo/ReportPrintPageReqVO.java Normal file
View File

@ -0,0 +1,46 @@
package cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist.vo;
import cn.iocoder.yudao.framework.common.pojo.*;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.*;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - PACS检查列表分页 ReportPrintPageReqVO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class ReportPrintPageReqVO extends PageParam {
@Schema(description = "登记单号")
private String regId;
@Schema(description = "检查ID：体检编号、住院号、门诊号等", example = "26467")
private String examId;
@Schema(description = "检查开始日期:年月日时分秒")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime examDate_ge;
@Schema(description = "检查结束日期:年月日时分秒")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime examDate_le;
@Schema(description = "影像设备名称")
private String deviceName;
@Schema(description = "设备类型：CT DR MR B超 彩超等", example = "2")
private String deviceType;
@Schema(description = "患者姓名", example = "赵六")
private String pname;
@Schema(description = "机构ID", example = "29289")
private String orgId;
@Schema(description = "机构名称", example = "芋艿")
private String orgName;
}

31
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java
View File

@ -17,6 +17,37 @@ import cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist.vo.*;
@Mapper
public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
//IllnessCasePageReqVO分页
default PageResult<PatientexamlistDO> selectPage(IllnessCasePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>()
.likeIfPresent(PatientexamlistDO::getRegId,reqVO.getRegId())
.likeIfPresent(PatientexamlistDO::getExamId,reqVO.getExamId())
.geIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_ge())
.leIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_le())
.likeIfPresent(PatientexamlistDO::getDeviceName,reqVO.getDeviceName())
.likeIfPresent(PatientexamlistDO::getDeviceType,reqVO.getDeviceType())
.eqIfPresent(PatientexamlistDO::getDiagFlag,reqVO.getDiagFlag())
.likeIfPresent(PatientexamlistDO::getExamItemName,reqVO.getExamItemName())
.likeIfPresent(PatientexamlistDO::getReportstatus,reqVO.getReportstatus())
.likeIfPresent(PatientexamlistDO::getPName,reqVO.getPname())
.likeIfPresent(PatientexamlistDO::getGender,reqVO.getGender())
.orderByAsc(PatientexamlistDO::getRegId));
}
//ReportPrintPageReqVO分页
default PageResult<PatientexamlistDO> selectPage(ReportPrintPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>()
.likeIfPresent(PatientexamlistDO::getRegId,reqVO.getRegId())
.likeIfPresent(PatientexamlistDO::getExamId,reqVO.getExamId())
.geIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_ge())
.leIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_le())
.likeIfPresent(PatientexamlistDO::getDeviceName,reqVO.getDeviceName())
.eqIfPresent(PatientexamlistDO::getDeviceType,reqVO.getDeviceType())
.likeIfPresent(PatientexamlistDO::getPName,reqVO.getPname())
.orderByAsc(PatientexamlistDO::getRegId));
}
//PatientexamlistPageReqVO分页
default PageResult<PatientexamlistDO> selectPage(PatientexamlistPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>()
.eqIfPresent(PatientexamlistDO::getExamId, reqVO.getExamId())

16
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/patientexamlist/PatientexamlistService.java
View File

@ -54,4 +54,20 @@ public interface PatientexamlistService {
*/
PageResult<PatientexamlistDO> getPatientexamlistPage(PatientexamlistPageReqVO pageReqVO);
/**
* 获得PACS病例管理分页
*
* @param pageReqVO 分页查询
* @return PACS检查列表分页
*/
PageResult<PatientexamlistDO> getIllnessCasePage(IllnessCasePageReqVO pageReqVO);
/**
* 获得PACS报告打印统计分页
*
* @param pageReqVO 分页查询
* @return PACS检查列表分页
*/
PageResult<PatientexamlistDO> getReportPrintStatisticsPage(ReportPrintPageReqVO pageReqVO);
}

13
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/service/patientexamlist/PatientexamlistServiceImpl.java
View File

@ -7,6 +7,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.tblist.controller.admin.patientexamlist.vo.*;
import cn.iocoder.yudao.module.tblist.dal.dataobject.patientexamlist.PatientexamlistDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@ -60,7 +61,7 @@ public class PatientexamlistServiceImpl implements PatientexamlistService {
private void validatePatientexamlistExists(String id) {
if (patientexamlistMapper.selectById(id) == null) {
throw exception(new ErrorCode(101,"查询不到列表"));
throw exception(new ErrorCode(101, "查询不到列表"));
}
}
@ -74,4 +75,14 @@ public class PatientexamlistServiceImpl implements PatientexamlistService {
return patientexamlistMapper.selectPage(pageReqVO);
}
@Override
public PageResult<PatientexamlistDO> getIllnessCasePage(IllnessCasePageReqVO pageReqVO) {
return patientexamlistMapper.selectPage(pageReqVO);
}
@Override
public PageResult<PatientexamlistDO> getReportPrintStatisticsPage(ReportPrintPageReqVO pageReqVO) {
return patientexamlistMapper.selectPage(pageReqVO);
}
}