server/AyaNova/DataList/UnitDataList.cs

@@ -23,11 +23,9 @@ LEFT JOIN LATERAL
 			AWORKORDERITEMUNIT.ID AS LASTWORKORDERITEMUNITID
 		FROM AWORKORDER
 		LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
-		LEFT JOIN AWORKORDERSTATUS ON AWORKORDER.LASTSTATUSID = AWORKORDERSTATUS.ID
 		LEFT JOIN AWORKORDERITEMUNIT ON AWORKORDERITEM.ID = AWORKORDERITEMUNIT.WORKORDERITEMID
 		WHERE AWORKORDERITEMUNIT.ID = AMAINUNIT.ID
-			AND AWORKORDERSTATUS.COMPLETED = TRUE
-		ORDER BY AWORKORDER.ID DESC 
+		ORDER BY AWORKORDER.SERVICEDATE DESC 
 		LIMIT 1) AS LWO ON TRUE";