Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/dialysis_api_controller.go

@@ -2717,7 +2717,6 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"project_config":            project_config,
 			"projects":                  projects,
 		})
-
 	}
 
 }

controllers/doctors_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
@@ -46,11 +47,11 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/getinspectiondetail", &DoctorsApiController{}, "Get:GetInspectionDetailByProject")
 	beego.Router("/api/patient/getinspectionitemlist", &DoctorsApiController{}, "Get:GetInspectionItemlist")
 	beego.Router("/api/patient/getinitdatelist", &DoctorsApiController{}, "Get:GetInitDateList")
-	beego.Router("/api/patient/savecreationinspection", &DoctorsApiController{}, "Get:SaveCreationInspection")
+	beego.Router("/api/patient/savecreationinspection", &DoctorsApiController{}, "Post:SaveCreationInspection")
 	beego.Router("/api/patient/getemlatesummarylist", &DoctorsApiController{}, "Get:GetTemplateSummaryList")
 	beego.Router("/api/patient/gettemplatesummarydetail", &DoctorsApiController{}, "Get:GetTemplateSummaryDetail")
 	beego.Router("/api/patient/gettemplatesummaryprintdetail", &DoctorsApiController{}, "Get:GetTemplateSummaryPrintDetail")
-	beego.Router("/api/patient/updatetemplatesummary", &DoctorsApiController{}, "Get:UpdateTempalteSummary")
+	beego.Router("/api/patient/updatetemplatesummary", &DoctorsApiController{}, "Post:UpdateTempalteSummary")
 	beego.Router("/api/patient/deletesummary", &DoctorsApiController{}, "Get:DeleteSummary")
 }
 
@@ -763,48 +764,93 @@ func (this *DoctorsApiController) GetInitDateList() {
 
 func (this *DoctorsApiController) SaveCreationInspection() {
 
-	title := this.GetString("title")
-
-	dryWeight := this.GetString("dry_weight")
+	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
+	}
+	title := dataBody["title"].(string)
+	dryWeight := dataBody["dry_weight"].(string)
 	dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	dialysis_count, _ := this.GetInt64("dialysis_count")
-	hd_count, _ := this.GetInt64("hd_count")
-	hdf_count, _ := this.GetInt64("hdf_count")
-	hp_count, _ := this.GetInt64("hp_count")
-	other_count, _ := this.GetInt64("other_count")
-	dialzer_apparatus := this.GetString("dialzer_apparatus")
-	perfusion_apparatus := this.GetString("perfusion_apparatus")
-	anticoagulant, _ := this.GetInt64("anticoagulant")
-	kaliumstr := this.GetString("kalium")
+	dialysis_count := int64(dataBody["dialysis_count"].(float64))
+	hd_count := int64(dataBody["hd_count"].(float64))
+	hdf_count := int64(dataBody["hdf_count"].(float64))
+	hp_count := int64(dataBody["hp_count"].(float64))
+	other_count := int64(dataBody["other_count"].(float64))
+	dialzer_apparatus := dataBody["dialzer_apparatus"].(string)
+	perfusion_apparatus := dataBody["perfusion_apparatus"].(string)
+	anticoagulant := int64(dataBody["anticoagulant"].(float64))
+	kaliumstr := dataBody["kalium"].(string)
 	kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-
-	autunitestr := this.GetString("autunite")
+	autunitestr := dataBody["autunite"].(string)
 	autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	natriumstr := this.GetString("natrium")
+	natriumstr := dataBody["natrium"].(string)
 	natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	hour, _ := this.GetInt64("hour")
-	minute, _ := this.GetInt64("minute")
-	beforWeight := this.GetString("befor_weight")
+	hour := int64(dataBody["hour"].(float64))
+	minute := int64(dataBody["minute"].(float64))
+	beforWeight := dataBody["befor_weight"].(string)
 	befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	afterWeight := this.GetString("after_weight")
+	afterWeight := dataBody["after_weight"].(string)
 	after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	befor_pressure := this.GetString("befor_pressure")
-	template_summary_content := this.GetString("template_summary_content")
-	template_plan_content := this.GetString("template_plan_content")
-	admin_user_id, _ := this.GetInt64("admin_user_id")
-	record_time := this.GetString("record_time")
+	befor_pressure := dataBody["befor_pressure"].(string)
+	template_summary_content := dataBody["template_summary_content"].(string)
+	template_plan_content := dataBody["template_plan_content"].(string)
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
+	record_time := dataBody["record_time"].(string)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	after_pressure := this.GetString("after_pressure")
-	template_summary_id, _ := this.GetInt64("template_summary_id")
-	template_plan_id, _ := this.GetInt64("template_plan_id")
-	template_inspection_id, _ := this.GetInt64("template_inspection_id")
-	patient_id, _ := this.GetInt64("patient_id")
-	fmt.Println("patient_id", patient_id)
+	after_pressure := dataBody["after_pressure"].(string)
+	template_summary_id := int64(dataBody["template_summary_id"].(float64))
+	template_plan_id := int64(dataBody["template_plan_id"].(float64))
+	patient_id := int64(dataBody["patient_id"].(float64))
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	inspect_date := this.GetString("inspect_date")
-	project_id := this.GetString("project_id")
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
+	template_inspection_id := int64(dataBody["template_inspection_id"].(float64))
+	//title := this.GetString("title")
+	//dryWeight := this.GetString("dry_weight")
+	//dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
+	//dialysis_count, _ := this.GetInt64("dialysis_count")
+	//hd_count, _ := this.GetInt64("hd_count")
+	//hdf_count, _ := this.GetInt64("hdf_count")
+	//hp_count, _ := this.GetInt64("hp_count")
+	//other_count, _ := this.GetInt64("other_count")
+	//dialzer_apparatus := this.GetString("dialzer_apparatus")
+	//perfusion_apparatus := this.GetString("perfusion_apparatus")
+	//anticoagulant, _ := this.GetInt64("anticoagulant")
+	//kaliumstr := this.GetString("kalium")
+	//kalium, _ := strconv.ParseFloat(kaliumstr, 64)
+	//
+	//autunitestr := this.GetString("autunite")
+	//autunite, _ := strconv.ParseFloat(autunitestr, 64)
+	//natriumstr := this.GetString("natrium")
+	//natrium, _ := strconv.ParseFloat(natriumstr, 64)
+	//hour, _ := this.GetInt64("hour")
+	//minute, _ := this.GetInt64("minute")
+	//beforWeight := this.GetString("befor_weight")
+	//befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
+	//afterWeight := this.GetString("after_weight")
+	//after_weight, _ := strconv.ParseFloat(afterWeight, 64)
+	//befor_pressure := this.GetString("befor_pressure")
+	//template_summary_content := this.GetString("template_summary_content")
+	//template_plan_content := this.GetString("template_plan_content")
+	//admin_user_id, _ := this.GetInt64("admin_user_id")
+	//record_time := this.GetString("record_time")
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
+	//after_pressure := this.GetString("after_pressure")
+	//template_summary_id, _ := this.GetInt64("template_summary_id")
+	//template_plan_id, _ := this.GetInt64("template_plan_id")
+	//template_inspection_id, _ := this.GetInt64("template_inspection_id")
+	//patient_id, _ := this.GetInt64("patient_id")
+	//fmt.Println("patient_id", patient_id)
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	//inspect_date := this.GetString("inspect_date")
+	//project_id := this.GetString("project_id")
 	summary := models.XtTemplateSummary{
 		StartYear:              0,
 		StartMonth:             0,
@@ -845,7 +891,7 @@ func (this *DoctorsApiController) SaveCreationInspection() {
 		ProjectId:              project_id,
 	}
 
-	err := service.CreateSummary(&summary)
+	err = service.CreateSummary(&summary)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"summary": summary,
@@ -912,49 +958,97 @@ func (this *DoctorsApiController) GetTemplateSummaryPrintDetail() {
 
 func (this *DoctorsApiController) UpdateTempalteSummary() {
 
-	id, _ := this.GetInt64("id")
-	title := this.GetString("title")
-
-	dryWeight := this.GetString("dry_weight")
+	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
+	}
+	id := int64(dataBody["id"].(float64))
+	title := dataBody["title"].(string)
+	dryWeight := dataBody["dry_weight"].(string)
 	dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	dialysis_count, _ := this.GetInt64("dialysis_count")
-	hd_count, _ := this.GetInt64("hd_count")
-	hdf_count, _ := this.GetInt64("hdf_count")
-	hp_count, _ := this.GetInt64("hp_count")
-	other_count, _ := this.GetInt64("other_count")
-	dialzer_apparatus := this.GetString("dialzer_apparatus")
-	perfusion_apparatus := this.GetString("perfusion_apparatus")
-	anticoagulant, _ := this.GetInt64("anticoagulant")
-	kaliumstr := this.GetString("kalium")
+	dialysis_count := int64(dataBody["dialysis_count"].(float64))
+	hd_count := int64(dataBody["hd_count"].(float64))
+	hdf_count := int64(dataBody["hdf_count"].(float64))
+	hp_count := int64(dataBody["hp_count"].(float64))
+	other_count := int64(dataBody["other_count"].(float64))
+	dialzer_apparatus := dataBody["dialzer_apparatus"].(string)
+	perfusion_apparatus := dataBody["perfusion_apparatus"].(string)
+	anticoagulant := int64(dataBody["anticoagulant"].(float64))
+	kaliumstr := dataBody["kalium"].(string)
 	kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-
-	autunitestr := this.GetString("autunite")
+	autunitestr := dataBody["autunite"].(string)
 	autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	natriumstr := this.GetString("natrium")
+	natriumstr := dataBody["natrium"].(string)
 	natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	hour, _ := this.GetInt64("hour")
-	minute, _ := this.GetInt64("minute")
-	beforWeight := this.GetString("befor_weight")
+	hour := int64(dataBody["hour"].(float64))
+	minute := int64(dataBody["minute"].(float64))
+	beforWeight := dataBody["befor_weight"].(string)
 	befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	afterWeight := this.GetString("after_weight")
+	afterWeight := dataBody["after_weight"].(string)
 	after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	befor_pressure := this.GetString("befor_pressure")
-	template_summary_content := this.GetString("template_summary_content")
-	template_plan_content := this.GetString("template_plan_content")
-	admin_user_id, _ := this.GetInt64("admin_user_id")
-	record_time := this.GetString("record_time")
+	befor_pressure := dataBody["befor_pressure"].(string)
+	template_summary_content := dataBody["template_summary_content"].(string)
+	template_plan_content := dataBody["template_plan_content"].(string)
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
+	record_time := dataBody["record_time"].(string)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	after_pressure := this.GetString("after_pressure")
-	template_summary_id, _ := this.GetInt64("template_summary_id")
-	template_plan_id, _ := this.GetInt64("template_plan_id")
-	template_inspection_id, _ := this.GetInt64("template_inspection_id")
-	patient_id, _ := this.GetInt64("patient_id")
-	fmt.Println("patient_id", patient_id)
+	after_pressure := dataBody["after_pressure"].(string)
+	template_summary_id := int64(dataBody["template_summary_id"].(float64))
+	template_plan_id := int64(dataBody["template_plan_id"].(float64))
+	patient_id := int64(dataBody["patient_id"].(float64))
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	inspect_date := this.GetString("inspect_date")
-	project_id := this.GetString("project_id")
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
+	template_inspection_id := int64(dataBody["template_inspection_id"].(float64))
+
+	//id, _ := this.GetInt64("id")
+	//title := this.GetString("title")
+	//
+	//dryWeight := this.GetString("dry_weight")
+	//dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
+	//dialysis_count, _ := this.GetInt64("dialysis_count")
+	//hd_count, _ := this.GetInt64("hd_count")
+	//hdf_count, _ := this.GetInt64("hdf_count")
+	//hp_count, _ := this.GetInt64("hp_count")
+	//other_count, _ := this.GetInt64("other_count")
+	//dialzer_apparatus := this.GetString("dialzer_apparatus")
+	//perfusion_apparatus := this.GetString("perfusion_apparatus")
+	//anticoagulant, _ := this.GetInt64("anticoagulant")
+	//kaliumstr := this.GetString("kalium")
+	//kalium, _ := strconv.ParseFloat(kaliumstr, 64)
+	//
+	//autunitestr := this.GetString("autunite")
+	//autunite, _ := strconv.ParseFloat(autunitestr, 64)
+	//natriumstr := this.GetString("natrium")
+	//natrium, _ := strconv.ParseFloat(natriumstr, 64)
+	//hour, _ := this.GetInt64("hour")
+	//minute, _ := this.GetInt64("minute")
+	//beforWeight := this.GetString("befor_weight")
+	//befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
+	//afterWeight := this.GetString("after_weight")
+	//after_weight, _ := strconv.ParseFloat(afterWeight, 64)
+	//befor_pressure := this.GetString("befor_pressure")
+	//template_summary_content := this.GetString("template_summary_content")
+	//template_plan_content := this.GetString("template_plan_content")
+	//admin_user_id, _ := this.GetInt64("admin_user_id")
+	//record_time := this.GetString("record_time")
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
+	//after_pressure := this.GetString("after_pressure")
+	//template_summary_id, _ := this.GetInt64("template_summary_id")
+	//template_plan_id, _ := this.GetInt64("template_plan_id")
+	//template_inspection_id, _ := this.GetInt64("template_inspection_id")
+	//patient_id, _ := this.GetInt64("patient_id")
+	//fmt.Println("patient_id", patient_id)
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	//inspect_date := this.GetString("inspect_date")
+	//project_id := this.GetString("project_id")
 	summary := models.XtTemplateSummary{
 		ID:                     id,
 		StartYear:              0,
@@ -995,7 +1089,7 @@ func (this *DoctorsApiController) UpdateTempalteSummary() {
 		ProjectId:              project_id,
 		InspectDate:            inspect_date,
 	}
-	err := service.UpdateTempalteSummary(&summary)
+	err = service.UpdateTempalteSummary(&summary)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list": summary,

controllers/gobal_config_api_controller.go

@@ -2010,19 +2010,18 @@ func (c *GobalConfigApiController) GetDrugCountList() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetDrugCountList(startTime, endTime, orgId)
 	countList, err := service.GetMinCountList(startTime, endTime, orgId)
-	//outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
-	//auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
+	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
+	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
 	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
 	cancelCountList, _ := service.GetCancelDrugCountList(startTime, endTime, orgId)
-	//service.GetAllCountList(startTime,endTime,orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"countList": list,
-		//"outCountList":    outCountList,
-		//"auCountList":     auCountList,
+		"countList":       list,
+		"outCountList":    outCountList,
+		"auCountList":     auCountList,
 		"minCount":        countList,
 		"info":            info,
 		"cancelCountList": cancelCountList,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4987,3 +4987,15 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		return errors.New("退库和出库数据不匹配")
 	}
 }
+
+func (this *DialysisAPIController) GetMobileScheduleList() {
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	type_options_visible, _ := this.GetInt64("type_options_visible")
+	sch_type_options_visible, _ := this.GetInt64("sch_type_options_visible")
+	zone_options_visible, _ := this.GetInt64("zone_options_visible")
+	fmt.Println(limit, page, type_options_visible, sch_type_options_visible, zone_options_visible)
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -163,4 +163,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/updatestockgoods", &DialysisAPIController{}, "Get:UpdateStockGoods")
 
+	beego.Router("/m/api/getmobileschedulelist", &DialysisAPIController{}, "Get:GetMobileScheduleList")
+
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2692,7 +2692,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 		for _, item := range projects {
-			var advice *models.HisDoctorAdviceInfo
+			var advice models.HisDoctorAdviceInfo
 			advice.ID = item.ID
 			advice.Checker = item.Checker
 			advice.CheckTime = item.CheckTime
@@ -2708,7 +2708,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 				advice.AdviceName = item.HisProject.ProjectName
 			}
 			advice.StartTime = item.StartTime
-			hisAdvice = append(hisAdvice, advice)
+			hisAdvice = append(hisAdvice, &advice)
 		}
 
 	}
@@ -2762,6 +2762,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"check":                   check,
 			"dialysiscount":           dialysiscount,
 			"last_order":              last_order,
+			"projects":                projects,
+			"project_config":          project_config,
 		})
 	}
 
