历史排班

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #

controllers/his_api_controller.go

@@ -3069,7 +3069,8 @@ func (c *HisApiController) CreateHisPrescription() {
 										p.Price = lastWarehouse.PackingPrice
 									}
 									if p.Unit == "" {
-										p.Unit = lastWarehouse.WarehousingUnit
+										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+										p.Unit = goodInfoOne.PackingUnit
 									}
 								}
 

controllers/patient_dataconfig_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/utils"
 	"encoding/json"
 	"fmt"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -1170,6 +1171,37 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	patient_id := int64(dataBody["patient_id"].(float64))
+	user_org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	if dataBody["a_left"] != nil && reflect.TypeOf(dataBody["a_left"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["a_left"].([]interface{})
+		for _, item := range prescriptions {
+			var a_num float64
+			var mark_num float64
+			if item.(map[string]interface{})["a_num"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_num"]).String() == "float64" {
+				a_num = item.(map[string]interface{})["a_num"].(float64)
+			}
+			if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+				mark_num = item.(map[string]interface{})["markNum"].(float64)
+			}
+			fmt.Println(a_num, mark_num)
+
+			valsualALeft := models.XtDeviceValsualALeft{
+				ANum:      a_num,
+				MarkNum:   mark_num,
+				UserOrgId: user_org_id,
+				PatientId: patient_id,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				MapId:     0,
+				Status:    1,
+			}
+
+			service.CreateValsualAleft(valsualALeft)
+
+		}
+	}
 
 	is_append := int64(dataBody["is_append"].(float64))
 
@@ -1177,109 +1209,318 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 
 	is_img_a := int64(dataBody["is_img_a"].(float64))
 
-	a_num := dataBody["a_num"].(float64)
-
-	v_num := dataBody["v_num"].(float64)
-
-	text_num := dataBody["text_num"].(float64)
-
-	fangxianga_num := dataBody["fangxianga_num"].(float64)
-
-	fangxianga_left := dataBody["fangxianga_left"].(float64)
-
-	fangxianga_top := dataBody["fangxianga_top"].(float64)
-
-	fangxiangv_left := dataBody["fangxiangv_left"].(float64)
-
-	fangxiangv_top := dataBody["fangxiangv_top"].(float64)
-
-	fuzhua_num := dataBody["fuzhua_num"].(float64)
-
-	fuzhuv_num := dataBody["fuzhuv_num"].(float64)
-
-	xuanzhuan_a := dataBody["xuanzhuan_a"].(float64)
-
-	xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
-
-	fuzhua_top := dataBody["fuzhua_top"].(float64)
-
-	fuzhua_left := dataBody["fuzhua_left"].(float64)
-
-	fuzhuv_top := dataBody["fuzhuv_top"].(float64)
-
-	fuzhuv_left := dataBody["fuzhuv_left"].(float64)
+	a_top := dataBody["a_top"].(float64)
 
-	a_arr_str := dataBody["a_arr_str"].(string)
+	av_bkx := dataBody["av_bkx"].(float64)
+
+	av_bky := dataBody["av_bky"].(float64)
+
+	if dataBody["fangxiang_a"] != nil && reflect.TypeOf(dataBody["fangxiang_a"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fangxiang_a"].([]interface{})
+		for _, item := range prescriptions {
+			var a_num float64
+			var mark_num float64
+			var mark_top float64
+			if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+				a_num = item.(map[string]interface{})["left"].(float64)
+			}
+			if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+				mark_num = item.(map[string]interface{})["markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+				mark_top = item.(map[string]interface{})["top"].(float64)
+			}
+
+			ValsualMapFangxiangA := models.XtDeviceValsualMapFangxiangA{
+
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Left:      a_num,
+				MarkNum:   mark_num,
+				Top:       mark_top,
+				MapId:     0,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+			}
+
+			service.CreateValsualMapFangxiangA(ValsualMapFangxiangA)
+		}
 
-	v_arr_str := dataBody["v_arr_str"].(string)
+	}
 
