@@ -22,12 +22,10 @@ import entity.zone.Room
22
22
import entity.zone.RoomID
23
23
import infrastructure.digitaltwins.adtpresentation.MedicalTechnologyAdtPresentation.toDigitalTwin
24
24
import infrastructure.digitaltwins.adtpresentation.MedicalTechnologyAdtPresentation.toMedicalTechnology
25
- import infrastructure.digitaltwins.adtpresentation.RoomAdtPresentation
26
25
import infrastructure.digitaltwins.adtpresentation.RoomAdtPresentation.toDigitalTwin
27
26
import infrastructure.digitaltwins.adtpresentation.RoomAdtPresentation.toRoom
28
27
import infrastructure.digitaltwins.query.AdtQuery
29
28
import infrastructure.digitaltwins.query.AdtQuery.Companion.AdtQueryUtils.eq
30
- import infrastructure.digitaltwins.query.AdtQuery.Companion.AdtQueryUtils.isOfModel
31
29
import kotlinx.serialization.json.Json
32
30
import kotlinx.serialization.json.jsonObject
33
31
import kotlinx.serialization.json.jsonPrimitive
@@ -90,11 +88,10 @@ class DigitalTwinManager : RoomDigitalTwinManager, MedicalTechnologyDigitalTwinM
90
88
roomId = query(
91
89
AdtQuery
92
90
.createQuery()
93
- .selectTop(1 , " T .\$ dtId" )
91
+ .selectTop(1 , " CT .\$ dtId" )
94
92
.fromDigitalTwins(" T" )
95
- .joinRelationship(" CT" , " T" , " rel_contains_medical_technology" )
96
- .where(" T" isOfModel RoomAdtPresentation .OPERATING_ROOM_MODEL )
97
- .and (" CT.\$ dtId" eq medicalTechnologyId.value)
93
+ .joinRelationship(" CT" , " T" , " rel_is_located" )
94
+ .where(" T.\$ dtId" eq medicalTechnologyId.value)
98
95
.query,
99
96
String ::class .java
100
97
).let {
0 commit comments