11月8日库存管理

service/auto_create_week_schedules_service.go

@@ -150,6 +150,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 
 		valueStrs := make([]string, 0, len(templateItems))
 		values := make([]interface{}, 0, len(templateItems)*11)
+
 		for _, item := range templateItems {
 			deviceNumber := deviceNumberMap[item.DeviceNumberID]
 			if deviceNumber == nil {

service/patient_service.go

@@ -2581,7 +2581,8 @@ func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions
 
 	redis := RedisClient()
 	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
+	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+
 	prescriptions_list_all, _ := redis.Get(key).Result()
 
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/stock_service.go

@@ -3004,10 +3004,10 @@ func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.B
 	return &drug, nil
 }
 
-func IsExistDrugByNameOne(drugname string, dosage float64, maxunit string, unival int64, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
+func IsExistDrugByNameOne(drugname string, dosage float64, doseunit string, minnumber int64, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
 	var drug models.BaseDrugLib
 	var err error
-	err = XTReadDB().Model(&drug).Where("drug_name = ? and dosage = ?  and max_unit = ? and unval = ? and min_unit=? and packing_unit = ? and status =1 and org_id = ?", drugname, dosage, maxunit, unival, minunit, packtunit, orgid).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_name = ? and dose = ? and dose_unit = ?   and min_number = ? and min_unit=? and max_unit = ? and status =1 and org_id = ?", drugname, dosage, doseunit, minnumber, minunit, packtunit, orgid).Find(&drug).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}