-	a_left := dataBody["a_left"].(float64)
+	fangxiang_a_num := dataBody["fangxiang_a_num"].(float64)
+	fangxiang_a_top := dataBody["fangxiang_a_top"].(float64)
+
+	if dataBody["fangxiang_a"] != nil && reflect.TypeOf(dataBody["fangxiang_a"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fangxiang_a"].([]interface{})
+		for _, item := range prescriptions {
+			var a_num float64
+			var mark_num float64
+			var mark_top float64
+			if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+				a_num = item.(map[string]interface{})["left"].(float64)
+			}
+			if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+				mark_num = item.(map[string]interface{})["markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+				mark_top = item.(map[string]interface{})["top"].(float64)
+			}
+
+			ValsualMapFangxiangA := models.XtDeviceValsualMapFangxiangA{
+
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Left:      a_num,
+				MarkNum:   mark_num,
+				Top:       mark_top,
+				MapId:     0,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+			}
+
+			service.CreateValsualMapFangxiangA(ValsualMapFangxiangA)
+		}
 
-	a_top := dataBody["a_top"].(float64)
+	}
 
-	v_left := dataBody["v_left"].(float64)
+	fangxiang_v_left := dataBody["fangxiang_v_left"].(float64)
+	fangxiang_v_num := dataBody["fangxiang_v_num"].(float64)
+	fangxiang_v_top := dataBody["fangxiang_v_top"].(float64)
+
+	if dataBody["fangxiang_a"] != nil && reflect.TypeOf(dataBody["fangxiang_a"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fangxiang_a"].([]interface{})
+		for _, item := range prescriptions {
+			var a_num float64
+			var mark_num float64
+			var mark_top float64
+			if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+				a_num = item.(map[string]interface{})["left"].(float64)
+			}
+			if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+				mark_num = item.(map[string]interface{})["markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+				mark_top = item.(map[string]interface{})["top"].(float64)
+			}
+
+			ValsualMapFangxiangA := models.XtDeviceValsualMapFangxiangA{
+
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Left:      a_num,
+				MarkNum:   mark_num,
+				Top:       mark_top,
+				MapId:     0,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+			}
+
+			service.CreateValsualMapFangxiangA(ValsualMapFangxiangA)
+		}
 
-	v_top := dataBody["v_top"].(float64)
+	}
 
-	text_arr_str := dataBody["text_arr_str"].(string)
+	fangxiang_a_left := dataBody["fangxiang_a_left"].(float64)
+
+	if dataBody["fuzhu_a"] != nil && reflect.TypeOf(dataBody["fuzhu_a"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fuzhu_a"].([]interface{})
+		for _, item := range prescriptions {
+			var a_left float64
+			var a_markNum float64
+			var a_top float64
+			if item.(map[string]interface{})["a_left"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_left"]).String() == "float64" {
+				a_left = item.(map[string]interface{})["a_left"].(float64)
+			}
+			if item.(map[string]interface{})["a_markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_markNum"]).String() == "float64" {
+				a_markNum = item.(map[string]interface{})["a_markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["a_top"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_top"]).String() == "float64" {
+				a_top = item.(map[string]interface{})["a_top"].(float64)
+			}
+
+			valsualFuzhuA := models.XtDeviceValsualFuzhuA{
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				ALeft:     a_left,
+				AMarkNum:  a_markNum,
+				ATop:      a_top,
+				MapId:     0,
+			}
+			service.CreateValSualFuzhA(valsualFuzhuA)
+		}
+	}
 
-	text_left := dataBody["text_left"].(float64)
+	fuzhu_a_left := dataBody["fuzhu_a_left"].(float64)
+	fuzhu_a_num := dataBody["fuzhu_a_num"].(float64)
+	fuzhu_a_top := dataBody["fuzhu_a_top"].(float64)
+
+	if dataBody["fuzhu_v"] != nil && reflect.TypeOf(dataBody["fuzhu_v"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fuzhu_a"].([]interface{})
+		for _, item := range prescriptions {
+			var v_left float64
+			var v_markNum float64
+			var v_top float64
+			if item.(map[string]interface{})["v_left"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_left"]).String() == "float64" {
+				v_left = item.(map[string]interface{})["v_left"].(float64)
+			}
+			if item.(map[string]interface{})["v_markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_markNum"]).String() == "float64" {
+				v_markNum = item.(map[string]interface{})["v_markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["v_top"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_top"]).String() == "float64" {
+				v_top = item.(map[string]interface{})["v_top"].(float64)
+			}
+
+			fuzhuV := models.XtDeviceValsualFuzhuV{
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Mtime:     1,
+				VMarkNum:  v_markNum,
+				VLeft:     v_left,
+				VTop:      v_top,
+				MapId:     0,
+			}
+
+			service.CreateVasuaLfuzhuV(fuzhuV)
 
-	text_top := dataBody["text_top"].(float64)
+		}
+	}
 
