|
|
|
@ -219,20 +219,22 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
|
|
|
|
|
patientIds = null;
|
|
|
|
|
}
|
|
|
|
|
selectList = selectOracleGetSignList(patientIds,selectList);
|
|
|
|
|
for(Archive_Master master : masters) {
|
|
|
|
|
if (StringUtils.isNotBlank(master.getPatientId())) {
|
|
|
|
|
if(!CollectionUtils.isEmpty(selectList)) {
|
|
|
|
|
for (Archive_Master master : masters) {
|
|
|
|
|
if (StringUtils.isNotBlank(master.getPatientId())) {
|
|
|
|
|
for (String patientId : selectList) {
|
|
|
|
|
if (master.getPatientId().equals(patientId)) {
|
|
|
|
|
selectList1.add(master.getPatientId());
|
|
|
|
|
break;
|
|
|
|
|
if (StringUtils.isNotBlank(master.getPatientId())) {
|
|
|
|
|
for (String patientId : selectList) {
|
|
|
|
|
if (master.getPatientId().equals(patientId)) {
|
|
|
|
|
selectList1.add(master.getPatientId());
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//设置进查询条件
|
|
|
|
|
if(!CollectionUtils.isEmpty(selectList)) {
|
|
|
|
|
if(!CollectionUtils.isEmpty(selectList1)) {
|
|
|
|
|
vo.setPatientIdsForSign(selectList1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|