耗材参数

controllers/base_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -70,36 +69,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 9675
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9675
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 9675
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 9675
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -316,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 9675
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9675
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 9675
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 9675
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/gobal_config_api_controller.go

@@ -1969,13 +1969,15 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
 	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, page, limit)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"detail": detail,
-		"total":  total,
+		"detail":           detail,
+		"total":            total,
+		"manufacturerList": manufacturerList,
 	})
 }
 

controllers/public_api_controller.go

@@ -1777,258 +1777,258 @@ func (c *PublicApiController) Handle10215() {
 	//service.GetAllInfo(10215,2284)
 	//service.GetAllInfo(10215,2277)
 
-	his, _ := service.GetAllPT(10215)
-	for _, item := range his {
-
-		info := &models.HisPrescriptionInfoTemplate{
-			UserOrgId:   item.UserOrgId,
-			RecordDate:  0,
-			PatientId:   item.PatientId,
-			Status:      1,
-			Ctime:       time.Now().Unix(),
-			Mtime:       time.Now().Unix(),
-			Type:        2,
-			Creator:     0,
-			Modifier:    0,
-			PType:       0,
-			PTemplateId: item.ID,
-			MedType:     "14",
-		}
-		service.CreateHisPrescriptionInfoTemplate(info)
-
-		pro := &models.HisPrescriptionProjectTemplate{
-			ProjectId:          1750,
-			Price:              6.00,
-			UserOrgId:          10215,
-			Status:             1,
-			Ctime:              time.Now().Unix(),
-			Mtime:              time.Now().Unix(),
-			PatientId:          item.PatientId,
-			RecordDate:         0,
-			Count:              1,
-			FeedetlSn:          "",
-			MedListCodg:        "",
-			SingleDose:         "1",
-			DeliveryWay:        "",
-			ExecutionFrequency: "",
-			Day:                "1",
-			Remark:             "",
-			Unit:               "",
-			Type:               2,
-			PrescriptionId:     info.ID,
-			FrequencyType:      1,
-			DayCount:           0,
-			WeekDay:            "",
-		}
-		service.CreateHisPrescriptionProjectTemplate(pro)
-
-		pro2 := &models.HisPrescriptionProjectTemplate{
-			ProjectId:          2462,
-			Price:              4.94,
-			UserOrgId:          10215,
-			Status:             1,
-			Ctime:              time.Now().Unix(),
-			Mtime:              time.Now().Unix(),
-			PatientId:          item.PatientId,
-			RecordDate:         0,
-			Count:              1,
-			FeedetlSn:          "",
-			MedListCodg:        "",
-			SingleDose:         "1",
-			DeliveryWay:        "",
-			ExecutionFrequency: "",
-			Day:                "1",
-			Remark:             "",
-			Unit:               "",
-			Type:               3,
-			PrescriptionId:     info.ID,
-			FrequencyType:      1,
-			DayCount:           0,
-			WeekDay:            "",
-		}
-		service.CreateHisPrescriptionProjectTemplate(pro2)
-		//
-		//
-		infos, _ := service.GetAllPTInfo(10215, item.ID)
-		//	// fmt.Println(infos)
-		for _, subItem := range infos {
-
-			if len(subItem.HisPrescriptionAdviceTemplate) > 0 && len(subItem.HisPrescriptionProjectTemplate) == 0 {
-
-				for _, ssubItem := range subItem.HisPrescriptionAdviceTemplate {
-
-					if ssubItem.DrugId == 1234 {
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2326,
-							Price:              0.86,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
-
-					}
-					if ssubItem.DrugId == 1288 {
-
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2326,
-							Price:              0.86,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
-
-					}
-					if ssubItem.DrugId == 1306 {
-
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2325,
-							Price:              1.11,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
-
-						pro2 := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          1727,
-							Price:              2.50,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               2,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro2)
-
-					}
-					if ssubItem.DrugId == 1291 {
-
-						pro := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          2322,
-							Price:              0.68,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               3,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro)
-
-						pro2 := &models.HisPrescriptionProjectTemplate{
-							ProjectId:          1727,
-							Price:              2.50,
-							UserOrgId:          ssubItem.UserOrgId,
-							Status:             1,
-							Ctime:              time.Now().Unix(),
-							Mtime:              time.Now().Unix(),
-							PatientId:          ssubItem.PatientId,
-							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
-							FeedetlSn:          "",
-							MedListCodg:        "",
-							SingleDose:         "1",
-							DeliveryWay:        "",
-							ExecutionFrequency: "",
-							Day:                "1",
-							Remark:             "",
-							Unit:               "",
-							Type:               2,
-							PrescriptionId:     info.ID,
-							FrequencyType:      ssubItem.FrequencyType,
-							DayCount:           ssubItem.DayCount,
-							WeekDay:            ssubItem.WeekDay,
-						}
-						service.CreateHisPrescriptionProjectTemplate(pro2)
-					}
-				}
-
-			}
-
-		}
-
-	}
+	//his, _ := service.GetAllPT(10215)
+	//for _, item := range his {
+	//
+	//	info := &models.HisPrescriptionInfoTemplate{
+	//		UserOrgId:   item.UserOrgId,
+	//		RecordDate:  0,
+	//		PatientId:   item.PatientId,
+	//		Status:      1,
+	//		Ctime:       time.Now().Unix(),
+	//		Mtime:       time.Now().Unix(),
+	//		Type:        2,
+	//		Creator:     0,
+	//		Modifier:    0,
+	//		PType:       0,
+	//		PTemplateId: item.ID,
+	//		MedType:     "14",
+	//	}
+	//	service.CreateHisPrescriptionInfoTemplate(info)
+	//
+	//	pro := &models.HisPrescriptionProjectTemplate{
+	//		ProjectId:          1750,
+	//		Price:              6.00,
+	//		UserOrgId:          10215,
+	//		Status:             1,
+	//		Ctime:              time.Now().Unix(),
+	//		Mtime:              time.Now().Unix(),
+	//		PatientId:          item.PatientId,
+	//		RecordDate:         0,
+	//		Count:              1,
+	//		FeedetlSn:          "",
+	//		MedListCodg:        "",
+	//		SingleDose:         "1",
+	//		DeliveryWay:        "",
+	//		ExecutionFrequency: "",
+	//		Day:                "1",
+	//		Remark:             "",
+	//		Unit:               "",
+	//		Type:               2,
+	//		PrescriptionId:     info.ID,
+	//		FrequencyType:      1,
+	//		DayCount:           0,
+	//		WeekDay:            "",
+	//	}
+	//	service.CreateHisPrescriptionProjectTemplate(pro)
+	//
+	//	pro2 := &models.HisPrescriptionProjectTemplate{
+	//		ProjectId:          2462,
+	//		Price:              4.94,
+	//		UserOrgId:          10215,
+	//		Status:             1,
+	//		Ctime:              time.Now().Unix(),
+	//		Mtime:              time.Now().Unix(),
+	//		PatientId:          item.PatientId,
+	//		RecordDate:         0,
+	//		Count:              1,
+	//		FeedetlSn:          "",
+	//		MedListCodg:        "",
+	//		SingleDose:         "1",
+	//		DeliveryWay:        "",
+	//		ExecutionFrequency: "",
+	//		Day:                "1",
+	//		Remark:             "",
+	//		Unit:               "",
+	//		Type:               3,
+	//		PrescriptionId:     info.ID,
+	//		FrequencyType:      1,
+	//		DayCount:           0,
+	//		WeekDay:            "",
+	//	}
+	//	service.CreateHisPrescriptionProjectTemplate(pro2)
+	//	//
+	//	//
+	//	infos, _ := service.GetAllPTInfo(10215, item.ID)
+	//	//	// fmt.Println(infos)
+	//	for _, subItem := range infos {
+	//
+	//		if len(subItem.HisPrescriptionAdviceTemplate) > 0 && len(subItem.HisPrescriptionProjectTemplate) == 0 {
+	//
+	//			for _, ssubItem := range subItem.HisPrescriptionAdviceTemplate {
+	//
+	//				if ssubItem.DrugId == 1234 {
+	//					pro := &models.HisPrescriptionProjectTemplate{
+	//						ProjectId:          2326,
+	//						Price:              0.86,
+	//						UserOrgId:          ssubItem.UserOrgId,
+	//						Status:             1,
+	//						Ctime:              time.Now().Unix(),
+	//						Mtime:              time.Now().Unix(),
+	//						PatientId:          ssubItem.PatientId,
+	//						RecordDate:         ssubItem.AdviceDate,
+	//						Count:              1,
+	//						FeedetlSn:          "",
+	//						MedListCodg:        "",
+	//						SingleDose:         "1",
+	//						DeliveryWay:        "",
+	//						ExecutionFrequency: "",
+	//						Day:                "1",
+	//						Remark:             "",
+	//						Unit:               "",
+	//						Type:               3,
+	//						PrescriptionId:     info.ID,
+	//						FrequencyType:      ssubItem.FrequencyType,
+	//						DayCount:           ssubItem.DayCount,
+	//						WeekDay:            ssubItem.WeekDay,
+	//					}
+	//					service.CreateHisPrescriptionProjectTemplate(pro)
+	//
+	//				}
+	//				if ssubItem.DrugId == 1288 {
+	//
+	//					pro := &models.HisPrescriptionProjectTemplate{
+	//						ProjectId:          2326,
+	//						Price:              0.86,
+	//						UserOrgId:          ssubItem.UserOrgId,
+	//						Status:             1,
+	//						Ctime:              time.Now().Unix(),
+	//						Mtime:              time.Now().Unix(),
+	//						PatientId:          ssubItem.PatientId,
+	//						RecordDate:         ssubItem.AdviceDate,
+	//						Count:              1,
+	//						FeedetlSn:          "",
+	//						MedListCodg:        "",
+	//						SingleDose:         "1",
+	//						DeliveryWay:        "",
+	//						ExecutionFrequency: "",
+	//						Day:                "1",
+	//						Remark:             "",
+	//						Unit:               "",
+	//						Type:               3,
+	//						PrescriptionId:     info.ID,
+	//						FrequencyType:      ssubItem.FrequencyType,
+	//						DayCount:           ssubItem.DayCount,
+	//						WeekDay:            ssubItem.WeekDay,
+	//					}
+	//					service.CreateHisPrescriptionProjectTemplate(pro)
+	//
+	//				}
+	//				if ssubItem.DrugId == 1306 {
+	//
+	//					pro := &models.HisPrescriptionProjectTemplate{
+	//						ProjectId:          2325,
+	//						Price:              1.11,
+	//						UserOrgId:          ssubItem.UserOrgId,
+	//						Status:             1,
+	//						Ctime:              time.Now().Unix(),
+	//						Mtime:              time.Now().Unix(),
+	//						PatientId:          ssubItem.PatientId,
+	//						RecordDate:         ssubItem.AdviceDate,
+	//						Count:              1,
+	//						FeedetlSn:          "",
+	//						MedListCodg:        "",
+	//						SingleDose:         "1",
+	//						DeliveryWay:        "",
+	//						ExecutionFrequency: "",
+	//						Day:                "1",
+	//						Remark:             "",
+	//						Unit:               "",
+	//						Type:               3,
+	//						PrescriptionId:     info.ID,
+	//						FrequencyType:      ssubItem.FrequencyType,
+	//						DayCount:           ssubItem.DayCount,
+	//						WeekDay:            ssubItem.WeekDay,
+	//					}
+	//					service.CreateHisPrescriptionProjectTemplate(pro)
+	//
+	//					pro2 := &models.HisPrescriptionProjectTemplate{
+	//						ProjectId:          1727,
+	//						Price:              2.50,
+	//						UserOrgId:          ssubItem.UserOrgId,
+	//						Status:             1,
+	//						Ctime:              time.Now().Unix(),
+	//						Mtime:              time.Now().Unix(),
+	//						PatientId:          ssubItem.PatientId,
+	//						RecordDate:         ssubItem.AdviceDate,
+	//						Count:              1,
+	//						FeedetlSn:          "",
+	//						MedListCodg:        "",
+	//						SingleDose:         "1",
+	//						DeliveryWay:        "",
+	//						ExecutionFrequency: "",
+	//						Day:                "1",
+	//						Remark:             "",
+	//						Unit:               "",
+	//						Type:               2,
+	//						PrescriptionId:     info.ID,
+	//						FrequencyType:      ssubItem.FrequencyType,
+	//						DayCount:           ssubItem.DayCount,
+	//						WeekDay:            ssubItem.WeekDay,
+	//					}
+	//					service.CreateHisPrescriptionProjectTemplate(pro2)
+	//
+	//				}
+	//				if ssubItem.DrugId == 1291 {
+	//
+	//					pro := &models.HisPrescriptionProjectTemplate{
+	//						ProjectId:          2322,
+	//						Price:              0.68,
+	//						UserOrgId:          ssubItem.UserOrgId,
+	//						Status:             1,
+	//						Ctime:              time.Now().Unix(),
+	//						Mtime:              time.Now().Unix(),
+	//						PatientId:          ssubItem.PatientId,
+	//						RecordDate:         ssubItem.AdviceDate,
+	//						Count:              1,
+	//						FeedetlSn:          "",
+	//						MedListCodg:        "",
+	//						SingleDose:         "1",
+	//						DeliveryWay:        "",
+	//						ExecutionFrequency: "",
+	//						Day:                "1",
+	//						Remark:             "",
+	//						Unit:               "",
+	//						Type:               3,
+	//						PrescriptionId:     info.ID,
+	//						FrequencyType:      ssubItem.FrequencyType,
+	//						DayCount:           ssubItem.DayCount,
+	//						WeekDay:            ssubItem.WeekDay,
+	//					}
+	//					service.CreateHisPrescriptionProjectTemplate(pro)
+	//
+	//					pro2 := &models.HisPrescriptionProjectTemplate{
+	//						ProjectId:          1727,
+	//						Price:              2.50,
+	//						UserOrgId:          ssubItem.UserOrgId,
+	//						Status:             1,
+	//						Ctime:              time.Now().Unix(),
+	//						Mtime:              time.Now().Unix(),
+	//						PatientId:          ssubItem.PatientId,
+	//						RecordDate:         ssubItem.AdviceDate,
+	//						Count:              1,
+	//						FeedetlSn:          "",
+	//						MedListCodg:        "",
+	//						SingleDose:         "1",
+	//						DeliveryWay:        "",
+	//						ExecutionFrequency: "",
+	//						Day:                "1",
+	//						Remark:             "",
+	//						Unit:               "",
+	//						Type:               2,
+	//						PrescriptionId:     info.ID,
+	//						FrequencyType:      ssubItem.FrequencyType,
+	//						DayCount:           ssubItem.DayCount,
+	//						WeekDay:            ssubItem.WeekDay,
+	//					}
+	//					service.CreateHisPrescriptionProjectTemplate(pro2)
+	//				}
+	//			}
+	//
+	//		}
+	//
+	//	}
+	//
+	//}
 
 }