-	scalev_num := dataBody["scalev_num"].(float64)
+	fuzhu_v_left := dataBody["fuzhu_v_left"].(float64)
+	fuzhu_v_num := dataBody["fuzhu_v_num"].(float64)
+	fuzhu_v_top := dataBody["fuzhu_v_top"].(float64)
 
 	scalea_num := dataBody["scalea_num"].(float64)
+	scalev_num := dataBody["scalev_num"].(float64)
 
-	value := dataBody["value"].(string)
-
-	patient_id := int64(dataBody["patient_id"].(float64))
+	if dataBody["text_arr"] != nil && reflect.TypeOf(dataBody["text_arr"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["text_arr"].([]interface{})
+		for _, item := range prescriptions {
+			var left float64
+			var text_markNum string
+			var v_top float64
+			var width float64
+			if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+				left = item.(map[string]interface{})["left"].(float64)
+			}
+			if item.(map[string]interface{})["text"] != nil || reflect.TypeOf(item.(map[string]interface{})["text"]).String() == "string" {
+				text_markNum = item.(map[string]interface{})["v_markNum"].(string)
+			}
+
+			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+				v_top = item.(map[string]interface{})["top"].(float64)
+			}
+
+			if item.(map[string]interface{})["width"] != nil || reflect.TypeOf(item.(map[string]interface{})["width"]).String() == "float64" {
+				width = item.(map[string]interface{})["width"].(float64)
+			}
+
+			textArr := models.XtDeviceValsualTextArr{
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Ctime:     time.Now().Unix(),
+				Mtime:     0,
+				Status:    1,
+				Left:      left,
+				Text:      text_markNum,
+				Top:       v_top,
+				Width:     width,
+				MapId:     0,
+			}
+
+			service.CreateTextArr(textArr)
+		}
 
-	user_org_id := this.GetAdminUserInfo().CurrentOrgId
+		text_left := dataBody["text_left"].(float64)
+		text_num := dataBody["text_num"].(float64)
+		text_top := dataBody["text_top"].(float64)
+
+		if dataBody["v_left"] != nil && reflect.TypeOf(dataBody["v_left"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["v_left"].([]interface{})
+			for _, item := range prescriptions {
+				var v_num float64
+				var markNum float64
+
+				if item.(map[string]interface{})["v_num"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_num"]).String() == "float64" {
+					v_num = item.(map[string]interface{})["v_num"].(float64)
+				}
+				if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+					markNum = item.(map[string]interface{})["markNum"].(float64)
+				}
+
+				valsualVLeft := models.XtDeviceValsualVLeft{
+					PatientId: patient_id,
+					UserOrgId: user_org_id,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					MarkNum:   markNum,
+					VNum:      v_num,
+					MapId:     0,
+				}
+
+				service.CreateValsualVleft(valsualVLeft)
+
+			}
+		}
+		v_num := dataBody["v_num"].(float64)
+		v_top := dataBody["v_top"].(float64)
+		xuanzhuan_a := dataBody["xuanzhuan_a"].(float64)
+		xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
+
+		deviceValsualMap := models.XtDeviceValsualMap{
+			PatientId:      patient_id,
+			IsAppend:       is_append,
+			IsImgV:         is_img_v,
+			IsImgA:         is_img_a,
+			VNum:           v_num,
+			Status:         1,
+			UserOrgId:      user_org_id,
+			ATop:           a_top,
+			AvBkx:          av_bkx,
+			AvBky:          av_bky,
+			FangxiangALeft: fangxiang_a_left,
+			FangxiangANum:  fangxiang_a_num,
+			FangxiangATop:  fangxiang_a_top,
+			FangxiangVLeft: fangxiang_v_left,
+			FangxiangVNum:  fangxiang_v_num,
+			FangxiangVTop:  fangxiang_v_top,
+			FuzhuALeft:     fuzhu_a_left,
+			FuzhuANum:      fuzhu_a_num,
+			FuzhuATop:      fuzhu_a_top,
+			FuzhuVLeft:     fuzhu_v_left,
+			FuzhuVNum:      fuzhu_v_num,
+			FuzhuVTop:      fuzhu_v_top,
+			ScaleaNum:      scalea_num,
+			ScalevNum:      scalev_num,
+			TextLeft:       text_left,
+			TextNum:        text_num,
+			TextTop:        text_top,
+			VTop:           v_top,
+			XuanzhuanA:     xuanzhuan_a,
+			XuanzhuanV:     xuanzhuan_v,
+		}
 
