Merge branch 'master' of http://114.55.171.231:3000/lxd/FlowPacs
This commit is contained in:
commit
e5e539603b
@ -92,7 +92,7 @@ public class WarningController {
|
||||
|
||||
@GetMapping("/updateWarningdate")
|
||||
@Operation(summary = "更新危急值接收时间和发送回执记录")
|
||||
public CommonResult<Boolean> updateWarningdate( @RequestParam("id") String id,@RequestParam("readDateTime") String readDateTime,@RequestParam("receiptDateTime") String receiptDateTime) {
|
||||
public CommonResult<Boolean> updateWarningdate( @RequestParam("id") String id,@RequestParam("readDateTime") String readDateTime,@RequestParam("receiptDateTime") String receiptDateTime,@RequestParam("orgID") String orgID) {
|
||||
|
||||
WarningDO warningDO=new WarningDO();
|
||||
warningDO.setId(id);
|
||||
@ -107,7 +107,7 @@ public class WarningController {
|
||||
LocalDateTime dateTime = LocalDateTime.parse(receiptDateTime, DateTimeFormatter.ofPattern("yyyy-M-d H:mm:ss"));
|
||||
warningDO.setReceiptDateTime(dateTime);
|
||||
}
|
||||
|
||||
warningDO.setOrgId(orgID);
|
||||
warningMapper.updateById(warningDO);
|
||||
|
||||
return success(true);
|
||||
|
@ -108,10 +108,11 @@ public class EcganalysisparasController {
|
||||
}
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "获得心电分析所有数据")
|
||||
public CommonResult<List<EcganalysisparasDO>> selectEcglist(@RequestParam("regId") String regId)
|
||||
public CommonResult<List<EcganalysisparasDO>> selectEcglist(@RequestParam("regId") String regId,@RequestParam("orgId") String orgId)
|
||||
{
|
||||
QueryWrapper<EcganalysisparasDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("regId", regId);
|
||||
queryWrapper.eq("orgId", orgId);
|
||||
List<EcganalysisparasDO> doList= ecganalysisparasMapper.selectList(queryWrapper);
|
||||
return success(doList);
|
||||
}
|
||||
@ -131,8 +132,21 @@ public class EcganalysisparasController {
|
||||
@GetMapping("/getexamIDdata")
|
||||
@Operation(summary = "根据examId获得心电数据")
|
||||
@Parameter(name = "examID", description = "检查编号", required = true, example = "1024")
|
||||
public CommonResult<EcganalysisparasRespVO> getexamIDdata(@RequestParam("examId") String examId) {
|
||||
EcganalysisparasDO ecganalysisparas= ecganalysisparasService.getexamIDdata(examId);
|
||||
public CommonResult<EcganalysisparasRespVO> getexamIDdata(@RequestParam("examId") String examId,@RequestParam("orgId") String orgId) {
|
||||
EcganalysisparasDO ecganalysisparas= ecganalysisparasService.getexamIDdata(examId,orgId);
|
||||
return success(BeanUtils.toBean(ecganalysisparas, EcganalysisparasRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/getDateStaAndEndData")
|
||||
@Operation(summary = "根据时间获得心电数据")
|
||||
public CommonResult<List<EcganalysisparasDO>> getDateStaAndEndData(@RequestParam("orgId") String orgid, @RequestParam("TimeSta") String TimeSta,@RequestParam("TimeEnd") String TimeEnd)
|
||||
{
|
||||
|
||||
QueryWrapper<EcganalysisparasDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("orgId",orgid);
|
||||
queryWrapper.ge("doctorDiagTime", TimeSta).le("doctorDiagTime",TimeEnd);
|
||||
List<EcganalysisparasDO> doList= ecganalysisparasMapper.selectList(queryWrapper);
|
||||
|
||||
return success(doList);
|
||||
}
|
||||
}
|
@ -68,6 +68,6 @@ public interface EcganalysisparasService extends IService<EcganalysisparasDO> {
|
||||
* @param examID 编号
|
||||
* @return 心电分析数据
|
||||
*/
|
||||
EcganalysisparasDO getexamIDdata(String examID);
|
||||
EcganalysisparasDO getexamIDdata(String examID,String orgId);
|
||||
|
||||
}
|
@ -87,10 +87,10 @@ public class EcganalysisparasServiceImpl extends ServiceImpl<EcganalysisparasMap
|
||||
}
|
||||
|
||||
@Override
|
||||
public EcganalysisparasDO getexamIDdata(String examID) {
|
||||
public EcganalysisparasDO getexamIDdata(String examID,String orgId) {
|
||||
QueryWrapper<EcganalysisparasDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("examId", examID);
|
||||
|
||||
queryWrapper.eq("orgId", orgId);
|
||||
return ecganalysisparasMapper.selectOne(queryWrapper);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user