controllers/self_drug_api_congtroller.go

@@ -1452,6 +1452,8 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	list, total, err := service.GetDrugDamageList(startTime, endTime, orgId, keyword, limit, page)
+
+	damagelist, _ := service.GetDrugDamageByOrgId(orgId)
 	doctorList, err := service.GetAllDoctorThree(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
@@ -1461,6 +1463,7 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"total":      total,
 		"list":       list,
+		"damagelist": damagelist,
 		"doctorList": doctorList,
 	})
 }
@@ -2455,6 +2458,8 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 
 			orgId := this.GetAdminUserInfo().CurrentOrgId
 
+			type_id := int64(items["type"].(float64))
+
 			if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "float64" {
 				utils.ErrorLog("expiry_date")
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2463,24 +2468,39 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 			expiry_date := int64(items["expiry_date"].(float64))
 
 			manufacturer := int64(items["manufacturer"].(float64))
-
+			timeLayout := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+			timeNow := time.Now().Format("2006-01-02")
+			locationTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", timeNow+" 00:00:00", loc)
 			var consumable_type int64
+			var consumable_count int64
 			var ord_total int64
 			var new_total int64
 			ord_total = stock_max_number*min_number + stock_min_number
 			new_total = last_stock_max_number*min_number + last_stock_min_number
+
 			if ord_total > new_total {
 				consumable_type = 11
+				consumable_count = ord_total - new_total
 			}
 			if ord_total < new_total {
 				consumable_type = 10
+				consumable_count = new_total - ord_total
+			}
+
+			//改变库存
+			info := models.DrugWarehouseInfo{
+				DrugId:         drug_id,
+				StockMaxNumber: last_stock_max_number,
+				StockMinNumber: last_stock_min_number,
 			}
 
+			err = service.ModifyDrugWarehouseInfo(&info, id)
 			inventory := models.XtDrugInventory{
 				DrugName:           drug_name,
 				SpecificationName:  specification_name,
 				WarehousingUnit:    max_unit,
-				Count:              0,
+				Count:              consumable_count,
 				LastPrice:          price,
 				RetailPrice:        0,
 				NewPrice:           0,
@@ -2494,7 +2514,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				Status:             1,
 				WarehousingOrder:   warehousing_order,
 				LicenseNumber:      "",
-				StartTime:          0,
+				StartTime:          locationTime.Unix(),
 				Creater:            this.GetAdminUserInfo().AdminUser.Id,
 				Checker:            0,
 				CheckerStatus:      0,
@@ -2513,6 +2533,8 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				MinUnit:            min_unit,
 				LastStockMaxNumber: last_stock_max_number,
 				LastStockMinNumber: last_stock_min_number,
+				InventoryType:      consumable_type,
+				Type:               type_id,
 			}
 
 			err = service.CreateDrugInventory(inventory)
@@ -2522,10 +2544,10 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				DrugId:                  drug_id,
 				Number:                  "",
 				BatchNumber:             batch_number,
-				Count:                   0,
+				Count:                   consumable_count,
 				UserOrgId:               orgId,
 				PatientId:               0,
-				SystemTime:              time.Now().Unix(),
+				SystemTime:              locationTime.Unix(),
 				ConsumableType:          consumable_type,
 				IsSys:                   1,
 				WarehousingOrder:        warehousing_order,
@@ -2553,15 +2575,14 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 
 			service.CreateDrugFlowOne(flow)
 
-			//改变库存
-			info := models.DrugWarehouseInfo{
-				DrugId:         drug_id,
-				StockMaxNumber: last_stock_max_number,
-				StockMinNumber: last_stock_min_number,
+			if err != nil {
+				this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+				return
 			}
 
-			err = service.ModifyDrugWarehouseInfo(&info, drug_id)
-			fmt.Println(err)
+			this.ServeSuccessJSON(map[string]interface{}{
+				"inventory": inventory,
+			})
 		}
 	}
 }

