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

conf/app.conf

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

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/dialysis_api_controller.go

@@ -3200,7 +3200,8 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 			if template.TemplateId == 6 && adminInfo.CurrentOrgId == 10234 {
 
-				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration) / float64(totalMin) * 60 * 1000)
+				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}

controllers/dialysis_record_api_controller.go

@@ -739,7 +739,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	fmt.Println("hhaaaaaaa888888888323232323232333232322333323232", adminUserInfo.CurrentOrgId)
+
 	dialysisRecord = &models.DialysisOrder{
 		DialysisDate:           recordDate.Unix(),
 		UserOrgId:              adminUserInfo.CurrentOrgId,
@@ -800,7 +800,8 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 				if template.TemplateId == 6 && adminUserInfo.CurrentOrgId == 10234 {
 					if evaluation.ID > 0 {
-						ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration) / float64(totalMin) * 60 * 1000)
+						dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+						ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
 					}
 				}
 

controllers/gobal_config_api_controller.go

@@ -1854,7 +1854,7 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	list, total, err := service.GetAllBaseDurgListCount(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId)
-	fmt.Println("total232323232323232232323", total)
+
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,10 +269,12 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 		afterevaluation.DiastolicBloodPressure = diastolic_blood_pressure // 舒张压
 		afterevaluation.PulseFrequency = pulse_frequency                  // 脉率
 
-		afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
-		afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
-		afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
-		afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk                   //跌倒风险
+		if adminUserInfo.Org.Id == 10138 {
+			afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
+			afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
+			afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
+			afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk                   //跌倒风险
+		}
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
 		if err == nil {
@@ -704,10 +706,13 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		afterevaluation.WeightAfter = weight_after
 		afterevaluation.WeightLoss = weight_loss
 
-		afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
-		afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
-		afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
-		afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk
+		if adminUserInfo.Org.Id == 10138 {
+			afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
+			afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
+			afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
+			afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk
+		}
+
 		// if (adminUserInfo.Org.Id == 9538){
 		// 	afterevaluation.ActualUltrafiltration = weight_loss * 1000  //中能建的计量单位是毫升（ml）
 		// } else {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1493,7 +1493,7 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
 	}
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 9671 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 {
 		evaluation, _ := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1542,6 +1542,11 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 	}
 
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10233 {
+
+		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
+	}
+
 	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10060 {
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 	}

controllers/schedule_api_controller.go

@@ -2369,6 +2369,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if week_type > 0 {
 		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
@@ -2383,7 +2384,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	if week_type == 0 {
 		startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
 		list, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone)
-		fmt.Println("e23332232323232323322323", err)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

controllers/self_drug_api_congtroller.go

@@ -1453,6 +1453,7 @@ 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)

controllers/stock_in_api_controller.go

@@ -128,6 +128,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getgoodwarehouselist", &StockManagerApiController{}, "Get:GetGoodWarehouseList")
 	beego.Router("/api/stock/proofinventory", &StockManagerApiController{}, "Get:ProofInventory")
 	beego.Router("/api/stock/getwarehousetotal", &StockManagerApiController{}, "Get:GetWarehouseTotal")
+	beego.Router("/api/stock/getgoodinventorywarehouselist", &StockManagerApiController{}, "Get:GetGoodInventoryWarehouseList")
 
 }
 
@@ -6146,3 +6147,14 @@ func (this *StockManagerApiController) GetWarehouseTotal() {
 		"list": list,
 	})
 }
+
+func (this *StockManagerApiController) GetGoodInventoryWarehouseList() {
+
+	id, _ := this.GetInt64("id")
+	list, _ := service.GetGoodInventoryWarehouseList(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	fmt.Println(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/schedule_models.go

@@ -132,13 +132,13 @@ type WeekSchedule struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient              string                 `gorm:"-" json:"patient" form:"patient"`
-	DeviceZone           DeviceZone             `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber         DeviceNumber           `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisPrescription DialysisSolution       `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
-	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	//DialysisSolution     []*DialysisSolution    `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	Patient                    string                     `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	DialysisPrescription       DialysisSolution           `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
 }
@@ -197,6 +197,7 @@ type VmSchedulesRemind struct {
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {

models/self_drug_models.go

@@ -767,6 +767,49 @@ func (XtDrugDamage) TableName() string {
 	return "xt_drug_damage"
 }
 
+type VmXtDrugInventory 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"`
+	LicenseNumber      string     `gorm:"column:license_number" json:"license_number" form:"license_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"`
+	ExpiryDate         int64      `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate        int64      `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Number             string     `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber        string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Total              string     `gorm:"column:total" json:"total" form:"total"`
+	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"`
+	MinCount           int64      `gorm:"column:min_count" json:"min_count" form:"min_count"`
+	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"`
+	XtBaseDrug         XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+}
+
 type XtDrugInventory struct {
 	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
 	DrugName           string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`

service/schedule_service.go

@@ -608,7 +608,9 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 	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("XtAssessmentBeforeDislysis", "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").Group("mode_id").Order("id asc")
+		return db.Where("status =1").Order("id asc")
+	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
@@ -633,7 +635,9 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 	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("XtAssessmentBeforeDislysis", "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").Group("mode_id").Order("id asc")
+		return db.Where("status =1").Order("id asc")
+	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
@@ -820,6 +824,8 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 			return db.Where("status = 1").Order("id asc")
 		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Order("id asc")
+	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Group("patient_id,mode_id").Order("id desc")
 	}).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").Joins("JOIN xt_patients as p ON p.id = s.patient_id").

service/self_drug_service.go

@@ -883,8 +883,11 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 	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 len(keyword) > 0 {
-		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
+		db = db.Where("x.drug_name like ?", likeKey)
 	}
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
@@ -1121,7 +1124,7 @@ func CreateDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo) error {
 	return err
 }
 
-func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.XtDrugInventory, err error) {
+func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.VmXtDrugInventory, err error) {
 
 	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1 and inventory_type = 11 ")
 
@@ -1135,6 +1138,6 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 		db = db.Where("type = ?", drugtype)
 	}
 
-	err = db.Find(&drug).Error
+	err = db.Preload("XtBaseDrug", "status = 1").Find(&drug).Error
 	return drug, err
 }

service/stock_service.go

@@ -4771,3 +4771,9 @@ func ModifyDrugWarehouseInfo(info *models.DrugWarehouseInfo, id int64) error {
 	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber, "stock_min_number": info.StockMinNumber}).Error
 	return err
 }
+
+func GetGoodInventoryWarehouseList(id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("good_id = ? and status = 1", id).Preload("GoodInfo", "status = 1").Find(&info).Error
+	return info, err
+}