From 576bba7c489895edfcdd852eca4e899072411d2e Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Mon, 17 Jun 2024 17:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/iflytop/a800/controller/TestController.java   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/com/iflytop/a800/controller/TestController.java b/src/main/java/com/iflytop/a800/controller/TestController.java
index 53e2d09..e2878c0 100644
--- a/src/main/java/com/iflytop/a800/controller/TestController.java
+++ b/src/main/java/com/iflytop/a800/controller/TestController.java
@@ -1,4 +1,5 @@
 package com.iflytop.a800.controller;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.iflytop.a800.TaskManager;
 import com.iflytop.a800.model.*;
 import com.iflytop.a800.resource.TestTube;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 @Controller
@@ -175,6 +177,18 @@ public class TestController extends UfApiControllerBase {
         var list = new ArrayList<Map<String, Object>>();
         for ( var test : tests ) {
             var item = test.toMap();
+            var resultMapList = new ArrayList<Map<String,String>>();
+            if ( null != test.result ) {
+                var resultJson = UfJsonHelper.jsonToNode(test.result);
+                for ( var resultItem : resultJson ) {
+                    Map<String,String> resultMap = new HashMap<>();
+                    resultMap.put("name", resultItem.get("name").asText());
+                    resultMap.put("value", resultItem.get("value").asText());
+                    resultMap.put("unit", resultItem.get("unit").asText());
+                    resultMapList.add(resultMap);
+                }
+            }
+            item.put("result", resultMapList);
             list.add(item);
         }
         return this.success(list);