-	deviceValsualMap := models.XtDeviceValsualMap{
-		PatientId:      patient_id,
-		IsAppend:       is_append,
-		IsImgV:         is_img_v,
-		IsImgA:         is_img_a,
-		ANum:           a_num,
-		VNum:           v_num,
-		TextNum:        text_num,
-		FangxiangaNum:  fangxianga_num,
-		FangxiangaLeft: fangxianga_left,
-		FangxiangaTop:  fangxianga_top,
-		FangxiangvLeft: fangxiangv_left,
-		FangxiangvTop:  fangxiangv_top,
-		FuzhuaNum:      fuzhua_num,
-		FuzhuvNum:      fuzhuv_num,
-		XuanzhuanA:     xuanzhuan_a,
-		XuanzhuanV:     xuanzhuan_v,
-		FuzhuaTop:      fuzhua_top,
-		FuzhuaLeft:     fuzhua_left,
-		FuzhuvTop:      fuzhuv_top,
-		FuzhuvLeft:     fuzhuv_left,
-		AArrStr:        a_arr_str,
-		VArrStr:        v_arr_str,
-		ALeft:          a_left,
-		ATop:           a_top,
-		VLeft:          v_left,
-		VTop:           v_top,
-		TextArrStr:     text_arr_str,
-		TextLeft:       text_left,
-		TextTop:        text_top,
-		ScalevNum:      scalev_num,
-		ScaleaNum:      scalea_num,
-		Value:          value,
-		Status:         1,
-		UserOrgId:      user_org_id,
-	}
-
-	err = service.CreateDeviceValsualMap(deviceValsualMap)
+		err = service.CreateDeviceValsualMap(deviceValsualMap)
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"deviceValsualMap": deviceValsualMap,
-	})
+		this.ServeSuccessJSON(map[string]interface{}{
+			"deviceValsualMap": deviceValsualMap,
+		})
 