@@ -2782,6 +2784,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"check":                   check,
 			"dialysiscount":           dialysiscount,
 			"last_order":              last_order,
+			"projects":                projects,
+			"project_config":          project_config,
 		})
 	}
 

controllers/schedule_api_controller.go

@@ -1980,7 +1980,9 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 	week_time, _ := this.GetInt64("week_time")
 	start_time, _ := this.GetInt64("start_time")
 	end_time, _ := this.GetInt64("end_time")
-	zone, _ := this.GetInt64("zone")
+	//zone, _ := this.GetInt64("zone")
+	zons := this.GetString("zone")
+	zone := strings.Split(zons, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
 	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone)
@@ -2299,7 +2301,9 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
-	zone, _ := this.GetInt64("zone")
+	//zone, _ := this.GetInt64("zone")
+	zones := this.GetString("zone")
+	zone := strings.Split(zones, ",")
 	thisTime := time.Now()
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
@@ -2363,7 +2367,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if week_type > 0 {
-		list, err := service.GetWeekDayScheduleById(orgId, targetDay.Unix(), week_time, zone)
+		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

controllers/self_drug_api_congtroller.go

@@ -78,6 +78,7 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getdruginventoryprintlist", &SelfDrugApiController{}, "Get:GetDrugInventoryPrintList")
 	beego.Router("/api/drug/getinventorydetaillist", &SelfDrugApiController{}, "Get:GetDrugInventoryDetailList")
 	beego.Router("/api/drug/savedrugproofinventory", &SelfDrugApiController{}, "Get:SaveDrugProofInventory")
+	beego.Router("/api/drug/getdrugwarehouseinfototal", &StockManagerApiController{}, "Get:GetDrugWarehouseInfoTotal")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -959,7 +960,7 @@ func (this *SelfDrugApiController) PostSearchDrugWarehouseList() {
 }
 
 func (this *SelfDrugApiController) SaveDrugPrice() {
-	fmt.Println("999999999999999999999")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	dataBody := make(map[string]interface{}, 0)
@@ -1020,12 +1021,12 @@ func (this *SelfDrugApiController) SaveDrugPrice() {
 			}
 			manufacturer := items["manufacturer"].(string)
 
-			//if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
-			//  utils.ErrorLog("specification_name")
-			//  this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			//  return
-			//}
-			//specification_name := items["specification_name"].(string)
+			if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+				utils.ErrorLog("specification_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			specification_name := items["specification_name"].(string)
 
 			if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 				utils.ErrorLog("remark")
@@ -1048,13 +1049,6 @@ func (this *SelfDrugApiController) SaveDrugPrice() {
 			}
 			last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
 
-			if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
-				utils.ErrorLog("count")
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-				return
-			}
-			count := int64(items["count"].(float64))
-
 			if items["new_price"] == nil || reflect.TypeOf(items["new_price"]).String() != "string" {
 				utils.ErrorLog("new_price")
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1090,9 +1084,8 @@ func (this *SelfDrugApiController) SaveDrugPrice() {
 
 			drugAdjust := models.XtDrugAdjustPrice{
 				DrugName:          drug_name,
-				SpecificationName: "",
+				SpecificationName: specification_name,
 				WarehousingUnit:   warehousing_unit,
-				Count:             count,
 				LastPrice:         last_price,
 				RetailPrice:       retail_price,
 				NewPrice:          new_price,
@@ -1200,7 +1193,8 @@ func (this *SelfDrugApiController) SaveCheckDrugPrice() {
 	list, _ := service.GetDrugAdjuestPrice(ids)
 	for _, item := range list {
 		drug := models.BaseDrugLib{
-			RetailPrice: item.RetailPrice,
+			RetailPrice: item.NewPrice,
+			LastPrice:   item.NewPrice,
 		}
 		service.UpdateBaseDrugOne(drug, item.DrugId)
 	}
@@ -1222,7 +1216,6 @@ func (this *SelfDrugApiController) SaveDrugDamage() {
 		for _, item := range tableData {
 			items := item.(map[string]interface{})
 			drug_name := items["drug_name"].(string)
-			fmt.Println("durg_nae232333223332232323323223232323", drug_name)
 			if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
 				utils.ErrorLog("drug_name")
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1361,6 +1354,26 @@ func (this *SelfDrugApiController) SaveDrugDamage() {
 			orgId := this.GetAdminUserInfo().CurrentOrgId
 			Creater := this.GetAdminUserInfo().AdminUser.Id
 
+			if items["stock_max_number"] == nil || reflect.TypeOf(items["stock_max_number"]).String() != "float64" {
+				utils.ErrorLog("stock_max_number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			stock_max_number := int64(items["stock_max_number"].(float64))
+
+			if items["stock_min_number"] == nil || reflect.TypeOf(items["stock_min_number"]).String() != "float64" {
+				utils.ErrorLog("stock_min_number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			stock_min_number := int64(items["stock_min_number"].(float64))
+
+			if items["total"] == nil || reflect.TypeOf(items["total"]).String() != "string" {
+				utils.ErrorLog("total")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			total := items["total"].(string)
 			drugDamage := models.XtDrugDamage{
 				DrugName:          drug_name,
 				SpecificationName: specification_name,
@@ -1388,6 +1401,9 @@ func (this *SelfDrugApiController) SaveDrugDamage() {
 				ProductDate:       product_date,
 				WarehousingInfoId: warehousing_info_id,
 				DrugOriginPlace:   drug_origin_place,
+				StockMaxNumber:    stock_max_number,
+				StockMinNumber:    stock_min_number,
+				Total:             total,
 			}
 
 			err := service.CreateDrugDamage(drugDamage)
@@ -1408,7 +1424,7 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 	fmt.Println(err)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	keyword := this.GetString("keyword")
-	fmt.Println("keywoer2r2r32rwrwr", keyword)
+
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	var startTime int64
@@ -1482,6 +1498,29 @@ func (this *SelfDrugApiController) SaveDrugDamagePrice() {
 	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	var manufacturer_id int64
 	var dealer_id int64
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
+
+	total = total + 1
+	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+	number = number + total
+	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+	operation_time := time.Now().Unix()
+	creater := adminUserInfo.AdminUser.Id
+
+	warehouseOut := models.DrugWarehouseOut{
+		WarehouseOutOrderNumber: warehousing_out_order,
+		OperationTime:           operation_time,
+		OrgId:                   adminUserInfo.CurrentOrgId,
+		Creater:                 creater,
+		Ctime:                   ctime,
+		Status:                  1,
+		WarehouseOutTime:        time.Now().Unix(),
+		Type:                    1,
+	}
+	service.AddSigleDrugWarehouseOut(&warehouseOut)
 	for _, item := range list {
 		for _, it := range manufacturerList {
 			if item.Manufacturer == it.ManufacturerName {
@@ -1495,29 +1534,6 @@ func (this *SelfDrugApiController) SaveDrugDamagePrice() {
 			}
 		}
 
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
-
-		total = total + 1
-		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-		number = number + total
-		warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-		operation_time := time.Now().Unix()
-		creater := adminUserInfo.AdminUser.Id
-
-		warehouseOut := models.DrugWarehouseOut{
-			WarehouseOutOrderNumber: warehousing_out_order,
-			OperationTime:           operation_time,
-			OrgId:                   adminUserInfo.CurrentOrgId,
-			Creater:                 creater,
-			Ctime:                   ctime,
-			Status:                  1,
-			WarehouseOutTime:        time.Now().Unix(),
-			Type:                    1,
-		}
-
 		warehouseOutInfo := models.XtDrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
@@ -1563,9 +1579,14 @@ func (this *SelfDrugApiController) SaveDrugDamagePrice() {
 			IsSys:                   0,
 		}
 		service.CreateWareHouseOutInfo(&warehouseOutInfo)
-		service.AddSigleDrugWarehouseOut(&warehouseOut)
 		service.CreateDrugFlowOne(drugflow)
 
+		info, _ := service.GetDrugByWarehouseInfo(item.WarehousingInfoId)
+		//扣减库存
+		warehouseInfo := models.XtDrugWarehouseInfo{
+			StockMaxNumber: info.StockMaxNumber - info.StockMaxNumber,
+		}
+		service.UpdateDrugWarehouseingInfo(item.WarehousingInfoId, warehouseInfo)
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"damage": damage,
@@ -1585,6 +1606,10 @@ func (this *SelfDrugApiController) GetDrugModifyPrice() {
 func (this *SelfDrugApiController) ModifyDrugPrice() {
 
 	drug_name := this.GetString("drug_name")
+	specification_name := this.GetString("specification_name")
+	warehousing_unit := this.GetString("warehousing_unit")
+	manufacturer := this.GetString("manufacturer")
+	number := this.GetString("number")
 	retailPrice := this.GetString("retail_price")
 	retail_price, _ := strconv.ParseFloat(retailPrice, 64)
 	newPrice := this.GetString("new_price")
@@ -1592,12 +1617,18 @@ func (this *SelfDrugApiController) ModifyDrugPrice() {
 	count, _ := this.GetInt64("count")
 	remark := this.GetString("remark")
 	id, _ := this.GetInt64("id")
+	drug_id, _ := this.GetInt64("drug_id")
 	adjustPrice := models.XtDrugAdjustPrice{
-		DrugName:    drug_name,
-		Count:       count,
-		RetailPrice: retail_price,
-		NewPrice:    new_price,
-		Remark:      remark,
+		DrugName:          drug_name,
+		Count:             count,
+		RetailPrice:       retail_price,
+		NewPrice:          new_price,
+		Remark:            remark,
+		SpecificationName: specification_name,
+		WarehousingUnit:   warehousing_unit,
+		Manufacturer:      manufacturer,
+		Number:            number,
+		DrugId:            drug_id,
 	}
 	err := service.ModifyDrugPrice(id, adjustPrice)
 	fmt.Println(err)
@@ -1631,7 +1662,7 @@ func (this *SelfDrugApiController) ModifyDrugDamage() {
 	id, _ := this.GetInt64("id")
 	drug_id, _ := this.GetInt64("drug_id")
 	drug_name := this.GetString("drug_name")
-	//drug_origin_place := this.GetString("drug_origin_place")
+	drug_origin_place := this.GetString("drug_origin_place")
 	lastPrice := this.GetString("last_price")
 	last_price, _ := strconv.ParseFloat(lastPrice, 64)
 	newPrice := this.GetString("new_price")
@@ -1643,7 +1674,9 @@ func (this *SelfDrugApiController) ModifyDrugDamage() {
 	remark := this.GetString("remark")
 	count, _ := this.GetInt64("count")
 	warehousing_unit := this.GetString("warehousing_unit")
-
+	stock_max_number, _ := this.GetInt64("stock_max_number")
+	stock_min_number, _ := this.GetInt64("stock_min_number")
+	warehousing_info_id, _ := this.GetInt64("warehousing_info_id")
 	damage := models.XtDrugDamage{
 		DrugName:          drug_name,
 		SpecificationName: "",
@@ -1657,6 +1690,10 @@ func (this *SelfDrugApiController) ModifyDrugDamage() {
 		Remark:            remark,
 		DrugId:            drug_id,
 		Number:            number,
+		StockMaxNumber:    stock_max_number,
+		StockMinNumber:    stock_min_number,
+		WarehousingInfoId: warehousing_info_id,
+		DrugOriginPlace:   drug_origin_place,
 	}
 	err := service.ModifyDrugDamage(id, damage)
 	fmt.Println(err)
@@ -1969,6 +2006,190 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 	}
 	err = service.UpdateDrugInventory(ids, inventory)
 	fmt.Println(err)
+
+	list, _ := service.GetDrugInventoryListByIds(ids)
+
+	adminUserInfo := this.GetAdminUserInfo()
+	var stock_total int64
+	var proof_count int64
+	var maxNumber int64
+	var minNumber int64
+	for _, item := range list {
+
+		//查询库存信息
+		drug, _ := service.GetDrugDetailByDrugId(item.DrugId)
+
+		//查询库存
+		info, _ := service.GetDrugWareInfoById(item.WarehouseInfoId)
+
+		//获取最晚的库存数量
+		lastInfo, _ := service.GetLastDrugWarehouseInfo(item.DrugId)
+		firstInfo, _ := service.GetFirstDrugWarehouseInfo(item.DrugId)
+		stock_total = info.StockMaxNumber*drug.MinNumber + info.StockMinNumber
+		proof_count = item.StockMaxNumber*drug.MinNumber + item.StockMinNumber
+
+		//判断 如果库存数量 大于盘点库存，则出库
+		if stock_total > proof_count {
+			minNumber = (stock_total - proof_count) % drug.MinNumber
+			maxNumber = (stock_total - proof_count) / drug.MinNumber
+
+			ctime := time.Now().Unix()
+
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
+
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+			operation_time := time.Now().Unix()
+			creater := adminUserInfo.AdminUser.Id
+
+			warehouseOut := models.DrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           operation_time,
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				Creater:                 creater,
+				Ctime:                   ctime,
+				Status:                  1,
+				WarehouseOutTime:        ctime,
+				Type:                    1,
+			}
+
+			warehouseOutInfo := models.DrugWarehouseOutInfo{
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				WarehouseOutId:          warehouseOut.ID,
+				DrugId:                  firstInfo.DrugId,
+				Count:                   maxNumber,
+				Price:                   firstInfo.Price,
+				TotalPrice:              firstInfo.TotalPrice,
+				Status:                  1,
+				Ctime:                   ctime,
+				Remark:                  item.Remark,
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				Type:                    1,
+				Manufacturer:            firstInfo.Manufacturer,
+				Dealer:                  firstInfo.Dealer,
+				RetailPrice:             firstInfo.RetailPrice,
+				RetailTotalPrice:        firstInfo.RetailTotalPrice,
+				CountUnit:               drug.MaxUnit,
+				ExpiryDate:              firstInfo.ExpiryDate,
+				ProductDate:             firstInfo.ProductDate,
+				Number:                  firstInfo.Number,
+				BatchNumber:             firstInfo.BatchNumber,
+				IsSys:                   0,
+				WarehouseInfoId:         firstInfo.ID,
+			}
+
+			drugflow := models.DrugFlow{
+				WarehouseOutId:          warehouseOut.ID,
+				WarehouseOutOrderNumber: warehousing_out_order,
+				DrugId:                  firstInfo.DrugId,
+				Number:                  firstInfo.Number,
+				ProductDate:             firstInfo.ProductDate,
+				ExpireDate:              firstInfo.ExpiryDate,
+				Count:                   maxNumber,
+				Price:                   firstInfo.Price,
+				Status:                  1,
+				Ctime:                   ctime,
+				UserOrgId:               adminUserInfo.CurrentOrgId,
+				Manufacturer:            firstInfo.Manufacturer,
+				Dealer:                  firstInfo.Dealer,
+				BatchNumber:             firstInfo.BatchNumber,
+				MaxUnit:                 drug.MaxUnit,
+				ConsumableType:          2,
+				IsEdit:                  1,
+				Creator:                 adminUserInfo.AdminUser.Id,
+				IsSys:                   0,
+			}
+
+			service.AddSigleDrugWarehouseOut(&warehouseOut)
+			service.CreateDrugWarehouseOutInfo(warehouseOutInfo)
+			service.CreateDrugFlowOne(drugflow)
+
+		}
+
+		//判断 如果库存数量 小于于盘点库存，则入库
+		if stock_total < proof_count {
+
+			maxNumber = (proof_count - stock_total) / drug.MinNumber
+			minNumber = (proof_count - stock_total) % drug.MinNumber
+			ctime := time.Now().Unix()
+
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllWarehouseTotalOne(adminUserInfo.CurrentOrgId)
+			total = total + 1
+			fmt.Println("total2323232323232", total)
+			warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			operation_time := time.Now().Unix()
+			creater := adminUserInfo.AdminUser.Id
+			warehousing := models.DrugWarehouse{
+				WarehousingOrder: warehousing_order,
+				OperationTime:    operation_time,
+				OrgId:            adminUserInfo.CurrentOrgId,
+				Creater:          creater,
+				Ctime:            ctime,
+				Status:           1,
+				WarehousingTime:  ctime,
+				Type:             1,
+			}
+
+			warehouseInfo := models.DrugWarehouseInfo{
+				WarehousingOrder: warehousing.WarehousingOrder,
+				WarehousingId:    warehousing.ID,
+				DrugId:           lastInfo.DrugId,
+				Number:           lastInfo.Number,
+				ProductDate:      lastInfo.ProductDate,
+				ExpiryDate:       lastInfo.ExpiryDate,
+				WarehousingCount: lastInfo.WarehousingCount,
+				Price:            lastInfo.Price,
+				TotalPrice:       lastInfo.TotalPrice,
+				Status:           1,
+				Ctime:            ctime,
+				Remark:           item.Remark,
+				OrgId:            adminUserInfo.CurrentOrgId,
+				Type:             1,
+				Manufacturer:     lastInfo.Manufacturer,
+				Dealer:           lastInfo.Dealer,
+				StockMaxNumber:   maxNumber,
+				StockMinNumber:   minNumber,
+				RetailTotalPrice: lastInfo.RetailTotalPrice,
+				BatchNumber:      lastInfo.BatchNumber,
+				MaxUnit:          drug.MaxUnit,
+				MinUnit:          drug.MinUnit,
+			}
+
+			drugflow := models.DrugFlow{
+				WarehousingOrder: warehousing.WarehousingOrder,
+				WarehousingId:    warehousing.ID,
+				DrugId:           lastInfo.DrugId,
+				Number:           lastInfo.Number,
+				ProductDate:      lastInfo.ProductDate,
+				ExpireDate:       lastInfo.ExpiryDate,
+				Count:            maxNumber,
+				Price:            lastInfo.Price,
+				Status:           1,
+				Ctime:            ctime,
+				UserOrgId:        adminUserInfo.CurrentOrgId,
+				Manufacturer:     lastInfo.Manufacturer,
+				Dealer:           lastInfo.Dealer,
+				BatchNumber:      lastInfo.BatchNumber,
+				MaxUnit:          drug.MaxUnit,
+				MinUnit:          drug.MinUnit,
+				ConsumableType:   1,
+				IsEdit:           1,
+				Creator:          adminUserInfo.AdminUser.Id,
+				IsSys:            0,
+			}
+			service.AddSigleDrugWarehouse(&warehousing)
+			service.CreateDrugWarehouseInfo(warehouseInfo)
+			service.CreateDrugFlowOne(drugflow)
+		}
+	}
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
@@ -2006,6 +2227,10 @@ func (this *SelfDrugApiController) ModifyInventory() {
 	last_price, _ := strconv.ParseFloat(lastPrice, 64)
 	count, _ := this.GetInt64("count")
 	drug_origin_place := this.GetString("drug_origin_place")
+
+	stock_max_number, _ := this.GetInt64("stock_max_number")
+	stock_min_number, _ := this.GetInt64("stock_min_number")
+	warehouse_info_id, _ := this.GetInt64("warehouse_info_id")
 	inventory := models.XtDrugInventory{
 		DrugName:          drug_name,
 		SpecificationName: specification_name,
@@ -2020,6 +2245,9 @@ func (this *SelfDrugApiController) ModifyInventory() {
 		Number:            number,
 		Total:             total,
 		DrugOriginPlace:   drug_origin_place,
+		StockMaxNumber:    stock_max_number,
+		StockMinNumber:    stock_min_number,
+		WarehouseInfoId:   warehouse_info_id,
 	}
 	err := service.ModifyDrugInventory(id, inventory)
 	if err != nil {
@@ -2086,19 +2314,19 @@ func (this *SelfDrugApiController) SaveDrugProofInventory() {
 	warehousing_unit := this.GetString("warehousing_unit")
 	remark := this.GetString("remark")
 	//total := this.GetString("total")
-	prof_count, _ := this.GetInt64("prof_count")
-
+	proof_count, _ := this.GetInt64("proof_count")
+	fmt.Println("pof_count2222222", proof_count)
 	inventory := models.XtDrugInventory{
 		WarehouseInfoId: warehouse_info_id,
-		ProofCount:      prof_count,
+		ProofCount:      proof_count,
 		WarehousingUnit: warehousing_unit,
 		Remark:          remark,
 	}
-	err := service.UpdateDrugProofInventory(warehouse_info_id, &inventory)
+	err := service.UpdateDrugProofInventory(id, &inventory)
 	info := models.XtDrugWarehouseInfo{
-		StockMaxNumber: prof_count,
+		StockMaxNumber: proof_count,
 	}
-	service.UpdateDrugWarehouseInfoById(id, &info)
+	service.UpdateDrugWarehouseInfoById(warehouse_info_id, &info)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
@@ -2108,3 +2336,13 @@ func (this *SelfDrugApiController) SaveDrugProofInventory() {
 		"inventory": inventory,
 	})
 }
+
+func (this *StockManagerApiController) GetDrugWarehouseInfoTotal() {
+
+	id, _ := this.GetInt64("id")
+	list, _ := service.GetDrugWarehouseInfoTotal(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/stock_in_api_controller.go

@@ -127,6 +127,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/drug/deletedrugprice", &StockManagerApiController{}, "Get:DeleteDrugPrice")
 	beego.Router("/api/stock/getgoodwarehouselist", &StockManagerApiController{}, "Get:GetGoodWarehouseList")
 	beego.Router("/api/stock/proofinventory", &StockManagerApiController{}, "Get:ProofInventory")
+	beego.Router("/api/stock/getwarehousetotal", &StockManagerApiController{}, "Get:GetWarehouseTotal")
 
 }
 
@@ -1993,7 +1994,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 		}
 
 		//查询该批次入库的值
-		infolist, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
+		infolist, _ := service.GetWarehouseInfoByIdSeven(item.WarehouseInfoId)
 
 		if item.Count > infolist.WarehousingCount {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -4972,9 +4973,11 @@ func (this *StockManagerApiController) SaveCheckPrice() {
 	fmt.Println(err)
 
 	list, _ := service.GetAdjustCheckPriceList(ids)
+	fmt.Println("list2333223323232323232323", list)
 	for _, item := range list {
 		info := models.GoodInfo{
 			PackingPrice: item.NewPrice,
+			BuyPrice:     item.NewPrice,
 		}
 		err = service.UpdateAdjustCheckPrice(&info, item.GoodId)
 		fmt.Println(err)
@@ -5147,6 +5150,20 @@ func (this *StockManagerApiController) SaveReportStock() {
 			product_date := int64(items["product_date"].(float64))
 			orgId := this.GetAdminUserInfo().CurrentOrgId
 			Creater := this.GetAdminUserInfo().AdminUser.Id
+
+			if items["total"] == nil || reflect.TypeOf(items["total"]).String() != "float64" {
+				utils.ErrorLog("total")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			total := int64(items["total"].(float64))
+
+			if items["good_origin_place"] == nil || reflect.TypeOf(items["good_origin_place"]).String() != "string" {
+				utils.ErrorLog("good_origin_place")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			good_origin_place := items["good_origin_place"].(string)
 			reportPrice := models.XtStockReportPrice{
 				GoodName:          good_name,
 				SpecificationName: specification_name,
@@ -5173,6 +5190,8 @@ func (this *StockManagerApiController) SaveReportStock() {
 				WarehousingInfoId: warehousing_info_id,
 				ExpiryDate:        expiry_date,
 				ProductDate:       product_date,
+				Total:             total,
+				GoodOriginPlace:   good_origin_place,
 			}
 			err := service.CreateReportPrice(&reportPrice)
 			fmt.Println(err)
@@ -5277,7 +5296,7 @@ func (this *StockManagerApiController) SaveCheckDamage() {
 		Ctime:                   ctime,
 		Status:                  1,
 		WarehouseOutTime:        ctime,
-		Type:                    2,
+		Type:                    1,
 	}
 
 	_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
@@ -5526,6 +5545,13 @@ func (this *StockManagerApiController) SaveInventory() {
 				return
 			}
 			warehousing_info_id := int64(items["warehousing_info_id"].(float64))
+
+			if items["good_origin_place"] == nil || reflect.TypeOf(items["good_origin_place"]).String() != "string" {
+				utils.ErrorLog("good_origin_place")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			good_origin_place := items["good_origin_place"].(string)
 			orgId := this.GetAdminUserInfo().CurrentOrgId
 			Creater := this.GetAdminUserInfo().AdminUser.Id
 
@@ -5557,6 +5583,7 @@ func (this *StockManagerApiController) SaveInventory() {
 				ProductDate:       product_date,
 				Number:            number,
 				WarehousingInfoId: warehousing_info_id,
+				GoodOriginPlace:   good_origin_place,
 			}
 			err = service.CreateInentory(inventory)
 			fmt.Println(err)
@@ -5635,7 +5662,196 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 		CheckerStatus: 1,
 		CheckerTime:   checkTime,
 	}
+	adminUserInfo := this.GetAdminUserInfo()
 	err = service.UpdateCheckInventory(ids, inventory)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+	var manufactuer_id int64
+	var dealer_id int64
+	//查询耗材信息
+	list, _ := service.GetInventoryDetailById(ids)
+	for _, item := range list {
+		for _, it := range manufacturerList {
+			if item.Manufacturer == it.ManufacturerName {
+				manufactuer_id = it.ID
+			}
+		}
+
+		for _, its := range dealerList {
+			if item.Dealer == its.DealerName {
+				dealer_id = its.ID
+			}
+		}
+		//查寻该批次的库存量
+		list, _ := service.GetWarehouseInfoById(item.WarehousingInfoId)
+
+		//查询该耗材最后1条批次
+		info, _ := service.GetLastWarehouseInfo(item.GoodId)
+		fmt.Println("总共", item.Count)
+		fmt.Println("数据", list.StockCount)
+		//盘点盘点库存和et实际库存的大小
+		// 如果盘点库存大于实际库存，怎需要入库
+		if item.Count > list.StockCount {
+
+			ctime := time.Now().Unix()
+
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllWarehouseTotal(adminUserInfo.CurrentOrgId)
+			total = total + 1
+			warehousing_order := "RKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+			operation_time := time.Now().Unix()
+			creater := adminUserInfo.AdminUser.Id
+			warehousing := models.Warehousing{
+				WarehousingOrder: warehousing_order,
+				OperationTime:    operation_time,
+				OrgId:            adminUserInfo.CurrentOrgId,
+				Creater:          creater,
+				Ctime:            ctime,
+				Status:           1,
+				WarehousingTime:  ctime,
+				Type:             1,
+			}
+			service.AddSigleWarehouse(&warehousing)
+
+			//获取最
+			//入库单表格
+			warehouseInfo := models.WarehousingInfo{
+				WarehousingOrder: warehousing.WarehousingOrder,
+				WarehousingId:    warehousing.ID,
+				GoodId:           item.GoodId,
+				Number:           info.Number,
+				ProductDate:      info.ProductDate,
+				ExpiryDate:       info.ExpiryDate,
+				WarehousingCount: item.Count - list.StockCount,
+				Price:            info.Price,
+				Status:           1,
+				Ctime:            ctime,
+				Remark:           item.Remark,
+				OrgId:            adminUserInfo.CurrentOrgId,
+				Type:             1,
+				Manufacturer:     manufactuer_id,
+				StockCount:       item.Count - list.StockCount,
+				Dealer:           dealer_id,
+				LicenseNumber:    info.LicenseNumber,
+			}
+
+			flow := models.VmStockFlow{
+				WarehousingOrder:    warehousing.WarehousingOrder,
+				WarehousingId:       warehousing.ID,
+				GoodId:              item.GoodId,
+				Number:              info.Number,
+				ProductDate:         info.ProductDate,
+				ExpireDate:          info.ExpiryDate,
+				Count:               item.Count - list.StockCount,
+				Price:               item.BuyPrice,
+				Status:              1,
+				Ctime:               ctime,
+				UserOrgId:           adminUserInfo.CurrentOrgId,
+				Manufacturer:        info.Manufacturer,
+				Dealer:              info.Dealer,
+				LicenseNumber:       info.LicenseNumber,
+				IsEdit:              1,
+				Creator:             adminUserInfo.AdminUser.Id,
+				SystemTime:          operation_time,
+				ConsumableType:      1,
+				WarehousingDetailId: warehouseInfo.ID,
+			}
+
+			service.CreateWarehouseInfo(warehouseInfo)
+			service.CreateStockFlowOne(flow)
+		}
+
+		//如果盘点库存小于实际库存，需要出库
+		if item.Count < list.StockCount {
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+			operation_time := time.Now().Unix()
+			creater := adminUserInfo.AdminUser.Id
+
+			//查询最早的1条批次
+			warehouseInfo, _ := service.GetFirstWarehouseInfo(item.GoodId)
+			warehouseOut := models.WarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           operation_time,
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				Creater:                 creater,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        time.Now().Unix(),
+				Type:                    1,
+			}
+			err = service.CreateWarehouseOut(warehouseOut)
+			fmt.Println(err)
+			warehouseOutInfo := &models.WarehouseOutInfo{
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				WarehouseOutId:          warehouseOut.ID,
+				GoodId:                  warehouseInfo.GoodId,
+				Count:                   list.StockCount - item.Count,
+				Price:                   warehouseInfo.Price,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Remark:                  item.Remark,
+				OrgId:                   adminUserInfo.CurrentOrgId,
+				Type:                    1,
+				Manufacturer:            manufactuer_id,
+				Number:                  warehouseInfo.Number,
+				ExpiryDate:              warehouseInfo.ExpiryDate,
+				ProductDate:             warehouseInfo.ProductDate,
+				Dealer:                  dealer_id,
+				LicenseNumber:           warehouseInfo.LicenseNumber,
+			}
+
+			stockFlow := models.VmStockFlow{
+				WarehousingId:           item.WarehousingInfoId,
+				GoodId:                  warehouseInfo.GoodId,
+				Number:                  warehouseInfo.Number,
+				LicenseNumber:           warehouseInfo.LicenseNumber,
+				Count:                   list.StockCount - item.Count,
+				UserOrgId:               warehouseInfo.OrgId,
+				PatientId:               0,
+				SystemTime:              0,
+				ConsumableType:          2,
+				IsSys:                   2,
+				WarehousingOrder:        "",
+				WarehouseOutId:          warehouseOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsEdit:                  1,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            manufactuer_id,
+				Dealer:                  dealer_id,
+				Creator:                 adminUserInfo.AdminUser.Id,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouseInfo.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    warehouseOutInfo.ID,
+				CancelOutDetailId:       0,
+				ProductDate:             warehouseInfo.ProductDate,
+				ExpireDate:              warehouseInfo.ExpiryDate,
+			}
+			errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+			fmt.Println(errOne)
+			//创建出库明细
+			service.CreateStockFlowOne(stockFlow)
+
+			//更改库存
+			warehousingInfos := models.WarehousingInfo{
+				StockCount: item.Count,
+			}
+			service.UpdateStockOut(item.WarehousingInfoId, warehousingInfos)
+		}
+	}
 	fmt.Println(err)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"inventory": inventory,
@@ -5645,6 +5861,7 @@ func (this *StockManagerApiController) SaveCheckInventory() {
 func (this *StockManagerApiController) GetModifyPriceDetail() {
 
 	id, _ := this.GetInt64("id")
+
 	detail, _ := service.GetModifyPriceDetail(id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"detail": detail,
@@ -5661,12 +5878,16 @@ func (this *StockManagerApiController) UpdateStockPrice() {
 	packing_price, _ := strconv.ParseFloat(packingPrice, 64)
 	remark := this.GetString("remark")
 	good_id, _ := this.GetInt64("good_id")
+	manufacturer := this.GetString("manufacturer")
+	dealer := this.GetString("dealer")
 	adjust := models.XtStockAdjustPrice{
 		NewPrice:     new_price,
 		GoodName:     good_name,
 		PackingPrice: packing_price,
 		Remark:       remark,
 		GoodId:       good_id,
+		Manufacturer: manufacturer,
+		Dealer:       dealer,
 	}
 	err := service.UpdateStockPrice(adjust, id)
 	fmt.Println(err)
@@ -5700,8 +5921,36 @@ func (this *StockManagerApiController) ModifyPrice() {
 
 	count, _ := this.GetInt64("count")
 	id, _ := this.GetInt64("id")
+	good_name := this.GetString("good_name")
+	specification_name := this.GetString("specification_name")
+	number := this.GetString("number")
+	warehousing_unit := this.GetString("warehousing_unit")
+	buyPrice := this.GetString("buy_price")
+	buy_price, _ := strconv.ParseFloat(buyPrice, 64)
+	packingPrice := this.GetString("packing_price")
+	packing_price, _ := strconv.ParseFloat(packingPrice, 64)
+	good_origin_place := this.GetString("good_origin_place")
+	manufacturer := this.GetString("manufacturer")
+	dealer := this.GetString("dealer")
+	total, _ := this.GetInt64("total")
+	remark := this.GetString("remark")
+	warehousing_info_id, _ := this.GetInt64("warehousing_info_id")
+	good_id, _ := this.GetInt64("good_id")
 	adjust := models.XtStockReportPrice{
-		Count: count,
+		Count:             count,
+		SpecificationName: specification_name,
+		Number:            number,
+		GoodName:          good_name,
+		WarehousingUnit:   warehousing_unit,
+		BuyPrice:          buy_price,
+		PackingPrice:      packing_price,
+		GoodOriginPlace:   good_origin_place,
+		Manufacturer:      manufacturer,
+		Dealer:            dealer,
+		Total:             total,
+		Remark:            remark,
+		WarehousingInfoId: warehousing_info_id,
+		GoodId:            good_id,
 	}
 	err := service.ModifyPrice(id, adjust)
 	fmt.Println(err)
@@ -5742,11 +5991,37 @@ func (this *StockManagerApiController) GetInventoryDetail() {
 
 func (this *StockManagerApiController) ModifyInventory() {
 	id, _ := this.GetInt64("id")
+	good_id, _ := this.GetInt64("good_id")
+	good_name := this.GetString("good_name")
+	specification_name := this.GetString("specification_name")
+	number := this.GetString("number")
+	warehousing_unit := this.GetString("warehousing_unit")
+	buyPrice := this.GetString("buy_price")
+	buy_price, _ := strconv.ParseFloat(buyPrice, 64)
+	packingPrice := this.GetString("packing_price")
+	packing_price, _ := strconv.ParseFloat(packingPrice, 64)
+	total, _ := this.GetInt64("total")
+	good_origin_place := this.GetString("good_origin_place")
+	license_number := this.GetString("license_number")
+	dealer := this.GetString("dealer")
+	manufacturer := this.GetString("manufacturer")
 	count, _ := this.GetInt64("count")
 	remark := this.GetString("remark")
 	inventory := models.XtStockInventory{
-		Count:  count,
-		Remark: remark,
+		GoodId:            good_id,
+		GoodName:          good_name,
+		SpecificationName: specification_name,
+		Number:            number,
+		WarehousingUnit:   warehousing_unit,
+		BuyPrice:          buy_price,
+		PackingPrice:      packing_price,
+		Total:             total,
+		GoodOriginPlace:   good_origin_place,
+		LicenseNumber:     license_number,
+		Dealer:            dealer,
+		Manufacturer:      manufacturer,
+		Count:             count,
+		Remark:            remark,
 	}
 	err := service.ModifyInventory(id, inventory)
 	fmt.Println(err)
@@ -5852,3 +6127,12 @@ func (this *StockManagerApiController) ProofInventory() {
 		"list": info,
 	})
 }
+
+func (this *StockManagerApiController) GetWarehouseTotal() {
+
+	id, _ := this.GetInt64("id")
+	list, _ := service.GetWarehouseTotal(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/self_drug_models.go

@@ -756,6 +756,9 @@ type XtDrugDamage struct {
 	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	BatchNumber       string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	StockMaxNumber    int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber    int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	Total             string  `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (XtDrugDamage) TableName() string {
@@ -794,6 +797,8 @@ type XtDrugInventory struct {
 	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 	WarehouseInfoId   int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 	ProofCount        int64   `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
+	StockMaxNumber    int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber    int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
 }
 
 func (XtDrugInventory) TableName() string {
@@ -829,6 +834,6 @@ type VmDrugInventory struct {
 	DoseUnit          string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	MaxUnit           string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinUnit           string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Total             int64   `gorm:"column:total" json:"total" form:"total"`
+	Total             string  `gorm:"column:total" json:"total" form:"total"`
 	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 }

models/stock_models.go

@@ -947,6 +947,8 @@ type XtStockReportPrice struct {
 	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
 	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Total             int64   `gorm:"column:total" json:"total" form:"total"`
+	GoodOriginPlace   string  `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
 }
 
 func (XtStockReportPrice) TableName() string {
@@ -982,6 +984,7 @@ type XtStockInventory struct {
 	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	ExpireDate        int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
 	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	GoodOriginPlace   string  `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
 }
 
 func (XtStockInventory) TableName() string {

service/dialysis_service.go

@@ -1230,6 +1230,6 @@ func SaveHisProject(advice *models.HisPrescriptionProject) (err error) {
 }
 
 func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (advice []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }

service/gobal_config_service.go

@@ -552,7 +552,32 @@ func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcatego
 		db = db.Where("drug_name like ?", likeKey)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Preload("DrugWarehouseInfo", "status=1 and org_id = ? and ctime >=? and ctime<=?", orgid, startime, endtime).Preload("DrugCancelStockInfo", "status=1 and org_id = ? and ctime >=? and ctime<=?", orgid, startime, endtime).Preload("DrugWarehouseOutInfo", "status=1 and org_id = ? and ctime >=? and ctime<=?", orgid, startime, endtime).Find(&drug).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("DrugCancelStockInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("DrugWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Find(&drug).Error
+
 	return drug, total, err
 }
 

service/patientmanage_service.go

@@ -1668,7 +1668,7 @@ func GetInspectionItemlist(patientid int64, inspect_date []string, projectid []s
 	table := XTReadDB().Table("xt_inspection_reference as s").Where("s.status = 1")
 	fmt.Println(table)
 	if patientid > 0 {
-		db = db.Where("x.patient_id = ?", patientid)
+		db = db.Where("x.patient_id = ? and x.inspect_value <> ''", patientid)
 	}
 	if len(inspect_date) > 0 {
 		db = db.Where("x.inspect_date in(?)", inspect_date)

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -210,6 +210,7 @@ type PrescriptionVM struct {
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	MaxUltrafiltrationRate     float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 }
 
 func (PrescriptionVM) TableName() string {
@@ -354,6 +355,7 @@ type AssessmentAfterDislysisVM struct {
 	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`
 	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
 	SealingFluidSpecial             string  `gorm:"column:sealing_fluid_special" json:"sealing_fluid_special" form:"sealing_fluid_special"`
+	MachineRun                      string  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
 }
 
 func (AssessmentAfterDislysisVM) TableName() string {
@@ -525,6 +527,11 @@ type MonitoringRecordVM struct {
 	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
 	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
 	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	AccumulatedBloodVolume    float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	BloodTemperature          float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
+	UreaMonitoring            float64 `gorm:"column:urea_monitoring" json:"urea_monitoring" form:"urea_monitoring"`
+	BloodThickness            float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
+	BloodMonitor              float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/schedule_service.go

@@ -589,7 +589,32 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 	return list, err
 }
 
-func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone int64) (list []*models.VmSchedulesRemind, err error) {
+func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if scheduleDate > 0 {
+		db = db.Where("x.schedule_date = ?", scheduleDate)
+	}
+	if scheduleType > 0 {
+		db = db.Where("x.schedule_type = ?", scheduleType)
+	}
+	if len(zone) > 0 {
+		db = db.Where("x.partition_id in (?)", zone)
+	}
+
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Order("id asc")
+	}).Find(&list).Error
+
+	return list, err
+}
+
+func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
@@ -601,8 +626,8 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 	if scheduleType > 0 {
 		db = db.Where("x.schedule_type = ?", scheduleType)
 	}
-	if zone > 0 {
-		db = db.Where("x.partition_id = ?", zone)
+	if len(zone) > 0 {
+		db = db.Where("x.partition_id in (?)", zone)
 	}
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
@@ -758,7 +783,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 	return
 }
 
-func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone int64) (schedules []*models.WeekSchedule, err error) {
+func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string) (schedules []*models.WeekSchedule, err error) {
 
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
@@ -776,8 +801,8 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	if weektype > 0 {
 		db = db.Where("s.schedule_week = ?", weektype)
 	}
-	if zone > 0 {
-		db = db.Where("s.partition_id = ?", zone)
+	if len(zone) > 0 {
+		db = db.Where("s.partition_id in (?)", zone)
 	}
 	err = db.
 		Preload("DeviceZone", "status = 1 ").

service/self_drug_service.go

@@ -817,7 +817,7 @@ func PostSearchDrugWarehouseList(keyword string, orgid int64) (info []*models.Bl
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_origin_place,t.drug_name,t.min_unit,x.manufacturer,t.retail_price,t.max_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.drug_origin_place").Joins("left join xt_base_drug as t on t.id = x.drug_id").Where("t.drug_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
+	err = db.Group("x.drug_id").Select("x.id,x.warehousing_id,x.drug_id,t.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_origin_place,t.drug_name,t.min_unit,x.manufacturer,t.retail_price,t.max_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.drug_origin_place").Joins("left join xt_base_drug as t on t.id = x.drug_id").Where("t.drug_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
 	return info, err
 
 }
@@ -889,20 +889,23 @@ func CreateDrugDamage(damage models.XtDrugDamage) error {
 func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.XtDrugDamage, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Model(&adjust).Where("status = 1")
-	if startime > 0 {
-		db = db.Where("ctime >=?", startime)
-	}
-	if endtime > 0 {
-		db = db.Where("ctime<=?", endtime)
+	db := XTReadDB().Table("xt_drug_damage as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+	if len(keyword) > 0 {
+		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
 	}
 	if orgId > 0 {
-		db = db.Where("user_org_id = ?", orgId)
+		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	if len(keyword) > 0 {
-		db = db.Where("warehousing_order like ?", likeKey)
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&adjust).Error
+	if endtime > 0 {
+		db = db.Where("x.ctime <=?", endtime)
+	}
+	err = db.Group("x.id").Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.number,x.drug_origin_place,x.warehousing_info_id,x.batch_number,x.stock_max_number,x.stock_min_number").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
 	return adjust, total, err
 }
 
@@ -920,7 +923,7 @@ func GetDrugModifyPrice(id int64) (models.XtDrugAdjustPrice, error) {
 
 func ModifyDrugPrice(id int64, adjust models.XtDrugAdjustPrice) error {
 
-	err := XTWriteDB().Model(&adjust).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": adjust.DrugName, "retail_price": adjust.RetailPrice, "new_price": adjust.NewPrice, "count": adjust.Count, "remark": adjust.Remark}).Error
+	err := XTWriteDB().Model(&adjust).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": adjust.DrugName, "retail_price": adjust.RetailPrice, "new_price": adjust.NewPrice, "count": adjust.Count, "remark": adjust.Remark, "specification_name": adjust.SpecificationName, "warehousing_unit": adjust.WarehousingUnit, "manufacturer": adjust.Manufacturer, "number": adjust.Number, "drug_id": adjust.DrugId}).Error
 	return err
 }
 
@@ -939,7 +942,7 @@ func GetDrugDamageDetail(id int64) (models.XtDrugDamage, error) {
 
 func ModifyDrugDamage(id int64, damage models.XtDrugDamage) error {
 
-	err := XTWriteDB().Model(&damage).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": damage.DrugName, "warehousing_unit": damage.WarehousingUnit, "count": damage.Count, "last_price": damage.LastPrice, "retail_price": damage.RetailPrice, "new_price": damage.NewPrice, "manufacturer": damage.Manufacturer, "remark": damage.Remark, "number": damage.Number, "drug_id": damage.DrugId}).Error
+	err := XTWriteDB().Model(&damage).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": damage.DrugName, "warehousing_unit": damage.WarehousingUnit, "count": damage.Count, "last_price": damage.LastPrice, "retail_price": damage.RetailPrice, "new_price": damage.NewPrice, "manufacturer": damage.Manufacturer, "remark": damage.Remark, "number": damage.Number, "drug_id": damage.DrugId, "stock_max_number": damage.StockMaxNumber, "stock_min_number": damage.StockMinNumber, "warehousing_info_id": damage.WarehousingInfoId, "drug_origin_place": damage.DrugOriginPlace}).Error
 	return err
 }
 
@@ -997,6 +1000,39 @@ func UpdateDrugInventory(ids []string, inventory models.XtDrugInventory) error {
 	return err
 }
 
+func GetDrugInventoryListByIds(ids []string) (inventory []*models.XtDrugInventory, err error) {
+
+	err = XTReadDB().Model(&inventory).Where("id in(?) and status = 1", ids).Find(&inventory).Error
+	return inventory, err
+}
+
+func GetDrugDetailByDrugId(drug_id int64) (models.XtBaseDrug, error) {
+
+	drug := models.XtBaseDrug{}
+	err := XTReadDB().Model(&drug).Where("id = ? and status = 1", drug_id).Find(&drug).Error
+	return drug, err
+}
+
+func GetDrugWareInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func GetLastDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("id=? and status = 1", drugid).Last(&info).Error
+	return info, err
+}
+
+func GetFirstDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("id=? and status = 1", drugid).First(&info).Error
+	return info, err
+}
+
 func GetDrugInventoryDetail(id int64) (models.XtDrugInventory, error) {
 
 	inventory := models.XtDrugInventory{}
@@ -1006,7 +1042,7 @@ func GetDrugInventoryDetail(id int64) (models.XtDrugInventory, error) {
 
 func ModifyDrugInventory(id int64, info models.XtDrugInventory) error {
 
-	err := XTWriteDB().Model(&info).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": info.DrugName, "specification_name": info.SpecificationName, "warehousing_unit": info.WarehousingUnit, "count": info.Count, "last_price": info.LastPrice, "manufacturer": info.Manufacturer, "remark": info.Remark, "drug_id": info.DrugId, "warehousing_order": info.WarehousingOrder, "number": info.Number, "total": info.Number, "drug_origin_place": info.DrugOriginPlace}).Error
+	err := XTWriteDB().Model(&info).Where("id=? and status = 1", id).Updates(map[string]interface{}{"drug_name": info.DrugName, "specification_name": info.SpecificationName, "warehousing_unit": info.WarehousingUnit, "count": info.Count, "last_price": info.LastPrice, "manufacturer": info.Manufacturer, "remark": info.Remark, "drug_id": info.DrugId, "warehousing_order": info.WarehousingOrder, "number": info.Number, "total": info.Number, "drug_origin_place": info.DrugOriginPlace, "stock_max_number": info.StockMaxNumber, "stock_min_number": info.StockMinNumber, "warehouse_info_id": info.WarehouseInfoId}).Error
 	return err
 }
 
@@ -1051,3 +1087,22 @@ func UpdateDrugWarehouseInfoById(id int64, inventory *models.XtDrugWarehouseInfo
 	err := XTWriteDB().Model(&inventory).Where("id = ?", id).Updates(map[string]interface{}{"stock_max_number": inventory.StockMaxNumber}).Error
 	return err
 }
+
+func GetDrugWarehouseInfoTotal(id int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Preload("XtBaseDrug", "status = 1").Find(&info).Error
+	return info, err
+}
+
+func CreateDrugWarehouseInfo(info models.DrugWarehouseInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func CreateDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}

service/stock_service.go

@@ -508,7 +508,7 @@ func UpdateBaseDrug(lib *models.BaseDrugLib, id int64) error {
 
 func UpdateBaseDrugOne(lib models.BaseDrugLib, id int64) error {
 
-	err := XTWriteDB().Model(&lib).Where("id = ?", id).Updates(map[string]interface{}{"retail_price": lib.RetailPrice}).Error
+	err := XTWriteDB().Model(&lib).Where("id = ?", id).Updates(map[string]interface{}{"retail_price": lib.RetailPrice, "last_price": lib.LastPrice}).Error
 	return err
 }
 func FindeLastWarehouseInfo(id int64) (models.DrugWarehouseInfo, error) {
@@ -571,6 +571,20 @@ func CreateDrugFlow(drugflow []*models.DrugFlow) (err error) {
 	return
 }
 
+func GetDrugByWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdateDrugWarehouseingInfo(id int64, info models.XtDrugWarehouseInfo) error {
+
+	warehouseInfo := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
+	return err
+}
+
 func CreateDrugFlowOne(flow models.DrugFlow) error {
 
 	err := XTWriteDB().Create(&flow).Error
@@ -2542,6 +2556,12 @@ func AddSigleWarehouseOutInfo(info *models.WarehouseOutInfo) error {
 
 }
 
+func UpdateStockOut(warehouseinfoid int64, info models.WarehousingInfo) error {
+
+	err := XTWriteDB().Model(&info).Where("id=? and status = 1", warehouseinfoid).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
+	return err
+}
+
 func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
 	ut := writeDb.Begin()
 	err := ut.Create(&info).Error
@@ -3208,7 +3228,23 @@ func GetAllGoodInfoStockList(page int64, limit int64, startime int64, endtime in
 		db = db.Where("x.good_type_id = ?", good_type)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Preload("StWarehousingInfo", "status= 1 and org_id =? and ctime>=? and ctime<=?", orgid, startime, endtime).Preload("CancelStockInfo", "status= 1 and org_id =? and ctime>=? and ctime<=?", orgid, startime, endtime).Find(&info).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("CancelStockInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Find(&info).Error
 	return info, total, err
 }
 
@@ -3299,18 +3335,20 @@ func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*
 
 func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
-	if startime > 0 {
-		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime).Scan(&autoMatic).Error
-	} else {
-		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
-	}
+	//if startime > 0 {
+	//	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime).Scan(&autoMatic).Error
+	//} else {
+	//	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
+	//}
 
-	if endtime > 0 {
-		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, endtime).Scan(&autoMatic).Error
+	if startime > 0 || endtime > 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
 	} else {
 		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
 	}
 
+	//err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+
 	return autoMatic, err
 
 }
@@ -4223,13 +4261,38 @@ func UpdateWarehouseInfoOne(count int64, drugid int64, orgid int64) error {
 	return err
 }
 
-func GetWarehouseInfoById(id int64) (models.WarehousingInfo, error) {
+func GetWarehouseInfoByIdSeven(id int64) (models.WarehousingInfo, error) {
 
 	info := models.WarehousingInfo{}
 	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
 	return info, err
 }
 
+func GetLastWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1", goodid).Last(&info).Error
+	return info, err
+}
+
+func GetFirstWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1", goodid).First(&info).Error
+	return info, err
+}
+
+func CreateWarehouseOut(out models.WarehouseOut) error {
+
+	err := XTWriteDB().Create(&out).Error
+	return err
+}
+
+func CreateWarehouseInfo(info models.WarehousingInfo) error {
+
+	err := XTReadDB().Create(&info).Error
+	return err
+}
+
 func UpdateGoodWarehouseInfo(id int64, info models.WarehousingInfo) error {
 
 	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
@@ -4311,7 +4374,7 @@ func GetSearchGoodWarehouseList(keyword string, orgid int64) (info []*models.Blo
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehousing_unit,x.stock_count,x.license_number,x.warehousing_unit,t.good_name,t.specification_name,x.manufacturer,t.packing_price,t.id as good_id,t.packing_unit,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Where("t.good_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
+	err = db.Group("x.good_id").Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,t.dealer,x.remark,x.warehousing_order,x.warehousing_unit,x.stock_count,x.license_number,x.warehousing_unit,t.good_name,t.specification_name,t.manufacturer,t.packing_price,t.id as good_id,t.packing_unit,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Where("t.good_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
 	return info, err
 }
 
@@ -4332,7 +4395,7 @@ func GetAllStockPrice(orgid int64, startime int64, endtime int64, keyword string
 		db = db.Where("x.start_time>=?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("x.end_time<=?", endtime)
+		db = db.Where("x.start_time<=?", endtime)
 	}
 	if len(keyword) > 0 {
 		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
@@ -4352,7 +4415,7 @@ func UpdateAdjustPrice(ids []string, info models.XtStockAdjustPrice) error {
 
 func UpdateAdjustCheckPrice(info *models.GoodInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"packing_price": info.PackingPrice}).Error
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"packing_price": info.PackingPrice, "buy_price": info.BuyPrice}).Error
 	return err
 }
 
@@ -4382,10 +4445,10 @@ func GetReportStockList(startime int64, endtime int64, orgid int64, keyword stri
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
 	if startime > 0 {
-		db = db.Where("x.start_time>=?", startime)
+		db = db.Where("x.ctime>=?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("x.end_time<=?", endtime)
+		db = db.Where("x.ctime<=?", endtime)
 	}
 	if len(keyword) > 0 {
 		db = db.Where("x.warehousing_order like ? or r.user_name like ?", likeKey, likeKey)
@@ -4430,11 +4493,9 @@ func GetInventorylist(startime int64, endtime int64, page int64, limit int64, in
 		db = db.Where("x.end_time<=?", endtime)
 	}
 	if len(keyword) > 0 {
-		db = db.Where("x.warehousing_order like ?", likeKey)
-	}
-	if len(keyword) > 0 {
-		db = db.Where("r.user_name like ?", likeKey)
+		db = db.Where("x.warehousing_order like ? or r.user_name like ?", likeKey, likeKey)
 	}
+
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -4457,9 +4518,22 @@ func GetModifyPriceDetail(id int64) (models.XtStockAdjustPrice, error) {
 	return info, err
 }
 
+func GetInventoryDetailById(id []string) (list []*models.XtStockInventory, err error) {
+
+	err = XTReadDB().Model(&list).Where("id in(?) and status = 1", id).Find(&list).Error
+	return list, err
+}
+
+func GetWarehouseInfoById(id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
 func UpdateStockPrice(info models.XtStockAdjustPrice, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"new_price": info.NewPrice, "good_name": info.GoodName, "packing_price": info.PackingPrice, "good_id": info.GoodId, "remark": info.Remark}).Error
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"new_price": info.NewPrice, "good_name": info.GoodName, "packing_price": info.PackingPrice, "good_id": info.GoodId, "remark": info.Remark, "manufacturer": info.Manufacturer, "dealer": info.Dealer}).Error
 	return err
 }
 
@@ -4477,7 +4551,7 @@ func GetStockDamageDetail(id int64) (models.XtStockReportPrice, error) {
 
 func ModifyPrice(id int64, info models.XtStockReportPrice) error {
 
-	err := XTWriteDB().Model(&info).Where("id = ?", id).Updates(map[string]interface{}{"count": info.Count}).Error
+	err := XTWriteDB().Model(&info).Where("id = ?", id).Updates(map[string]interface{}{"count": info.Count, "specification_name": info.SpecificationName, "good_name": info.GoodName, "number": info.Number, "warehousing_unit": info.WarehousingUnit, "buy_price": info.BuyPrice, "packing_price": info.PackingPrice, "good_origin_place": info.GoodOriginPlace, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "total": info.Total, "remark": info.Remark, "warehousing_info_id": info.WarehousingInfoId, "good_id": info.GoodId}).Error
 	return err
 }
 
@@ -4502,7 +4576,7 @@ func GetInventoryDetail(id int64) (models.XtStockInventory, error) {
 
 func ModifyInventory(id int64, inventory models.XtStockInventory) error {
 
-	err := XTWriteDB().Model(&inventory).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": inventory.Count, "remark": inventory.Remark}).Error
+	err := XTWriteDB().Model(&inventory).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"good_id": inventory.GoodId, "good_name": inventory.GoodName, "specification_name": inventory.SpecificationName, "number": inventory.Number, "warehousing_unit": inventory.WarehousingUnit, "buy_price": inventory.BuyPrice, "packing_price": inventory.PackingPrice, "total": inventory.Total, "good_origin_place": inventory.GoodOriginPlace, "license_number": inventory.LicenseNumber, "dealer": inventory.Dealer, "manufacturer": inventory.Dealer, "count": inventory.Count, "remark": inventory.Remark}).Error
 	return err
 }
 
@@ -4578,3 +4652,9 @@ func CeateStockCorrectRecord(record models.XtStockCorrectRecord) error {
 	err := XTWriteDB().Create(&record).Error
 	return err
 }
+
+func GetWarehouseTotal(id int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
+	return info, err
+}