diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt
index 51f8cb6..6ccba4b 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt
@@ -65,16 +65,23 @@
                 }
                 wellLocationView.text = wellPosition
 
-                //现场情况
-                val firstState = orderDetail.firstState.toString()
-                currentStateView.text = firstState
-                if (firstState.length > 12) {
+                /**
+                 * 现场情况
+                 * 如果处理信息为空，则表示经过确认无异常，直接结束工单，取第一次的现场描述；否则，取处理时候的描述
+                 * */
+                val state = if (orderDetail.handleMessage.isBlank()) {
+                    orderDetail.firstState
+                } else {
+                    orderDetail.handleMessage
+                }
+                currentStateView.text = state
+                if (state.length > 12) {
                     stateTipsView.visibility = View.VISIBLE
                     stateTipsView.setOnClickListener {
                         AlertMessageDialog.Builder()
                             .setContext(this)
                             .setTitle("现场情况完整信息")
-                            .setMessage(firstState)
+                            .setMessage(state)
                             .setPositiveButton("知道了")
                             .setOnDialogButtonClickListener(object :
                                 AlertMessageDialog.OnDialogButtonClickListener {
@@ -88,9 +95,17 @@
                     stateTipsView.visibility = View.GONE
                 }
 
-                //绑定窨井图片
+                /**
+                 * 绑定窨井图片
+                 * 如果处理照片为空，则表示经过确认无异常，直接结束工单，取第一次的照片；否则，取处理时候的照片
+                 * */
                 val urls: ArrayList<String> = ArrayList()
-                val imageArray = orderDetail.handlePhotos.toString().split(",")
+                val photos = if (orderDetail.handlePhotos.isBlank()) {
+                    orderDetail.firstStatePhotos
+                } else {
+                    orderDetail.handlePhotos
+                }
+                val imageArray = photos.split(",")
                 imageArray.forEach { path ->
                     if (path.isNotBlank()) {
                         urls.add(path.combineImagePath())

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt
index 51f8cb6..6ccba4b 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderCompletedDetailActivity.kt
@@ -65,16 +65,23 @@
                 }
                 wellLocationView.text = wellPosition
 
-                //现场情况
-                val firstState = orderDetail.firstState.toString()
-                currentStateView.text = firstState
-                if (firstState.length > 12) {
+                /**
+                 * 现场情况
+                 * 如果处理信息为空，则表示经过确认无异常，直接结束工单，取第一次的现场描述；否则，取处理时候的描述
+                 * */
+                val state = if (orderDetail.handleMessage.isBlank()) {
+                    orderDetail.firstState
+                } else {
+                    orderDetail.handleMessage
+                }
+                currentStateView.text = state
+                if (state.length > 12) {
                     stateTipsView.visibility = View.VISIBLE
                     stateTipsView.setOnClickListener {
                         AlertMessageDialog.Builder()
                             .setContext(this)
                             .setTitle("现场情况完整信息")
-                            .setMessage(firstState)
+                            .setMessage(state)
                             .setPositiveButton("知道了")
                             .setOnDialogButtonClickListener(object :
                                 AlertMessageDialog.OnDialogButtonClickListener {
@@ -88,9 +95,17 @@
                     stateTipsView.visibility = View.GONE
                 }
 
-                //绑定窨井图片
+                /**
+                 * 绑定窨井图片
+                 * 如果处理照片为空，则表示经过确认无异常，直接结束工单，取第一次的照片；否则，取处理时候的照片
+                 * */
                 val urls: ArrayList<String> = ArrayList()
-                val imageArray = orderDetail.handlePhotos.toString().split(",")
+                val photos = if (orderDetail.handlePhotos.isBlank()) {
+                    orderDetail.firstStatePhotos
+                } else {
+                    orderDetail.handlePhotos
+                }
+                val imageArray = photos.split(",")
                 imageArray.forEach { path ->
                     if (path.isNotBlank()) {
                         urls.add(path.combineImagePath())
diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt
index 1c78aff..e03d313 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt
@@ -159,10 +159,6 @@
                     }
 
                 confirmPersonView.text = orderDetail.confirmJobPerson
-
-                //TODO 维护情况 输入内容长度校验好像没用？
-                sceneEditView.setText(orderDetail.handleMessage)
-
                 confirmDateView.text = orderDetail.confirmJobTime
                 acceptDateView.text = orderDetail.getJobTime
                 dispatchDateView.text = orderDetail.createTime