+	}
 }
 
 func (this *PatientDataConfigAPIController) GetPatientSitemap() {
@@ -1298,126 +1539,126 @@ func (this *PatientDataConfigAPIController) GetPatientSitemap() {
 
 func (this *PatientDataConfigAPIController) UpdateSiteMap() {
 
-	dataBody := make(map[string]interface{}, 0)
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-
-	is_append := int64(dataBody["is_append"].(float64))
-
-	is_img_v := int64(dataBody["is_img_v"].(float64))
-
-	is_img_a := int64(dataBody["is_img_a"].(float64))
-
-	a_num := dataBody["a_num"].(float64)
-
-	v_num := dataBody["v_num"].(float64)
-
-	text_num := dataBody["text_num"].(float64)
-
-	fangxianga_num := dataBody["fangxianga_num"].(float64)
-
-	fangxianga_left := dataBody["fangxianga_left"].(float64)
-
-	fangxianga_top := dataBody["fangxianga_top"].(float64)
-
-	fangxiangv_left := dataBody["fangxiangv_left"].(float64)
-
-	fangxiangv_top := dataBody["fangxiangv_top"].(float64)
-
-	fuzhua_num := dataBody["fuzhua_num"].(float64)
-
-	fuzhuv_num := dataBody["fuzhuv_num"].(float64)
-
-	xuanzhuan_a := dataBody["xuanzhuan_a"].(float64)
-
-	xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
-
-	fuzhua_top := dataBody["fuzhua_top"].(float64)
-
-	fuzhua_left := dataBody["fuzhua_left"].(float64)
-
-	fuzhuv_top := dataBody["fuzhuv_top"].(float64)
-
-	fuzhuv_left := dataBody["fuzhuv_left"].(float64)
-
-	a_arr_str := dataBody["a_arr_str"].(string)
-
-	v_arr_str := dataBody["v_arr_str"].(string)
-
-	a_left := dataBody["a_left"].(float64)
-
-	a_top := dataBody["a_top"].(float64)
-
-	v_left := dataBody["v_left"].(float64)
-
-	v_top := dataBody["v_top"].(float64)
-
-	text_arr_str := dataBody["text_arr_str"].(string)
-
-	text_left := dataBody["text_left"].(float64)
-
-	text_top := dataBody["text_top"].(float64)
-
-	scalev_num := dataBody["scalev_num"].(float64)
-
-	scalea_num := dataBody["scalea_num"].(float64)
-
-	value := dataBody["value"].(string)
-
-	patient_id := int64(dataBody["patient_id"].(float64))
-
-	id := int64(dataBody["id"].(float64))
-
-	user_org_id := this.GetAdminUserInfo().CurrentOrgId
-
-	deviceValsualMap := models.XtDeviceValsualMap{
-		ID:             id,
-		PatientId:      patient_id,
-		IsAppend:       is_append,
-		IsImgV:         is_img_v,
-		IsImgA:         is_img_a,
-		ANum:           a_num,
-		VNum:           v_num,
-		TextNum:        text_num,
-		FangxiangaNum:  fangxianga_num,
-		FangxiangaLeft: fangxianga_left,
-		FangxiangaTop:  fangxianga_top,
-		FangxiangvLeft: fangxiangv_left,
-		FangxiangvTop:  fangxiangv_top,
-		FuzhuaNum:      fuzhua_num,
-		FuzhuvNum:      fuzhuv_num,
-		XuanzhuanA:     xuanzhuan_a,
-		XuanzhuanV:     xuanzhuan_v,
-		FuzhuaTop:      fuzhua_top,
-		FuzhuaLeft:     fuzhua_left,
-		FuzhuvTop:      fuzhuv_top,
-		FuzhuvLeft:     fuzhuv_left,
-		AArrStr:        a_arr_str,
-		VArrStr:        v_arr_str,
-		ALeft:          a_left,
-		ATop:           a_top,
-		VLeft:          v_left,
-		VTop:           v_top,
-		TextArrStr:     text_arr_str,
-		TextLeft:       text_left,
-		TextTop:        text_top,
-		ScalevNum:      scalev_num,
-		ScaleaNum:      scalea_num,
-		Value:          value,
-		Status:         1,
-		UserOrgId:      user_org_id,
-	}
-
-	err = service.UpdateSiteMap(deviceValsualMap)
-
-	if err != nil {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"deviceValsualMap": deviceValsualMap,
-		})
-	}
+	//dataBody := make(map[string]interface{}, 0)
+	//err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	//if err != nil {
+	//	utils.ErrorLog(err.Error())
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//
+	//is_append := int64(dataBody["is_append"].(float64))
+	//
+	//is_img_v := int64(dataBody["is_img_v"].(float64))
+	//
+	//is_img_a := int64(dataBody["is_img_a"].(float64))
+	//
+	//a_num := dataBody["a_num"].(float64)
+	//
+	//v_num := dataBody["v_num"].(float64)
+	//
+	//text_num := dataBody["text_num"].(float64)
+	//
+	//fangxianga_num := dataBody["fangxianga_num"].(float64)
+	//
+	//fangxianga_left := dataBody["fangxianga_left"].(float64)
+	//
+	//fangxianga_top := dataBody["fangxianga_top"].(float64)
+	//
+	//fangxiangv_left := dataBody["fangxiangv_left"].(float64)
+	//
+	//fangxiangv_top := dataBody["fangxiangv_top"].(float64)
+	//
+	//fuzhua_num := dataBody["fuzhua_num"].(float64)
+	//
+	//fuzhuv_num := dataBody["fuzhuv_num"].(float64)
+	//
+	//xuanzhuan_a := dataBody["xuanzhuan_a"].(float64)
+	//
+	//xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
+	//
+	//fuzhua_top := dataBody["fuzhua_top"].(float64)
+	//
+	//fuzhua_left := dataBody["fuzhua_left"].(float64)
+	//
+	//fuzhuv_top := dataBody["fuzhuv_top"].(float64)
+	//
+	//fuzhuv_left := dataBody["fuzhuv_left"].(float64)
+	//
+	//a_arr_str := dataBody["a_arr_str"].(string)
+	//
+	//v_arr_str := dataBody["v_arr_str"].(string)
+	//
+	//a_left := dataBody["a_left"].(float64)
+	//
+	//a_top := dataBody["a_top"].(float64)
+	//
+	//v_left := dataBody["v_left"].(float64)
+	//
+	//v_top := dataBody["v_top"].(float64)
+	//
+	//text_arr_str := dataBody["text_arr_str"].(string)
+	//
+	//text_left := dataBody["text_left"].(float64)
+	//
+	//text_top := dataBody["text_top"].(float64)
+	//
+	//scalev_num := dataBody["scalev_num"].(float64)
+	//
+	//scalea_num := dataBody["scalea_num"].(float64)
+	//
+	//value := dataBody["value"].(string)
+	//
+	//patient_id := int64(dataBody["patient_id"].(float64))
+	//
+	//id := int64(dataBody["id"].(float64))
+	//
+	//user_org_id := this.GetAdminUserInfo().CurrentOrgId
+	//
+	//deviceValsualMap := models.XtDeviceValsualMap{
+	//	ID:             id,
+	//	PatientId:      patient_id,
+	//	IsAppend:       is_append,
+	//	IsImgV:         is_img_v,
+	//	IsImgA:         is_img_a,
+	//	ANum:           a_num,
+	//	VNum:           v_num,
+	//	TextNum:        text_num,
+	//	FangxiangaNum:  fangxianga_num,
+	//	FangxiangaLeft: fangxianga_left,
+	//	FangxiangaTop:  fangxianga_top,
+	//	FangxiangvLeft: fangxiangv_left,
+	//	FangxiangvTop:  fangxiangv_top,
+	//	FuzhuaNum:      fuzhua_num,
+	//	FuzhuvNum:      fuzhuv_num,
+	//	XuanzhuanA:     xuanzhuan_a,
+	//	XuanzhuanV:     xuanzhuan_v,
+	//	FuzhuaTop:      fuzhua_top,
+	//	FuzhuaLeft:     fuzhua_left,
+	//	FuzhuvTop:      fuzhuv_top,
+	//	FuzhuvLeft:     fuzhuv_left,
+	//	AArrStr:        a_arr_str,
+	//	VArrStr:        v_arr_str,
+	//	ALeft:          a_left,
+	//	ATop:           a_top,
+	//	VLeft:          v_left,
+	//	VTop:           v_top,
+	//	TextArrStr:     text_arr_str,
+	//	TextLeft:       text_left,
+	//	TextTop:        text_top,
+	//	ScalevNum:      scalev_num,
+	//	ScaleaNum:      scalea_num,
+	//	Value:          value,
+	//	Status:         1,
+	//	UserOrgId:      user_org_id,
+	//}
+	//
+	//err = service.UpdateSiteMap(deviceValsualMap)
+	//
+	//if err != nil {
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"deviceValsualMap": deviceValsualMap,
+	//	})
+	//}
 
 }

