lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 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:
lxd 2024-08-22 20:27:05 +08:00
parent 0c909f2f82
commit 45e47b3309
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgUnitDO.java
View File

@ -52,7 +52,7 @@ public class OrgUnitDO {
/**
* 上级判读医院机构ID
*/
@TableField("highLevelOrgID")
@TableField(value ="highLevelOrgID",updateStrategy = FieldStrategy.IGNORED)
private String highLevelOrgID;
/**
* 能收到微信消息提醒的微信列表,格式为：wxopenid1,wxopenid2,wxopenid3
@ -72,7 +72,7 @@ public class OrgUnitDO {
/**
* 上级机构的机构名称
*/
@TableField("highLevelOrgName")
@TableField(value ="highLevelOrgName",updateStrategy = FieldStrategy.IGNORED)
private String highLevelOrgName;
/**
* 机构logo的URL

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

@ -27,6 +27,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@ -118,16 +119,20 @@ public class PatientexamlistController {
// 筛选条件：
doList = pageResult.getList().stream()
.filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US")))
.sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面
.collect(Collectors.toList());
} else if (devicetype != null && !devicetype.trim().isEmpty())//表示只查询影像的数据
{
// 筛选条件：
doList = pageResult.getList().stream()
.filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().contains("US")))
.sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面
.collect(Collectors.toList());
} else //devicetype为空，查询全部数据
{
doList = pageResult.getList();
doList = pageResult.getList().stream()
.sorted(Comparator.comparing(PatientexamlistDO::getExamDate, Comparator.nullsLast(Comparator.reverseOrder()))) // 降序排序，null值排在后面
.collect(Collectors.toList());
}
pageResult.setList(doList);
@ -197,22 +202,25 @@ public class PatientexamlistController {
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@Parameter(name = "orgId", description = "机构编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('tblist:patientexamlist:query')")
@LogRecord(type = "检查列表", subType = "申请", bizNo = "{{#id}}", success = "ID为{{#id}}的患者申请")
public void UPDATEHigOrg(@RequestParam("id") String id, @RequestParam("orgId") String orgId) {
@LogRecord(type = "检查列表", subType = "申请", bizNo = "999999", success = "ID为{{#id}}的患者申请")
public CommonResult<String> UPDATEHigOrg(@RequestParam("id") String id, @RequestParam("orgId") String orgId) {
//先拿orgid查询出来对应的org表的上级机构代码
String hiorgid = OrgService.GetOrgHiORGId(orgId);
log.debug("查询出来对应的org表的上级机构代码" + hiorgid);
if (!hiorgid.isEmpty()) {
if (hiorgid!=null &&!hiorgid.isEmpty()) {
PatientexamlistSaveReqVO updateReqVO = new PatientexamlistSaveReqVO();
updateReqVO.setId(id);
updateReqVO.setHighLevelOrgId(hiorgid);
updateReqVO.setReportstatus("已申请");
updateReqVO.setApplicationDate(LocalDateTime.parse(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
patientexamlistService.updatePatientexamlist(updateReqVO);
}
else
{
return error(9999,"上级机构为空,请先设置上级机构");
}
return success("申请成功");
}
@PutMapping("/examineupdate")