耗材参数

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/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

@@ -1047,13 +1047,13 @@ func (this *SelfDrugApiController) SaveDrugPrice() {
 				return
 			}
 			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["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")
@@ -1092,7 +1092,6 @@ func (this *SelfDrugApiController) SaveDrugPrice() {
 				DrugName:          drug_name,
 				SpecificationName: "",
 				WarehousingUnit:   warehousing_unit,
-				Count:             count,
 				LastPrice:         last_price,
 				RetailPrice:       retail_price,
 				NewPrice:          new_price,
@@ -1482,6 +1481,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 +1517,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,7 +1562,6 @@ func (this *SelfDrugApiController) SaveDrugDamagePrice() {
 			IsSys:                   0,
 		}
 		service.CreateWareHouseOutInfo(&warehouseOutInfo)
-		service.AddSigleDrugWarehouseOut(&warehouseOut)
 		service.CreateDrugFlowOne(drugflow)
 
 	}
@@ -2086,19 +2084,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

controllers/stock_in_api_controller.go

@@ -5147,6 +5147,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 +5187,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 +5293,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 +5542,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 +5580,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)
@@ -5645,6 +5669,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 +5686,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 +5729,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 +5799,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)

models/self_drug_models.go

@@ -829,6 +829,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/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/stock_service.go

@@ -4311,7 +4311,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 +4332,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)
@@ -4382,10 +4382,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)
@@ -4459,7 +4459,7 @@ func GetModifyPriceDetail(id int64) (models.XtStockAdjustPrice, error) {
 
 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 +4477,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 +4502,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
 }