耗材参数

controllers/stock_in_api_controller.go

@@ -1376,7 +1376,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.WarehouseOutInfo{
-						ID: id,
+						ID:                      id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						GoodId:                  good_id,
@@ -1774,9 +1774,33 @@ func (c *StockManagerApiController) GetQueryInfo() {
 	page, _ := c.GetInt64("page", -1)
 	limit, _ := c.GetInt64("limit", -1)
 	keyword := c.GetString("keyword")
-
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	type_name, _ := c.GetInt64("type_name")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
 	adminUserInfo := c.GetAdminUserInfo()
-	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
+	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword, startTime, endTime, type_name)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

service/his_project_service.go

@@ -389,7 +389,7 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64) (prescription []*models.HisPrescription, err error) {
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1", orgid).Find(&prescription).Error
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 
 	return prescription, err
 }

service/stock_service.go

@@ -1144,18 +1144,28 @@ func FindAllStockOutList(orgId int64, page int64, limit int64, startTime int64,
 	return
 }
 
-func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string) (list []*models.StockInfo, total int64, err error) {
+func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, startime int64, endtime int64, type_name int64) (list []*models.StockInfo, total int64, err error) {
 
 	db := readDb.Model(&models.StockInfo{})
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
 	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
 	db = db.Group("xt_good_information.id")
 	db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("org_id = ? AND status = 1", orgId)
 	})
 	db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1", orgId)
-	db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("org_id = ? AND status = 1", orgId)
-	})
+
+	if startime == 0 || endtime == 0 {
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", orgId)
+		})
+	}
+
 	db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
 	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
 
@@ -1165,6 +1175,11 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string) (lis
 		db = db.Where("xt_good_information.good_code LIKE ? OR xt_good_information.specification_name LIKE ? OR xt_goods_type.type_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_good_information.id")
 	}
 
+	if type_name > 0 {
+
+		db = db.Joins("join xt_goods_type on xt_goods_type.id = xt_good_information.good_type_id  AND xt_goods_type.org_id = ? AND xt_goods_type.status = 1 and xt_goods_type.id = ?", orgId, type_name)
+	}
+
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error