models/good_models.go

@@ -320,6 +320,7 @@ type GoodInformationFourty struct {
 	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	Status            int64  `gorm:"column:status" json:"status"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 }
 
 func (GoodInformationFourty) TableName() string {

models/patient_models.go

@@ -2132,38 +2132,135 @@ type XtDeviceValsualMap struct {
 	IsAppend       int64   `gorm:"column:is_append" json:"is_append" form:"is_append"`
 	IsImgV         int64   `gorm:"column:is_img_v" json:"is_img_v" form:"is_img_v"`
 	IsImgA         int64   `gorm:"column:is_img_a" json:"is_img_a" form:"is_img_a"`
-	ANum           float64 `gorm:"column:a_num" json:"a_num" form:"a_num"`
 	VNum           float64 `gorm:"column:v_num" json:"v_num" form:"v_num"`
-	TextNum        float64 `gorm:"column:text_num" json:"text_num" form:"text_num"`
-	FangxiangaNum  float64 `gorm:"column:fangxianga_num" json:"fangxianga_num" form:"fangxianga_num"`
-	FangxiangaLeft float64 `gorm:"column:fangxianga_left" json:"fangxianga_left" form:"fangxianga_left"`
-	FangxiangaTop  float64 `gorm:"column:fangxianga_top" json:"fangxianga_top" form:"fangxianga_top"`
-	FangxiangvLeft float64 `gorm:"column:fangxiangv_left" json:"fangxiangv_left" form:"fangxiangv_left"`
-	FangxiangvTop  float64 `gorm:"column:fangxiangv_top" json:"fangxiangv_top" form:"fangxiangv_top"`
-	FuzhuaNum      float64 `gorm:"column:fuzhua_num" json:"fuzhua_num" form:"fuzhua_num"`
-	FuzhuvNum      float64 `gorm:"column:fuzhuv_num" json:"fuzhuv_num" form:"fuzhuv_num"`
-	XuanzhuanA     float64 `gorm:"column:xuanzhuan_a" json:"xuanzhuan_a" form:"xuanzhuan_a"`
-	XuanzhuanV     float64 `gorm:"column:xuanzhuan_v" json:"xuanzhuan_v" form:"xuanzhuan_v"`
-	FuzhuaTop      float64 `gorm:"column:fuzhua_top" json:"fuzhua_top" form:"fuzhua_top"`
-	FuzhuaLeft     float64 `gorm:"column:fuzhua_left" json:"fuzhua_left" form:"fuzhua_left"`
-	FuzhuvTop      float64 `gorm:"column:fuzhuv_top" json:"fuzhuv_top" form:"fuzhuv_top"`
-	FuzhuvLeft     float64 `gorm:"column:fuzhuv_left" json:"fuzhuv_left" form:"fuzhuv_left"`
-	AArrStr        string  `gorm:"column:a_arr_str" json:"a_arr_str" form:"a_arr_str"`
-	VArrStr        string  `gorm:"column:v_arr_str" json:"v_arr_str" form:"v_arr_str"`
-	ALeft          float64 `gorm:"column:a_left" json:"a_left" form:"a_left"`
+	Status         int64   `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	ATop           float64 `gorm:"column:a_top" json:"a_top" form:"a_top"`
-	VLeft          float64 `gorm:"column:v_left" json:"v_left" form:"v_left"`
-	VTop           float64 `gorm:"column:v_top" json:"v_top" form:"v_top"`
-	TextArrStr     string  `gorm:"column:text_arr_str" json:"text_arr_str" form:"text_arr_str"`
+	AvBkx          float64 `gorm:"column:av_bkx" json:"av_bkx" form:"av_bkx"`
+	AvBky          float64 `gorm:"column:av_bky" json:"av_bky" form:"av_bky"`
+	FangxiangALeft float64 `gorm:"column:fangxiang_a_left" json:"fangxiang_a_left" form:"fangxiang_a_left"`
+	FangxiangANum  float64 `gorm:"column:fangxiang_a_num" json:"fangxiang_a_num" form:"fangxiang_a_num"`
+	FangxiangATop  float64 `gorm:"column:fangxiang_a_top" json:"fangxiang_a_top" form:"fangxiang_a_top"`
+	FangxiangVLeft float64 `gorm:"column:fangxiang_v_left" json:"fangxiang_v_left" form:"fangxiang_v_left"`
+	FangxiangVNum  float64 `gorm:"column:fangxiang_v_num" json:"fangxiang_v_num" form:"fangxiang_v_num"`
+	FangxiangVTop  float64 `gorm:"column:fangxiang_v_top" json:"fangxiang_v_top" form:"fangxiang_v_top"`
+	FuzhuALeft     float64 `gorm:"column:fuzhu_a_left" json:"fuzhu_a_left" form:"fuzhu_a_left"`
+	FuzhuANum      float64 `gorm:"column:fuzhu_a_num" json:"fuzhu_a_num" form:"fuzhu_a_num"`
+	FuzhuATop      float64 `gorm:"column:fuzhu_a_top" json:"fuzhu_a_top" form:"fuzhu_a_top"`
+	FuzhuVLeft     float64 `gorm:"column:fuzhu_v_left" json:"fuzhu_v_left" form:"fuzhu_v_left"`
+	FuzhuVNum      float64 `gorm:"column:fuzhu_v_num" json:"fuzhu_v_num" form:"fuzhu_v_num"`
+	FuzhuVTop      float64 `gorm:"column:fuzhu_v_top" json:"fuzhu_v_top" form:"fuzhu_v_top"`
+	ScaleaNum      float64 `gorm:"column:scalea_num" json:"scalea_num" form:"scalea_num"`
+	ScalevNum      float64 `gorm:"column:scalev_num" json:"scalev_num" form:"scalev_num"`
 	TextLeft       float64 `gorm:"column:text_left" json:"text_left" form:"text_left"`
+	TextNum        float64 `gorm:"column:text_num" json:"text_num" form:"text_num"`
 	TextTop        float64 `gorm:"column:text_top" json:"text_top" form:"text_top"`
-	ScalevNum      float64 `gorm:"column:scalev_num" json:"scalev_num" form:"scalev_num"`
-	ScaleaNum      float64 `gorm:"column:scalea_num" json:"scalea_num" form:"scalea_num"`
-	Value          string  `gorm:"column:value" json:"value" form:"value"`
-	Status         int64   `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	VTop           float64 `gorm:"column:v_top" json:"v_top" form:"v_top"`
+	XuanzhuanA     float64 `gorm:"column:xuanzhuan_a" json:"xuanzhuan_a" form:"xuanzhuan_a"`
+	XuanzhuanV     float64 `gorm:"column:xuanzhuan_v" json:"xuanzhuan_v" form:"xuanzhuan_v"`
 }
 
 func (XtDeviceValsualMap) TableName() string {
 	return "xt_device_valsual_map"
 }
+
+type XtDeviceValsualALeft struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	ANum      float64 `gorm:"column:a_num" json:"a_num" form:"a_num"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDeviceValsualALeft) TableName() string {
+	return "xt_device_valsual_a_left"
+}
+
+type XtDeviceValsualMapFangxiangA struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDeviceValsualMapFangxiangA) TableName() string {
+	return "xt_device_valsual_map_fangxiang_a"
+}
+
+type XtDeviceValsualFuzhuA struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	ALeft     float64 `gorm:"column:a_left" json:"a_left" form:"a_left"`
+	AMarkNum  float64 `gorm:"column:a_mark_num" json:"a_mark_num" form:"a_mark_num"`
+	ATop      float64 `gorm:"column:a_top" json:"a_top" form:"a_top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualFuzhuA) TableName() string {
+	return "xt_device_valsual_fuzhu_a"
+}
+
+type XtDeviceValsualFuzhuV struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	VMarkNum  float64 `gorm:"column:v_mark_num" json:"v_mark_num" form:"v_mark_num"`
+	VLeft     float64 `gorm:"column:v_left" json:"v_left" form:"v_left"`
+	VTop      float64 `gorm:"column:v_top" json:"v_top" form:"v_top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualFuzhuV) TableName() string {
+	return "xt_device_valsual_fuzhu_v"
+}
+
+type XtDeviceValsualTextArr struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	Text      string  `gorm:"column:text" json:"text" form:"text"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	Width     float64 `gorm:"column:width" json:"width" form:"width"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualTextArr) TableName() string {
+	return "xt_device_valsual_text_arr"
+}
+
+type XtDeviceValsualVLeft struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	VNum      float64 `gorm:"column:v_num" json:"v_num" form:"v_num"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualVLeft) TableName() string {
+	return "xt_device_valsual_v_left"
+}

service/patient_service.go

@@ -3094,3 +3094,39 @@ func UpdateSiteMap(valsualMap models.XtDeviceValsualMap) error {
 	err := XTWriteDB().Save(&valsualMap).Error
 	return err
 }
+
+func CreateValsualAleft(left models.XtDeviceValsualALeft) error {
+
+	err := XTWriteDB().Create(&left).Error
+	return err
+}
+
+func CreateValsualMapFangxiangA(a models.XtDeviceValsualMapFangxiangA) error {
+
+	err := XTWriteDB().Create(&a).Error
+	return err
+}
+
+func CreateValSualFuzhA(a models.XtDeviceValsualFuzhuA) error {
+
+	err := XTReadDB().Create(&a).Error
+	return err
+}
+
+func CreateVasuaLfuzhuV(v models.XtDeviceValsualFuzhuV) error {
+
+	err := XTReadDB().Create(&v).Error
+	return err
+}
+
+func CreateTextArr(arr models.XtDeviceValsualTextArr) error {
+
+	err := XTReadDB().Create(&arr).Error
+	return err
+}
+
+func CreateValsualVleft(left models.XtDeviceValsualVLeft) error {
+
+	err = XTReadDB().Create(&left).Error
+	return err
+}