耗材参数

controllers/stock_api_controller.go

@@ -288,10 +288,12 @@ func (c *StockApiController) ModifyManufacturer() {
 		PinYin:           pinyin,
 	}
 
-	Manufacturer, _ := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
+	_, errrcode := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
+
+	if errrcode == nil {
 
-	if Manufacturer.ID > 0 && Manufacturer.ID != manufacturer.ID {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIdCardNoExist)
+
 		return
 	}
 

models/his_models.go

@@ -232,6 +232,7 @@ type HisDoctorAdviceInfo struct {
 	Day                   int64                  `gorm:"column:day" json:"day" form:"day"`
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/drug_stock_service.go

@@ -100,6 +100,7 @@ func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string,
 	}
 
 	if startTime > 0 {
+
 		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("org_id = ? AND status = 1 and ctime >=?", orgId, startTime)
 		})
@@ -107,6 +108,7 @@ func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string,
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
 			return db.Where("org_id = ? AND status = 1 and sys_record_time>=?", orgId, startTime)
 		})
+
 		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime>=?", orgId, startTime)
 	} else {
 
@@ -122,11 +124,11 @@ func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string,
 
 	if endTime > 0 {
 		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1 and ctime>=? and ctime <=?", orgId, startTime, endTime)
+			return db.Where("org_id = ? AND status = 1  and ctime <=?", orgId, startTime, endTime)
 		})
 		db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1 and ctime>=? and ctime<=?", orgId, startTime, endTime)
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1 and sys_record_time<=?", orgId, endTime)
+			return db.Where("org_id = ? AND status = 1 and sys_record_time>=? and sys_record_time<=?", orgId, startTime, endTime)
 		})
 		db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1 and ctime >=? and ctime<=?", orgId, startTime, endTime)
 	} else {

service/stock_service.go

@@ -1204,7 +1204,7 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, star
 	if endtime > 0 {
 
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("org_id = ? AND status = 1 and sys_record_time<=?", orgId, endtime)
+			return db.Where("org_id = ? AND status = 1 and sys_record_time >=? and sys_record_time<=?", orgId, startime, endtime)
 		})
 	}