修改redis清除数据时间

controllers/base_api_controller.go

@@ -2,8 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
-
 	//"XT_New/models"
 	"XT_New/service"
 	"strconv"
@@ -66,36 +64,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 558
-		userAdmin.Mobile = "13318464649"
-
-		//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 = 4
-		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 = 4
-		adminUserInfo.CurrentAppId = 18
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 558
+		//userAdmin.Mobile = "13318464649"
+		//
+		////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 = 4
+		//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 = 4
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -308,35 +306,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 558
-		userAdmin.Mobile = "13535547901"
-		//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 = 4
-		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 = 4
-		adminUserInfo.CurrentAppId = 18
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 558
+		//userAdmin.Mobile = "13535547901"
+		////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 = 4
+		//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 = 4
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4235,3 +4235,20 @@ func RemoveRepeatedGood(arr []*models.DialysisBeforePrepare) (newArr []*models.D
 	}
 	return
 }
+
+func (c *DialysisAPIController) GetAllDrug() {
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	adminInfo := c.GetMobileAdminUserInfo()
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+	privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminInfo.Org.Id)
+	drugList, _ := service.GetAllBaseDrugLibList(adminInfo.Org.Id)
+	privateDrugList, _ := service.GetPrivateDrugList(patient_id, adminInfo.Org.Id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"base_drug_config":    drugStockConfig,
+		"private_drug_config": privateDrugConfig,
+		"base_drug_list":      drugList,
+		"private_drug_list":   privateDrugList,
+	})
+
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -609,118 +609,483 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	advice.ExecutionState = 1
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
-	//查询医嘱是否已经实行
-	if groupno > 0 {
-		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-		for _, item := range advices {
-			//如果医嘱已经执行生成自备药出库单
-			if item.ExecutionState == 1 {
+	//处理出库相关逻辑
 
-				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				timeStr := time.Now().Format("2006-01-02")
-				timeArr := strings.Split(timeStr, "-")
-				total, _ := service.FindAllWarehouseOut(adminUserInfo.Org.Id)
-				total = total + 1
-				warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-				number = number + total
-				warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-
-				medicalName, errcode := service.GetSelfMedicalByDrugName(item.AdviceName, item.AdviceDesc, item.PatientId)
-				if errcode == gorm.ErrRecordNotFound {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "ok",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
-				} else if errcode == nil {
-					stock := models.XtSelfOutStock{
-						DrugName:       item.AdviceName,
-						DrugNameId:     medicalName.DrugNameId,
-						DrugSpec:       item.AdviceDesc,
-						OutstoreNumber: outStoreNumber,
-						AdminUserId:    adminUserInfo.AdminUser.Id,
-						StorckTime:     item.AdviceDate,
-						UserOrgId:      adminUserInfo.Org.Id,
-						CreatedTime:    time.Now().Unix(),
-						Status:         1,
-						PatientId:      item.PatientId,
-						StockOutNumber: warehousing_out_order,
-						ExitMode:       2,
-						MedicId:        medicalName.ID,
+	//1.判断是否启用药品管理和自备药出库功能
+
+	//药品管理信息
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.Org.Id)
+
+	//自备药信息
+	privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
+
+	if drugStockConfig.IsOpen == 1 {
+		if groupno > 0 {
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			isHasWay := false //用来判断是否包含来自药品库的医嘱
+			record_time := int64(0)
+			for _, item := range advices {
+				if item.Way == 1 {
+					isHasWay = true
+					record_time = item.RecordDate
+				}
+			}
+
+			if isHasWay {
+				out, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
+				if err == gorm.ErrRecordNotFound {
+					//没有记录，则创建出库单
+					timeStr := time.Now().Format("2006-01-02")
+					timeArr := strings.Split(timeStr, "-")
+					total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
+					total = total + 1
+					warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+					number = number + total
+					warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+					creater := adminUserInfo.AdminUser.Id
+					warehouseOut := models.DrugWarehouseOut{
+						WarehouseOutOrderNumber: warehousing_out_order,
+						OperationTime:           time.Now().Unix(),
+						OrgId:                   adminUserInfo.Org.Id,
+						Creater:                 creater,
+						Ctime:                   time.Now().Unix(),
+						Status:                  1,
+						WarehouseOutTime:        record_time,
+						Dealer:                  0,
+						Manufacturer:            0,
+						Type:                    1,
+						IsSys:                   1,
 					}
+					err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+					if err != nil {
+						utils.TraceLog("创建出库单失败 err = %v", err)
+					} else {
+						for _, item := range advices {
+							if item.Way == 1 {
+								if item.PrescribingNumber > 0 {
+									warehouseOutInfo := &models.DrugWarehouseOutInfo{
+										WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+										WarehouseOutId:          warehouseOut.ID,
+										Status:                  1,
+										Ctime:                   time.Now().Unix(),
+										Remark:                  "",
+										OrgId:                   adminUserInfo.Org.Id,
+										Type:                    1,
+										Manufacturer:            0,
+										Dealer:                  0,
+										IsSys:                   1,
+										SysRecordTime:           record_time,
+										DrugId:                  item.DrugId,
+									}
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									warehouseOutInfo.Count = count
+									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+									warehouseOutInfo.Price = stockInInfo.Price
+									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+									if err == nil {
+										details := &models.DrugAutomaticReduceDetail{
+											WarehouseOutId:          warehouseOutInfo.ID,
+											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+											PatientId:               item.PatientId,
+											Ctime:                   time.Now().Unix(),
+											Mtime:                   time.Now().Unix(),
+											Status:                  1,
+											RecordTime:              record_time,
+											OrgId:                   adminUserInfo.Org.Id,
+											DrugId:                  item.DrugId,
+											Count:                   count,
+										}
+										service.AddSigleDrugAutoReduceRecordInfo(details)
+									}
+								}
+							}
 
-					//创建出库单
-					service.CreateOutStock(&stock)
+						}
+					}
+
+				} else if err == nil {
+					for _, item := range advices {
+						if item.Way == 1 {
+							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+							if err == gorm.ErrRecordNotFound {
+								warehouseOutInfo := &models.DrugWarehouseOutInfo{
+									WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+									WarehouseOutId:          out.ID,
+									Status:                  1,
+									Ctime:                   time.Now().Unix(),
+									Remark:                  "",
+									OrgId:                   adminUserInfo.Org.Id,
+									Type:                    1,
+									Manufacturer:            0,
+									Dealer:                  0,
+									IsSys:                   1,
+									SysRecordTime:           record_time,
+								}
+
+								stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+								warehouseOutInfo.Price = stockInInfo.Price
+								warehouseOutInfo.DrugId = item.DrugId
+								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								warehouseOutInfo.Count = count
+								err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+								if err == nil {
+									details := &models.DrugAutomaticReduceDetail{
+										WarehouseOutId:          warehouseOutInfo.ID,
+										WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+										PatientId:               item.PatientId,
+										Ctime:                   time.Now().Unix(),
+										Mtime:                   time.Now().Unix(),
+										Status:                  1,
+										RecordTime:              record_time,
+										OrgId:                   adminUserInfo.Org.Id,
+										DrugId:                  item.DrugId,
+										Count:                   count,
+									}
+									service.AddSigleDrugAutoReduceRecordInfo(details)
+								}
+
+							} else if err == nil { //记录存在，则将增加数量
+								if outInfo.ID > 0 {
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
+								}
+
+								count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
+								if count == 0 {
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									details := &models.DrugAutomaticReduceDetail{
+										WarehouseOutId:          outInfo.ID,
+										WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+										PatientId:               item.PatientId,
+										Ctime:                   time.Now().Unix(),
+										Mtime:                   time.Now().Unix(),
+										Status:                  1,
+										RecordTime:              record_time,
+										OrgId:                   adminUserInfo.Org.Id,
+										DrugId:                  item.DrugId,
+										Count:                   count,
+									}
+									service.AddSigleDrugAutoReduceRecordInfo(details)
+								} else if count == 1 {
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									service.UpdateDrugUserInfoDetails(item.DrugId, record_time, adminUserInfo.Org.Id, item.PatientId, count, &outInfo)
+								}
+
+							}
+						}
+					}
 
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "ok",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
 				}
 
 			}
-		}
-	} else {
-		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-		for _, item := range advices {
-			if item.ExecutionState == 1 {
-				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				timeStr := time.Now().Format("2006-01-02")
-				timeArr := strings.Split(timeStr, "-")
-				total, _ := service.FindAllWarehouseOut(adminUserInfo.Org.Id)
-				total = total + 1
-				warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-				number = number + total
-				warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-
-				medicalName, errc := service.GetSelfMedicalByDrugName(item.AdviceName, item.AdviceDesc, item.PatientId)
-				if errc == gorm.ErrRecordNotFound {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "ok",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
-				} else if errc == nil {
-
-					stock := models.XtSelfOutStock{
-						DrugName:       item.AdviceName,
-						DrugNameId:     medicalName.DrugNameId,
-						DrugSpec:       item.AdviceDesc,
-						OutstoreNumber: outStoreNumber,
-						AdminUserId:    adminUserInfo.AdminUser.Id,
-						StorckTime:     item.AdviceDate,
-						UserOrgId:      adminUserInfo.Org.Id,
-						CreatedTime:    time.Now().Unix(),
-						Status:         1,
-						PatientId:      item.PatientId,
-						StockOutNumber: warehousing_out_order,
-						ExitMode:       2,
-						MedicId:        medicalName.ID,
+		} else {
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			isHasWay := false //用来判断是否包含来自药品库的医嘱
+			record_time := int64(0)
+			for _, item := range advices {
+				if item.Way == 1 {
+					isHasWay = true
+					record_time = item.RecordDate
+				}
+			}
+
+			if isHasWay {
+				out, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
+				if err == gorm.ErrRecordNotFound {
+					//没有记录，则创建出库单
+					timeStr := time.Now().Format("2006-01-02")
+					timeArr := strings.Split(timeStr, "-")
+					total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
+					total = total + 1
+					warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+					number = number + total
+					warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+					creater := adminUserInfo.AdminUser.Id
+					warehouseOut := models.DrugWarehouseOut{
+						WarehouseOutOrderNumber: warehousing_out_order,
+						OperationTime:           time.Now().Unix(),
+						OrgId:                   adminUserInfo.Org.Id,
+						Creater:                 creater,
+						Ctime:                   time.Now().Unix(),
+						Status:                  1,
+						WarehouseOutTime:        record_time,
+						Dealer:                  0,
+						Manufacturer:            0,
+						Type:                    1,
+						IsSys:                   1,
 					}
+					err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+					if err != nil {
+						utils.TraceLog("创建出库单失败 err = %v", err)
+					} else {
+						for _, item := range advices {
+							if item.Way == 1 {
+								if item.PrescribingNumber > 0 {
+									warehouseOutInfo := &models.DrugWarehouseOutInfo{
+										WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+										WarehouseOutId:          warehouseOut.ID,
+										Status:                  1,
+										Ctime:                   time.Now().Unix(),
+										Remark:                  "",
+										OrgId:                   adminUserInfo.Org.Id,
+										Type:                    1,
+										Manufacturer:            0,
+										Dealer:                  0,
+										IsSys:                   1,
+										SysRecordTime:           record_time,
+										DrugId:                  item.DrugId,
+									}
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									warehouseOutInfo.Count = count
+									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+									warehouseOutInfo.Price = stockInInfo.Price
+									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+									if err == nil {
+										details := &models.DrugAutomaticReduceDetail{
+											WarehouseOutId:          warehouseOutInfo.ID,
+											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+											PatientId:               item.PatientId,
+											Ctime:                   time.Now().Unix(),
+											Mtime:                   time.Now().Unix(),
+											Status:                  1,
+											RecordTime:              record_time,
+											OrgId:                   adminUserInfo.Org.Id,
+											DrugId:                  item.DrugId,
+											Count:                   count,
+										}
+										service.AddSigleDrugAutoReduceRecordInfo(details)
+									}
+								}
+							}
 
-					//创建出库单
-					service.CreateOutStock(&stock)
+						}
+					}
+
+				} else if err == nil {
+					for _, item := range advices {
+						if item.Way == 1 {
+							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+							if err == gorm.ErrRecordNotFound {
+								warehouseOutInfo := &models.DrugWarehouseOutInfo{
+									WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+									WarehouseOutId:          out.ID,
+									Status:                  1,
+									Ctime:                   time.Now().Unix(),
+									Remark:                  "",
+									OrgId:                   adminUserInfo.Org.Id,
+									Type:                    1,
+									Manufacturer:            0,
+									Dealer:                  0,
+									IsSys:                   1,
+									SysRecordTime:           record_time,
+								}
+
+								stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+								warehouseOutInfo.Price = stockInInfo.Price
+								warehouseOutInfo.DrugId = item.DrugId
+								//warehouseOutInfo.Count = item.
+								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+								if err == nil {
+									details := &models.DrugAutomaticReduceDetail{
+										WarehouseOutId:          warehouseOutInfo.ID,
+										WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+										PatientId:               item.PatientId,
+										Ctime:                   time.Now().Unix(),
+										Mtime:                   time.Now().Unix(),
+										Status:                  1,
+										RecordTime:              record_time,
+										OrgId:                   adminUserInfo.Org.Id,
+										DrugId:                  item.DrugId,
+										Count:                   count,
+									}
+									service.AddSigleDrugAutoReduceRecordInfo(details)
+								}
+
+							} else if err == nil { //记录存在，则将增加数量
+								if outInfo.ID > 0 {
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
+								}
+
+								count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
+								if count == 0 {
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									details := &models.DrugAutomaticReduceDetail{
+										WarehouseOutId:          outInfo.ID,
+										WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+										PatientId:               item.PatientId,
+										Ctime:                   time.Now().Unix(),
+										Mtime:                   time.Now().Unix(),
+										Status:                  1,
+										RecordTime:              record_time,
+										OrgId:                   adminUserInfo.Org.Id,
+										DrugId:                  item.DrugId,
+										Count:                   count,
+									}
+									service.AddSigleDrugAutoReduceRecordInfo(details)
+								} else if count == 1 {
+									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									service.UpdateDrugUserInfoDetails(item.DrugId, record_time, adminUserInfo.Org.Id, item.PatientId, count, &outInfo)
+								}
+
+							}
+						}
+					}
 
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "ok",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
 				}
 
 			}
 		}
 	}
 
+	if privateDrugConfig.DrugStart == 1 {
+		if groupno > 0 {
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			for _, item := range advices {
+				if item.ExecutionState == 2 {
+					advice = item
+
+				}
+			}
+		} else {
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			for _, item := range advices {
+				if item.ExecutionState == 2 {
+					advice = item
+
+				}
+			}
+		}
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":    "ok",
+		"advice": advice,
+		"ids":    ids,
+	})
+	return
+
+	//查询医嘱是否已经实行
+	//if groupno > 0 {
+	//	advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+	//	for _, item := range advices {
+	//		//如果医嘱已经执行生成自备药出库单
+	//		if item.ExecutionState == 1 {
+	//
+	//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+	//			outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+	//
+	//			timeStr := time.Now().Format("2006-01-02")
+	//			timeArr := strings.Split(timeStr, "-")
+	//			total, _ := service.FindAllWarehouseOut(adminUserInfo.Org.Id)
+	//			total = total + 1
+	//			warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+	//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+	//			number = number + total
+	//			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+	//
+	//			medicalName, errcode := service.GetSelfMedicalByDrugName(item.AdviceName, item.AdviceDesc, item.PatientId)
+	//			if errcode == gorm.ErrRecordNotFound {
+	//				c.ServeSuccessJSON(map[string]interface{}{
+	//					"msg":    "ok",
+	//					"advice": advice,
+	//					"ids":    ids,
+	//				})
+	//				return
+	//			} else if errcode == nil {
+	//				stock := models.XtSelfOutStock{
+	//					DrugName:       item.AdviceName,
+	//					DrugNameId:     medicalName.DrugNameId,
+	//					DrugSpec:       item.AdviceDesc,
+	//					OutstoreNumber: outStoreNumber,
+	//					AdminUserId:    adminUserInfo.AdminUser.Id,
+	//					StorckTime:     item.AdviceDate,
+	//					UserOrgId:      adminUserInfo.Org.Id,
+	//					CreatedTime:    time.Now().Unix(),
+	//					Status:         1,
+	//					PatientId:      item.PatientId,
+	//					StockOutNumber: warehousing_out_order,
+	//					ExitMode:       2,
+	//					MedicId:        medicalName.ID,
+	//				}
+	//
+	//				//创建出库单
+	//				service.CreateOutStock(&stock)
+	//
+	//				c.ServeSuccessJSON(map[string]interface{}{
+	//					"msg":    "ok",
+	//					"advice": advice,
+	//					"ids":    ids,
+	//				})
+	//				return
+	//			}
+	//
+	//		}
+	//	}
+	//} else {
+	//	advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+	//	for _, item := range advices {
+	//		if item.ExecutionState == 1 {
+	//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+	//			outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+	//			timeStr := time.Now().Format("2006-01-02")
+	//			timeArr := strings.Split(timeStr, "-")
+	//			total, _ := service.FindAllWarehouseOut(adminUserInfo.Org.Id)
+	//			total = total + 1
+	//			warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+	//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+	//			number = number + total
+	//			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+	//
+	//			medicalName, errc := service.GetSelfMedicalByDrugName(item.AdviceName, item.AdviceDesc, item.PatientId)
+	//			if errc == gorm.ErrRecordNotFound {
+	//
+	//			} else if errc == nil {
+	//
+	//				stock := models.XtSelfOutStock{
+	//					DrugName:       item.AdviceName,
+	//					DrugNameId:     medicalName.DrugNameId,
+	//					DrugSpec:       item.AdviceDesc,
+	//					OutstoreNumber: outStoreNumber,
+	//					AdminUserId:    adminUserInfo.AdminUser.Id,
+	//					StorckTime:     item.AdviceDate,
+	//					UserOrgId:      adminUserInfo.Org.Id,
+	//					CreatedTime:    time.Now().Unix(),
+	//					Status:         1,
+	//					PatientId:      item.PatientId,
+	//					StockOutNumber: warehousing_out_order,
+	//					ExitMode:       2,
+	//					MedicId:        medicalName.ID,
+	//				}
+	//
+	//				//创建出库单
+	//				service.CreateOutStock(&stock)
+	//
+	//				c.ServeSuccessJSON(map[string]interface{}{
+	//					"msg":    "ok",
+	//					"advice": advice,
+	//					"ids":    ids,
+	//				})
+	//				return
+	//			}
+	//
+	//		}
+	//	}
+	//}
+
 }
 func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
@@ -1918,6 +2283,26 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		advice.AdviceDesc = adviceDsc
 	}
 
+	if dataBody["src_type"] == nil {
+		advice.Way = 0
+
+	} else {
+		if dataBody["src_type"] != nil || reflect.TypeOf(dataBody["src_type"]).String() == "float64" {
+			src_type := int64(dataBody["src_type"].(float64))
+			advice.Way = src_type
+		}
+
+	}
+
+	if dataBody["drug_id"] == nil {
+		advice.DrugId = 0
+	} else {
+		if dataBody["drug_id"] != nil || reflect.TypeOf(dataBody["drug_id"]).String() == "float64" {
+			drug_id := int64(dataBody["drug_id"].(float64))
+			advice.DrugId = drug_id
+		}
+	}
+
 	if dataBody["single_dose"] != nil && reflect.TypeOf(dataBody["single_dose"]).String() == "string" {
 		singleDose, _ := strconv.ParseFloat(dataBody["single_dose"].(string), 64)
 		advice.SingleDose = singleDose
@@ -2619,6 +3004,30 @@ func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, jso
 		advice.Remark = remark
 	}
 
+	//if json["src_type"] != nil || reflect.TypeOf(json["src_type"]).String() == "float64" {
+	//	src_type, _ := strconv.ParseInt(json["src_type"].(string),10)
+	//	advice.Way = src_type
+	//}
+	if json["src_type"] == nil {
+		advice.Way = 0
+
+	} else {
+		if json["src_type"] != nil || reflect.TypeOf(json["src_type"]).String() == "float64" {
+			src_type := int64(json["src_type"].(float64))
+			advice.Way = src_type
+		}
+
+	}
+
+	if json["drug_id"] == nil {
+		advice.DrugId = 0
+	} else {
+		if json["drug_id"] != nil || reflect.TypeOf(json["drug_id"]).String() == "float64" {
+			drug_id := int64(json["drug_id"].(float64))
+			advice.DrugId = drug_id
+		}
+	}
+
 	if json["drug_spec_unit"] != nil && reflect.TypeOf(json["drug_spec_unit"]).String() == "string" {
 		drugSpecUnit, _ := json["drug_spec_unit"].(string)
 		advice.DrugSpecUnit = drugSpecUnit

models/drug_stock.go

@@ -197,3 +197,21 @@ type DrugCancelStockInfo struct {
 func (DrugCancelStockInfo) TableName() string {
 	return "xt_drug_cancel_stock_info"
 }
+
+type DrugAutomaticReduceDetail struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	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"`
+	PatientId               int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
+	RecordTime              int64  `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugId                  int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count                   int64  `gorm:"column:count" json:"count" form:"count"`
+}
+
+func (DrugAutomaticReduceDetail) TableName() string {
+	return "xt_drug_automatic_reduce_detail"
+}

service/dialysis_service.go

@@ -1092,6 +1092,12 @@ func UpdateUserInfoDetails(good_type_id int64, good_id int64, time int64, org_id
 
 }
 
+func UpdateDrugUserInfoDetails(drug_id int64, time int64, org_id int64, patient_id int64, count int64, out *models.DrugWarehouseOutInfo) {
+	writeDb.Model(&models.DrugAutomaticReduceDetail{}).Where("drug_id = ? AND org_id = ? AND status = 1 AND warehouse_out_order_number = ? AND patient_id = ?", drug_id, org_id, out.WarehouseOutOrderNumber, patient_id).Updates(map[string]interface{}{"count": count})
+	//writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber).UpdateColumn("count", count)
+
+}
+
 func FindDialysisBeforePrepare(patient_id int64, good_id int64, good_type_id int64, user_org_id int64, record_time int64) (count int64) {
 	readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ?  AND good_id = ? AND good_type_id = ? AND record_date = ? AND status = 1", user_org_id, patient_id, good_id, good_type_id, record_time).Count(&count)
 	return

service/mobile_dialysis_service.go

@@ -508,7 +508,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and advice_type = 2", patientID, orgID, recordDate).
-		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
+		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id, IF(parent_id > 0, parent_id, id) as advice_order").
 		Order("start_time asc, groupno desc, advice_order desc, id asc").
 		Scan(&records).Error
 

service/self_drug_service.go

@@ -375,3 +375,62 @@ func CreateAotoMaticReduceDetail(detail *models.XtDrugAutomaticReduceDetail) err
 	err := XTWriteDB().Model(&detail).Create(&detail).Error
 	return err
 }
+
+type Drugs struct {
+	ID                 int64    `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string   `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin             string   `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi               string   `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias          string   `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin    string   `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi      string   `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory       int64    `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec           float64  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType           int64    `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit     string   `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugStatus         string   `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	DeliveryWay        string   `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string   `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose         float64  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber  float64  `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Status             int64    `gorm:"column:status" json:"status" form:"status"`
+	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
+}
+
+func (Drugs) TableName() string {
+	return "xt_base_drug"
+}
+
+func GetAllBaseDrugLibList(org_id int64) (drugs []*Drugs, err error) {
+	db := readDb.Model(&models.BaseDrugLib{}).Preload("Drugs", "status = 1 AND org_id = ? AND find_in_set('停用',drug_status) = 0", org_id).Where("org_id = ?  AND status = 1 AND find_in_set('停用',drug_status) = 0", org_id).Group("drug_name")
+	err = db.Find(&drugs).Error
+	return
+}
+
+type PrivateDrug struct {
+	DrugName           string         `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	ID                 int64          `gorm:"column:id" json:"id" form:"id"`
+	DrugSpec           string         `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	PatientId          int64          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DrugNameId         int64          `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	Status             int64          `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId          int64          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CreatedTime        int64          `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime        int64          `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	MinUnit            string         `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	ExecutionFrequency string         `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	PrescribingNumber  float64        `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	DeliveryWay        string         `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	SingleDose         float64        `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrivateDrug        []*PrivateDrug `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
+}
+
+func (PrivateDrug) TableName() string {
+	return "xt_self_medical"
+}
+
+func GetPrivateDrugList(patient_id int64, org_id int64) (pds []*PrivateDrug, err error) {
+	err = XTReadDB().Model(&PrivateDrug{}).Preload("PrivateDrug", "status = 1 AND user_org_id = ? AND patient_id = ? ", org_id, patient_id).Where("patient_id = ? and status = 1 AND user_org_id = ?", patient_id, org_id).Group("drug_name").Find(&pds).Error
+	return
+}

service/stock_service.go

@@ -1892,29 +1892,58 @@ func FindStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out model
 
 }
 
+func FindDrugStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out models.DrugWarehouseOut, err error) {
+	err = readDb.Model(&models.DrugWarehouseOut{}).Where("is_sys = ? AND status = 1 AND org_id = ? AND warehouse_out_time = ?", is_sys, org_id, record_time).First(&out).Error
+	return
+
+}
+
 func FindLastStockInInfoRecord(good_id int64, org_id int64) (in models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("status = 1 AND org_id = ? AND good_id = ?", org_id, good_id).Last(&in).Error
 	return
 
 }
 
+func FindLastDrugStockInInfoRecord(drug_id int64, org_id int64) (in models.WarehousingInfo, err error) {
+	err = readDb.Model(&models.DrugWarehouseInfo{}).Where("status = 1 AND org_id = ? AND drug_id = ?", org_id, drug_id).Last(&in).Error
+	return
+
+}
+
 func AddSigleWarehouseOutInfo(info *models.WarehouseOutInfo) error {
 	err := writeDb.Create(&info).Error
 	return err
 
 }
 
+func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
+	err := writeDb.Create(&info).Error
+	return err
+
+}
+
 func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
 	err := writeDb.Create(&detail).Error
 	return err
 
 }
 
+func AddSigleDrugAutoReduceRecordInfo(detail *models.DrugAutomaticReduceDetail) error {
+	err := writeDb.Create(&detail).Error
+	return err
+
+}
+
 func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, out_id int64, number string) (out models.WarehouseOutInfo, err error) {
 	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND  (warehouse_out_id = ? or warehouse_out_order_number = ?)", org_id, good_type_id, good_id, out_id, number).First(&out).Error
 	return
 }
 
+func FindDrugStockOutInfoByTypeId(org_id int64, drug_id int64, out_id int64, number string) (out models.DrugWarehouseOutInfo, err error) {
+	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND  drug_id = ? AND is_sys = 1 AND  (warehouse_out_id = ? or warehouse_out_order_number = ?)", org_id, drug_id, out_id, number).First(&out).Error
+	return
+}
+
 func UpdateStockOutInfoCount(org_id int64, id int64) {
 	writeDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND id = ?", org_id, id).UpdateColumn("count", gorm.Expr("count + ?", 1))
 
@@ -1936,6 +1965,11 @@ func UpdateStockOutInfoCount2(org_id int64, id int64, count int64) {
 
 }
 
+func UpdateDrugStockOutInfoCount2(org_id int64, id int64, count int64) {
+	writeDb.Model(&models.DrugWarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND id = ?", org_id, id).UpdateColumn("count", gorm.Expr("count + ?", count))
+
+}
+
 func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id int64, good_type_id int64, patient_id int64) (count int64, err error) {
 
 	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ?", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
@@ -1943,6 +1977,13 @@ func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id i
 
 }
 
+func FindPatientDrugAutomaticReduceRecord(org_id int64, record_time int64, drug_id int64, patient_id int64) (count int64, err error) {
+
+	err = readDb.Model(&models.DrugAutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND drug_id = ?AND patient_id = ? AND record_time = ?", org_id, drug_id, patient_id, record_time).Count(&count).Error
+	return
+
+}
+
 type VMWarehousingInfo struct {
 	ID            int64    `gorm:"column:id" json:"id"`
 	WarehousingId int64    `gorm:"column:warehousing_id" json:"warehousing_id"`