fix

graph/helper.go

@@ -13,7 +13,7 @@ import (
 
 // 获取节点列表，并转成问题模板的格式返回
 func ListNodeToQuestionTemplate(ids []string, needCheckItemId bool) ([]*sdk.QuestionnaireTemplate, *response.ErrCode) {
-	response, err := ListNode(ids)
+	response, err := ListNode(ids, []string{})
 	if err != nil {
 		return nil, err
 	}
@@ -27,7 +27,7 @@ func ListNodeToQuestionTemplate(ids []string, needCheckItemId bool) ([]*sdk.Ques
 }
 
 func GetNodeRelationShipsToStruct(id, name string) ([]*sdk.QuestionnaireSubjectSelectValue, []*sdk.QuestionnaireSubjectSelectValue) {
-	response, err := GetNodeRelationShips(id, name)
+	response, err := GetNodeRelationShips(id, name, "")
 	if err != nil {
 		return nil, nil
 	}
@@ -234,7 +234,7 @@ func FilterArchivesValues(archivesValuesList []*sdk.ArchivesValues) ([]*sdk.Arch
 	nodeIds = lo.Uniq(nodeIds)
 
 	// 获取节点列表
-	nodeResponse, err := ListNode(nodeIds)
+	nodeResponse, err := ListNode(nodeIds, []string{})
 	var nodeList []*sdk.GraphNode = make([]*sdk.GraphNode, 0)
 	if err == nil {
 		nodeList = nodeResponse.Data.List
@@ -281,14 +281,14 @@ func FilterArchivesValues(archivesValuesList []*sdk.ArchivesValues) ([]*sdk.Arch
 			if answer != nil && len(answer.InputAnswers.Value) > 0 {
 				itemId = answer.InputAnswers.Value[0]
 				// 查询名称
-				response, err := ListNode([]string{itemId})
+				response, err := ListNode([]string{itemId}, []string{})
 				if err == nil {
 					itemName = response.Data.List[0].Properties.Name
 				}
 			}
 		} else {
 			// 获取节点列表
-			nodeRelationResponse, err := GetNodeRelationd(nodeId, "可检测")
+			nodeRelationResponse, err := GetNodeRelationd(nodeId, "可检测", "")
 			if err == nil {
 				if len(nodeRelationResponse.Data) > 0 {
 					itemName = nodeRelationResponse.Data[0]["properties"].(map[string]any)["name"].(string)

graph/main.go

@@ -34,11 +34,12 @@ func PaginateNode(ids []string, name string, tags []string, pageSize int64) (*sd
 }
 
 // 获取节点列表
-func ListNode(ids []string) (*sdk.BaseResponse[sdk.PaginateResponse[*sdk.GraphNode]], *response.ErrCode) {
+func ListNode(ids []string, importId []string) (*sdk.BaseResponse[sdk.PaginateResponse[*sdk.GraphNode]], *response.ErrCode) {
 	var resp *sdk.BaseResponse[sdk.PaginateResponse[*sdk.GraphNode]]
 	resp, err := postReq[*sdk.BaseResponse[sdk.PaginateResponse[*sdk.GraphNode]]]("/graphService/open/node/paginate", gout.H{
 		"id":       strings.Join(ids, ","),
 		"pageSize": len(ids),
+		"importId": strings.Join(importId, ","),
 	})
 	if err != nil {
 		return nil, &response.ErrCode{
@@ -56,11 +57,12 @@ func ListNode(ids []string) (*sdk.BaseResponse[sdk.PaginateResponse[*sdk.GraphNo
 }
 
 // 获取节点关系
-func GetNodeRelationShips(id, relationName string) (*sdk.BaseResponse[[]map[string]any], *response.ErrCode) {
+func GetNodeRelationShips(id, relationName, importId string) (*sdk.BaseResponse[[]map[string]any], *response.ErrCode) {
 	var resp *sdk.BaseResponse[[]map[string]any]
 	resp, err := getReq[*sdk.BaseResponse[[]map[string]any]]("/graphService/open/node/relationship", gout.H{
-		"id":    id,
-		"rName": relationName,
+		"id":       id,
+		"rName":    relationName,
+		"importId": importId,
 	})
 	if err != nil {
 		return nil, &response.ErrCode{
@@ -78,11 +80,12 @@ func GetNodeRelationShips(id, relationName string) (*sdk.BaseResponse[[]map[stri
 }
 
 // 获取节点关系
-func GetNodeRelationd(id, relationName string) (*sdk.BaseResponse[[]map[string]any], *response.ErrCode) {
+func GetNodeRelationd(id, relationName, importId string) (*sdk.BaseResponse[[]map[string]any], *response.ErrCode) {
 	var resp *sdk.BaseResponse[[]map[string]any]
 	resp, err := getReq[*sdk.BaseResponse[[]map[string]any]]("/graphService/open/node/related", gout.H{
 		"id":           id,
 		"relationship": relationName,
+		"importId":     importId,
 	})
 	if err != nil {
 		return nil, &response.ErrCode{

graph/main_test.go

@@ -18,7 +18,7 @@ func TestList(t *testing.T) {
 		})
 		response, err := graph.ListNode([]string{
 			"4:b8fbfa26-3437-4bbb-8349-96abd14851ea:1378",
-		})
+		}, []string{})
 		if err != nil {
 			t.Errorf("err: %v", err)
 		}
@@ -53,7 +53,7 @@ func TestGetNodeRelationShip(t *testing.T) {
 			AppDebug:       true,
 		})
 
-		relationResponse, relationErr := graph.GetNodeRelationd("4:aad18a76-6ee3-48a0-bec9-4f7e0bb822dc:357", "可检测")
+		relationResponse, relationErr := graph.GetNodeRelationd("4:aad18a76-6ee3-48a0-bec9-4f7e0bb822dc:357", "可检测", "")
 		if relationErr == nil && len(relationResponse.Data) > 0 {
 			bloodPressureItemGroupId := relationResponse.Data[0]["id"].(string)
 			bloodPressureItemGroupName := relationResponse.Data[0]["properties"].(map[string]any)["name"].(string)

structs.go

@@ -343,8 +343,9 @@ type AbnormalData struct {
 
 // 普通答案
 type QuestionAnswerModel struct {
-	Key   string `json:"key"`   // 答案key
-	Value string `json:"value"` // 答案value
+	Key      string `json:"key"`      // 答案key
+	Value    string `json:"value"`    // 答案value
+	ImportID string `json:"importId"` // 额外附加的图谱导入ID
 }
 
 // 单行文本题答案