main.go

@@ -16,8 +16,8 @@ func main() {
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
-	service.BeginAutoCreateDrugJob()
-	service.BeginAutoCreateStockJob()
+	//service.BeginAutoCreateDrugJob()
+	//service.BeginAutoCreateStockJob()
 	beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 60
 	beego.Run()
 }

models/drug_stock.go

@@ -327,42 +327,44 @@ type StDrugWarehouseOutInfo struct {
 }
 
 type DrugFlow struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SystemTime              int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType          int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	WarehousingOrder        string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	IsEdit                  int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
-	CancelStockId           int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber       string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	UpdateCreator           int64   `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
-	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId     int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	WarehouseOutDetailId    int64   `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
-	CancelOutDetailId       int64   `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_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"`
-	MaxUnit                 string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	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"`
-	LastStockMaxNumber      int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
-	LastStockMinNumber      int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	ID                      int64                `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId           int64                `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                  int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                  string               `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                   int64                `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId               int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId               int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime              int64                `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType          int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder        string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                  int64                `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId           int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber       string               `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                  int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                 int64                `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator           int64                `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                  int64                `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                   float64              `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId     int64                `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId    int64                `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId       int64                `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_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"`
+	MaxUnit                 string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                 string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	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"`
+	LastStockMaxNumber      int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber      int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	DrugWarehouseInfo       []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
+	BaseDrugLib             BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 
 func (DrugFlow) TableName() string {

models/self_drug_models.go

@@ -805,6 +805,8 @@ type XtDrugInventory struct {
 	MinUnit            string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	LastStockMaxNumber int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
 	LastStockMinNumber int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	Type               int64   `gorm:"column:type" json:"type" form:"type"`
 }
 
 func (XtDrugInventory) TableName() string {
@@ -812,39 +814,46 @@ func (XtDrugInventory) TableName() string {
 }
 
 type VmDrugInventory struct {
-	ID                int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName          string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Count             int64   `gorm:"column:count" json:"count" form:"count"`
-	LastPrice         float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
-	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
-	DrugId            int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status            int64   `gorm:"column:status" json:"status" form:"status"`
-	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Number            string  `gorm:"column:number" json:"number" form:"number"`
-	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
-	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
-	MinNumber         int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose              float64 `gorm:"column:dose" json:"dose" form:"dose"`
-	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"`
-	MinCount          int64   `gorm:"column:min_count" json:"min_count" form:"min_count"`
-	Total             string  `gorm:"column:total" json:"total" form:"total"`
-	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	DrugOriginPlace   string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	ID                 int64              `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string             `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName  string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit    string             `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count              int64              `gorm:"column:count" json:"count" form:"count"`
+	LastPrice          float64            `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice        float64            `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice           float64            `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer       string             `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer             string             `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark             string             `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId             int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId          int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime              int64              `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64              `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64              `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder   string             `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Number             string             `gorm:"column:number" json:"number" form:"number"`
+	StartTime          int64              `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater            int64              `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker            int64              `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus      int64              `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime        int64              `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	MinNumber          int64              `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose               float64            `gorm:"column:dose" json:"dose" form:"dose"`
+	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"`
+	MinCount           int64              `gorm:"column:min_count" json:"min_count" form:"min_count"`
+	Total              string             `gorm:"column:total" json:"total" form:"total"`
+	ExpiryDate         int64              `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate        int64              `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	DrugOriginPlace    string             `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	LastStockMaxNumber int64              `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber int64              `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64              `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	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"`
+	WarehouseInfoId    int64              `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Children           []*XtDrugInventory `gorm:"column:children" json:"children" form:"children"`
 }
 
 type SgjDrugWarehouseOutInfo struct {

service/auto_create_stock.go

@@ -14,8 +14,8 @@ var createStockCronJob *cron.Cron
 func init() {
 	utils.InfoLog("开启自动更新耗材库存定时任务")
 	createStockCronJob = cron.New()
-	spec := "0 */5 * * * ?" // 每1分钟执行一次
-	//spec := "0 55 23 * * ?" // 每天23点55执行一次
+	//spec := "0 */5 * * * ?" // 每1分钟执行一次
+	spec := "0 55 23 * * ?" // 每天23点55执行一次
 	//spec := "0 0 0 ? * Sun"
 	createStockCronJob.AddFunc(spec, func() {
 		AutoCreateStockJob()

service/schedule_service.go

@@ -715,9 +715,17 @@ func FindSchedualTemplateExportLog(org_id int64, export_time int64) (errLogs []*
 	return
 }
 
-func GetDialysisOrderByBedId(orgID, start, bed_id int64, schedule_type int64) (schedule models.DialysisOrder, err error) {
-	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).First(&schedule).Error
-	return
+func GetDialysisOrderByBedId(orgID, start, bed_id int64, schedule_type int64) (*models.DialysisOrder, error) {
+	order := models.DialysisOrder{}
+	err = readDb.Model(&order).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).Find(&order).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &order, nil
+
 }
 
 type VMDeviceNumber struct {

service/self_drug_service.go

@@ -876,10 +876,10 @@ func CreateDrugDamage(damage models.XtDrugDamage) error {
 	return err
 }
 
-func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.XtDrugDamage, total int64, err error) {
+func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.VmDrugInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_damage as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and inventory_type = 10")
 	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)
@@ -895,10 +895,15 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 	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
+	err = db.Group("x.drug_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.warehouse_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
 }
 
+func GetDrugDamageByOrgId(orgid int64) (list []*models.XtDrugInventory, err error) {
+	err = XTReadDB().Model(&list).Where("user_org_id = ? and inventory_type = 10 and status = 1", orgid).Find(&list).Error
+	return list, err
+}
+
 func UpdateDrugDamage(ids []string, damage models.XtDrugDamage) error {
 
 	err := XTWriteDB().Model(&damage).Where("id in(?)", ids).Updates(map[string]interface{}{"checker": damage.Checker, "checker_status": damage.CheckerStatus, "checker_time": damage.CheckerTime}).Error
@@ -1077,12 +1082,12 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	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)
+		db = db.Where("x.warehousing_order = ? or r.user_name like ? or t.drug_name like ?", keyword, likeKey, likeKey)
 	}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,t.dose,t.dose_unit,t.max_unit,x.min_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 

service/stock_service.go

@@ -4201,8 +4201,15 @@ func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime i
 		if stock_type == 4 {
 			db = db.Where("consumable_type = 4")
 		}
+		if stock_type == 10 {
+			db = db.Where("consumable_type = 10")
+		}
+		if stock_type == 11 {
+			db = db.Where("consumable_type = 11")
+		}
+
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&drug_flow).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Find(&drug_flow).Error
 	return drug_flow, total, err
 }