修改影像逻辑
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Java CI with Maven / build (17) (push) Waiting to run
Java CI with Maven / build (8) (push) Waiting to run
yudao-ui-admin CI / build (14.x) (push) Waiting to run
yudao-ui-admin CI / build (16.x) (push) Waiting to run
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Java CI with Maven / build (17) (push) Waiting to run
Java CI with Maven / build (8) (push) Waiting to run
yudao-ui-admin CI / build (14.x) (push) Waiting to run
yudao-ui-admin CI / build (16.x) (push) Waiting to run
This commit is contained in:
parent
6f0e433a2f
commit
2e889a77d4
@ -10,7 +10,7 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<select id="GetPatientIdData" resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicompatientDO">
|
<select id="GetPatientIdData" resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicompatientDO">
|
||||||
select * from dicompatients where PatientID=#{patientId} and dataSync='0' and orgId=#{orgId}
|
select * from dicompatients where PatientID=#{patientId} and dataSync='1' and orgId=#{orgId}
|
||||||
</select>
|
</select>
|
||||||
<select id="GetPatientData" resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicompatientDO">
|
<select id="GetPatientData" resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicompatientDO">
|
||||||
select * from dicompatients where dataSync='0' and orgId=#{orgId}
|
select * from dicompatients where dataSync='0' and orgId=#{orgId}
|
||||||
|
@ -103,7 +103,7 @@ public class PatientexamlistController {
|
|||||||
PageResult<PatientexamlistDO> pageResult = patientexamlistService.getPatientexamlistPage(pageReqVO);
|
PageResult<PatientexamlistDO> pageResult = patientexamlistService.getPatientexamlistPage(pageReqVO);
|
||||||
List<PatientexamlistDO> doList=new ArrayList<>();
|
List<PatientexamlistDO> doList=new ArrayList<>();
|
||||||
String devicetype=pageReqVO.getDeviceType();
|
String devicetype=pageReqVO.getDeviceType();
|
||||||
if(devicetype!=null&&devicetype.equals("US"))//表示只查询超声的数据
|
if(devicetype!=null&&devicetype.contains("US"))//表示只查询超声的数据
|
||||||
{
|
{
|
||||||
// 筛选条件:
|
// 筛选条件:
|
||||||
doList = pageResult.getList().stream()
|
doList = pageResult.getList().stream()
|
||||||
@ -114,7 +114,7 @@ public class PatientexamlistController {
|
|||||||
{
|
{
|
||||||
// 筛选条件:
|
// 筛选条件:
|
||||||
doList = pageResult.getList().stream()
|
doList = pageResult.getList().stream()
|
||||||
.filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().equals("US")))
|
.filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().contains("US")))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
else //devicetype为空,查询全部数据
|
else //devicetype为空,查询全部数据
|
||||||
|
Loading…
Reference in New Issue
Block a user