Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -6293,9 +6293,9 @@ type ResultMemo struct {
 
 //[{"begntime":"2022-01-01 00:00:00","endtime":"2022-12-31 00:00:00","memo":"{\"matIdetCode\":\"20\",\"insuAdmdvs\":\"350481\"}","psn_idet_type":"23","psn_type_lv":null}]
 type ResultIDInfo struct {
-	Begntime string     `json:"begntime"`
-	Endtime  string     `json:"endtime"`
-	Memo     ResultMemo `json:"memo"`
+	Begntime string `json:"begntime"`
+	Endtime  string `json:"endtime"`
+	Memo     string `json:"memo"`
 }
 
 type ResultFive struct {
@@ -7520,8 +7520,15 @@ func (c *HisApiController) GetRegisterInfo() {
 				var rf []*ResultIDInfo
 				json.Unmarshal([]byte(idetinfoStr), &rf)
 				if len(rf) > 0 {
-					if len(rf[0].Memo.InsuAdmdvs) > 0 {
-						insuplc_admdvs_temp = rf[0].Memo.InsuAdmdvs
+					if len(rf[0].Memo) > 0 {
+						content := rf[0].Memo[1:len(rf[0].Memo)]
+						content2 := content[:len(rf[0].Memo)-1]
+						fmt.Println(content2)
+						var rf2 ResultMemo
+						json.Unmarshal([]byte(content2), &rf2)
+						fmt.Println(rf2)
+						fmt.Println(rf2.InsuAdmdvs)
+
 					}
 				}
 			}