历史排班

controllers/patient_dataconfig_api_controller.go

 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 
 	beego.Router("/api/patient/getpatientallagic", &PatientDataConfigAPIController{}, "Get:GetPatientAllagicList")
 
+	beego.Router("/api/patient/savesitemap", &PatientDataConfigAPIController{}, "Post:SaveSiteMap")
+
+	beego.Router("/api/patient/getpatientsitemap", &PatientDataConfigAPIController{}, "Get:GetPatientSitemap")
+
+	beego.Router("/api/patient/updatesitemap", &PatientDataConfigAPIController{}, "Post:UpdateSiteMap")
+
 }
 
 type PatientDataConfigAPIController struct {
 func (this *PatientDataConfigAPIController) GetPatientAllagicList() {
 
 	id, _ := this.GetInt64("id")
-	fmt.Println("id2ooooooooooooooooooo", id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, _ := service.GetPatientAllagicList(id, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
 }
+
+func (this *PatientDataConfigAPIController) SaveSiteMap() {
+
+	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))
+
+	user_org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	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)
+
+	if err != nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"deviceValsualMap": deviceValsualMap,
+		})
+	}
+
+}
+
+func (this *PatientDataConfigAPIController) GetPatientSitemap() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	sitemap, err := service.GetPatientSitemap(patient_id, orgId)
+	if err != nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"sitemap": sitemap,
+		})
+	}
+}
+
+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,
+		})
+	}
+
+}

controllers/print_data_api_controller.go

 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
 			item.Schedule = &lastSchedule
 
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 {
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
 				if item.ScheduleDate <= 1672416000 {
-
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

controllers/self_drug_api_congtroller.go

 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 
 	if orgId == 10265 {
-		storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
+		//storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
 		list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
 		for _, item := range list {
 
 			//获取期初结余
-			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
+			low, _ := service.GetStartLastFLowTwenty(item.ID, orgId, startTime)
 
 			item.GoodStartFlowInfo = low
 
 			//获取期末结余
-			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime, storeConfig.StorehouseOutInfo)
+			flow, _ := service.GetEndLastFlowTwenty(item.ID, orgId, endTime)
 
 			item.GoodEndFlowInfo = flow
 
 			//获取期间增加
-			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoListTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range goodWarehouseInfoList {
 				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
 			}
 
 			//获取本期增加
-			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+			WarehouseInfoFlowList, _ := service.GetAddStartFlowTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range WarehouseInfoFlowList {
 				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
 			}
 			//获取本期减少
-			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoListTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range reduceWarehouseInfoList {
 				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
 			}
 
 			//获取期中减少退库
-			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+			lowInfo, _ := service.GetStartEndCancelFLowInfoTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range lowInfo {
 				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
 			}
 			//
-			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
+			outInfo, _ := service.FindeWarehouseOutInfoTwenty(item.ID, orgId, startTime)
 			for _, it := range outInfo {
 				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 			}
 
 			//期中盘盈
-			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+			profit, _ := service.FindeEndStokInventoryProfitTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range profit {
 				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
 			}
 			//期中盘亏
-			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+			losses, _ := service.FindeEndStockInventoryLossesTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range losses {
 				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 			}

models/patient_models.go

 func (XtScheduleLog) TableName() string {
 	return "xt_schedule_log"
 }
+
+type XtDeviceValsualMap struct {
+	ID             int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	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"`
+	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"`
+	TextLeft       float64 `gorm:"column:text_left" json:"text_left" form:"text_left"`
+	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"`
+}
+
+func (XtDeviceValsualMap) TableName() string {
+	return "xt_device_valsual_map"
+}

service/patient_service.go

 
 	return libSeven, err
 }
+
+func CreateDeviceValsualMap(valsualMap models.XtDeviceValsualMap) error {
+
+	err := XTWriteDB().Create(&valsualMap).Error
+
+	return err
+}
+
+func GetPatientSitemap(patient_id int64, user_org_id int64) (models.XtDeviceValsualMap, error) {
+
+	valsualMap := models.XtDeviceValsualMap{}
+	err := XTReadDB().Where("patient_id = ? and status =1 and user_org_id = ?", patient_id, user_org_id).Find(&valsualMap).Error
+	return valsualMap, err
+}
+
+func UpdateSiteMap(valsualMap models.XtDeviceValsualMap) error {
+
+	err := XTWriteDB().Save(&valsualMap).Error
+	return err
+}

service/self_drug_service.go

 	return info, err
 }
 
+func GetAddGoodWarehouseInfoListTwenty(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.StartWarehousingInfo, err error) {
+	db := XTReadDB().Model(&info).Where("status = 1 and is_check =1")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}
+
 func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (info []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type =1 or consumable_type = 13)")
 	if good_id > 0 {
 	return info, err
 }
 
+func GetAddStartFlowTwenty(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type =1)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+
+	err = db.Find(&info).Error
+	return info, err
+}
+
 func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type= 15)")
 	if good_id > 0 {
 	return outinfo, err
 }
 
+func GetReduceWarehouseInfoListTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type= 15)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
 func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 7)")
 	if good_id > 0 {
 	return outinfo, err
 }
 
+func GetStartEndCancelFLowInfoTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 7)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
 func FindeStartFlowInfo(good_id int64, orgid int64, startime int64) (info []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and consumable_type = 1")
 	return outinfo, err
 }
 
+func FindeWarehouseOutInfoTwenty(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type = 15)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime <?", startime)
+	}
+
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
 func FindeStartStockInventoryProfit(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 10)")
 	return outinfo, err
 }
 
+func FindeEndStokInventoryProfitTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 10)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime < 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
 func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
 	if good_id > 0 {
 	return outinfo, err
 }
 
+func FindeEndStockInventoryLossesTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime < 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
 func FindStartStockInventoryLosses(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
 	return flwo, err
 }
 
+func GetStartLastFLowTwenty(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
+
+	flwo := models.VmStockFlowTwenty{}
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ?", goodid, orgid, startime).Last(&flwo).Error
+	return flwo, err
+}
+
 func GetEndLastFlow(goodid int64, orgid int64, endtime int64, storehouse_id int64) (models.VmStockFlowTwenty, error) {
 	flwo := models.VmStockFlowTwenty{}
 	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ? and storehouse_id= ?", goodid, orgid, endtime, storehouse_id).Last(&flwo).Error
 	return flwo, err
 }
 
+func GetEndLastFlowTwenty(goodid int64, orgid int64, endtime int64) (models.VmStockFlowTwenty, error) {
+	flwo := models.VmStockFlowTwenty{}
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ?", goodid, orgid, endtime).Last(&flwo).Error
+	return flwo, err
+}
+
 func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&druginfo).Where("status = 1")

service/sign_service.go

 	signFiles := make(map[string]interface{})
 
 	//创建合同返回
-	signFiles["docId"] = "157595002862567873"
+	signFiles["docId"] = "158027977441935904"
 
 	inputDataArr := make([]map[string]interface{}, 0)
 
 		keywordSignControls["key"] = "2"
 		keywordSignControls["type"] = "date"
 		keywordSignControls["pageNum"] = 1
-		keywordSignControls["keyword"] = "医生签名"
+		keywordSignControls["keyword"] = "护士"
 		keywordSignControls["offsetX"] = "100F"
 		keywordSignControls["offsetY"] = "100F"
 		inputDataArrTwo = append(inputDataArrTwo, keywordSignControls)
 	inputDataArrFour = append(inputDataArrFour, signersFiles)
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157595002862567872"
+	maprequest["contractId"] = "158027977441935903"
 	maprequest["signers"] = inputDataArrFour
 
 	byterequest, _ := json.Marshal(maprequest)
 
 	fmt.Println("signContorlwqowowo", signControl)
 	signFiles["signControl"] = signControl
-	signFiles["docId"] = "157595002862567873"
+	signFiles["docId"] = "158027977441935904"
 	inputDataArrThree := make([]map[string]interface{}, 0)
 	inputDataArrThree = append(inputDataArrThree, signFiles)
 
 	signer := make(map[string]interface{})
 
 	//添加合同签署人接口返回
-	signer["signerId"] = "157595142449004996"
+	signer["signerId"] = "158028978169315875"
 	signer["isUserWishes"] = true
 	signer["userWishesWay"] = 1
-	signer["codeNumber"] = "msg202308261800395745892"
-	signer["verifyCode"] = "452399"
+	signer["codeNumber"] = "msg202308311013481137884"
+	signer["verifyCode"] = "488164"
 	signer["signFiles"] = inputDataArrThree
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157595002862567872"
+	maprequest["contractId"] = "158027977441935903"
 	maprequest["signer"] = signer
 
 	byterequest, _ := json.Marshal(maprequest)
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157595002862567872"
+	maprequest["contractId"] = "158027977441935903"
 	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	byterequest, _ := json.Marshal(maprequest)
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157475501840007476"
+	maprequest["contractId"] = "158027977441935903"
 	maprequest["responseContractFile"] = true
 
 	fmt.Println("request23222222222222222", maprequest)
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157594023610024377"
+	maprequest["contractId"] = "158027977441935903"
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)