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

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10666 //机构id
+		subscibe.OrgId = 10633 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17876 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10666 //机构id小英9675或4
+		subscibe.OrgId = 10633 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17876 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/his_api_controller.go

 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 9675 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
 			////同步到自备药
 			selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(adminInfo.CurrentOrgId)
 
-			fmt.Println("selfPrescriptionOpen--------------------------------------------------", selfPrescriptionOpen.IsOpen)
 			if selfPrescriptionOpen.IsOpen == 1 {
 
 				timeStr := time.Now().Format("2006-01-02")
 
 					}
 
-					fmt.Println("selfBasedrug--------------------", selfBasedrug.IsSelfDrug)
 					if selfBasedrug.IsSelfDrug == 1 {
 						var total_count int64
 
 							total_count += prescribingNumberSeven
 						}
 
-						fmt.Println("tota_count==================================", total_count)
-						fmt.Println("in_count==================================", in_count)
 						//入库
 						if total_count > in_count {
 
 									maxNumber = cha_count / selfBasedrug.MinNumber
 									minNumber = cha_count % selfBasedrug.MinNumber
 
-									fmt.Println("maxNumber----------------------------", maxNumber)
-									fmt.Println("minNumber----------------------------", minNumber)
 									if warehouse.StockMaxNumber == 0 && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
 										minNumber = maxNumber
 									}
 
 	////同步到自备药
 	selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(c.GetAdminUserInfo().CurrentOrgId)
+
+	fmt.Println("selfPrescriptionOpen=---------------------------", selfPrescriptionOpen)
 	var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+
 	if selfPrescriptionOpen.IsOpen == 1 {
-		// 开始主事务
+		// 在函数结束时处理事务回滚
 		db := service.XTWriteDB()
 		tx := db.Begin()
-
-		// 在函数结束时处理事务回滚
 		defer func() {
 			if r := recover(); r != nil {
 				tx.Rollback()
+			} else {
+				tx.Commit()
 			}
 		}()
-		for _, item := range advices {
-			selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId)
-
-			var total_count int64
-			prescribingNumberSix := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
-			prescribingNumberSeven, _ := strconv.ParseInt(prescribingNumberSix, 10, 64)
-
-			if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
-				total_count += prescribingNumberSeven * selfBasedrug.MinNumber
-			}
-
-			if item.PrescribingNumberUnit == selfBasedrug.MinUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
-				total_count += prescribingNumberSeven
-			}
-
-			if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
-				total_count += prescribingNumberSeven
-			}
-			//出库
-			warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
-				DrugId:           item.DrugId,
-				Count:            total_count,
-				Price:            0,
-				TotalPrice:       0,
-				Status:           1,
-				Ctime:            item.AdviceDate,
-				Mtime:            item.AdviceDate,
-				Remark:           "",
-				OrgId:            item.UserOrgId,
-				Type:             0,
-				Manufacturer:     selfBasedrug.Manufacturer,
-				Dealer:           selfBasedrug.Dealer,
-				RetailPrice:      0,
-				RetailTotalPrice: 0,
-				CountUnit:        item.PrescribingNumberUnit,
-				ExpiryDate:       0,
-				ProductDate:      0,
-				Number:           "",
-				BatchNumber:      "",
-				IsSys:            0,
-				WarehouseInfoId:  0,
-				AdminUserId:      0,
-				StockCount:       "",
-				IsCheck:          2,
-				SysRecordTime:    item.AdviceDate,
-				PatientId:        item.PatientId,
-				ClassType:        "",
-			}
-			warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
-		}
-
-		for _, it := range warehousingOutInfo {
+		advicesList, _ := service.GetSelfHisPrescriptionAdviceByID(prescription_id, tx)
+		for _, item := range advicesList {
 
 			timeStr := time.Now().Format("2006-01-02")
 			timeArr := strings.Split(timeStr, "-")
 
 			total = total + 1
 			warehousing_out_order := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			fmt.Println("warehousing_out_order--------------------------------------", warehousing_out_order)
 			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 			number = number + total
 			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
 				Creater:                 creater,
 				Ctime:                   time.Now().Unix(),
 				Status:                  1,
-				WarehouseOutTime:        it.SysRecordTime,
+				WarehouseOutTime:        item.AdviceDate,
 				Type:                    0,
-				PatientId:               it.PatientId,
-				IsCheck:                 2,
+				PatientId:               item.PatientId,
+				IsCheck:                 1,
 			}
 
 			//查询今日是否有出库数据
-			lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, it.SysRecordTime, tx)
+			lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, item.AdviceDate, tx, 1)
 
+			fmt.Println("lastWarehouseOut-----------------------------------", lastWarehouseOut)
 			if lastWarehouseOut.ID == 0 {
-				service.AddSelfSigleDrugWarehouseOut(&lastWarehouseOut, tx)
+				service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
 			}
+			selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId)
+
+			var total_count int64
+			prescribingNumberSix := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+			prescribingNumberSeven, _ := strconv.ParseInt(prescribingNumberSix, 10, 64)
 
+			if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+				total_count += prescribingNumberSeven * selfBasedrug.MinNumber
+			}
+
+			if item.PrescribingNumberUnit == selfBasedrug.MinUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+				total_count += prescribingNumberSeven
+			}
+
+			if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+				total_count += prescribingNumberSeven
+			}
+			//出库
+			warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				WarehouseOutId:          lastWarehouseOut.ID,
+				DrugId:                  item.DrugId,
+				Count:                   total_count,
+				Price:                   0,
+				TotalPrice:              0,
+				Status:                  1,
+				Ctime:                   item.AdviceDate,
+				Mtime:                   item.AdviceDate,
+				Remark:                  "",
+				OrgId:                   item.UserOrgId,
+				Type:                    0,
+				Manufacturer:            selfBasedrug.Manufacturer,
+				Dealer:                  selfBasedrug.Dealer,
+				RetailPrice:             0,
+				RetailTotalPrice:        0,
+				CountUnit:               selfBasedrug.MinUnit,
+				ExpiryDate:              0,
+				ProductDate:             0,
+				Number:                  "",
+				BatchNumber:             "",
+				IsSys:                   1,
+				WarehouseInfoId:         0,
+				AdminUserId:             0,
+				StockCount:              "",
+				IsCheck:                 1,
+				SysRecordTime:           item.AdviceDate,
+				PatientId:               item.PatientId,
+				ClassType:               "",
+				AdviceId:                item.ID,
+			}
+			warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+		}
+
+		fmt.Println("长度-------------------------------", warehousingOutInfo)
+		for _, it := range warehousingOutInfo {
+			//查询今日是否有出库数据
+			lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, it.SysRecordTime, tx, 1)
 			medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
 			drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
 			//出库逻辑
-			service.AutoSelfDrugDeliverInfoFourtyOne(c.GetAdminUserInfo().CurrentOrgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit, tx)
+			service.AutoSelfDrugDeliverInfoFourtyTwo(c.GetAdminUserInfo().CurrentOrgId, it.Count, &lastWarehouseOutOne, &drup, it, it.CountUnit, tx)
 
 			//查询剩余库存
 			stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
 	selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(c.GetAdminUserInfo().CurrentOrgId)
 	var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
 	if selfPrescriptionOpen.IsOpen == 1 {
-		// 开始主事务
+
 		db := service.XTWriteDB()
 		tx := db.Begin()
-
-		// 在函数结束时处理事务回滚
 		defer func() {
 			if r := recover(); r != nil {
 				tx.Rollback()
+			} else {
+				tx.Commit()
 			}
 		}()
 
 		if advice.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
 			total_count += prescribingNumberSeven
 		}
-		//出库
-		warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
-			DrugId:           advice.DrugId,
-			Count:            total_count,
-			Price:            0,
-			TotalPrice:       0,
-			Status:           1,
-			Ctime:            advice.AdviceDate,
-			Mtime:            advice.AdviceDate,
-			Remark:           "",
-			OrgId:            advice.UserOrgId,
-			Type:             0,
-			Manufacturer:     selfBasedrug.Manufacturer,
-			Dealer:           selfBasedrug.Dealer,
-			RetailPrice:      0,
-			RetailTotalPrice: 0,
-			CountUnit:        advice.PrescribingNumberUnit,
-			ExpiryDate:       0,
-			ProductDate:      0,
-			Number:           "",
-			BatchNumber:      "",
-			IsSys:            0,
-			WarehouseInfoId:  0,
-			AdminUserId:      0,
-			StockCount:       "",
-			IsCheck:          2,
-			SysRecordTime:    advice.AdviceDate,
-			PatientId:        advice.PatientId,
-			ClassType:        "",
-		}
-		warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
-		for _, it := range warehousingOutInfo {
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := service.FindAllSelfDrugWarehouseOut(c.GetAdminUserInfo().CurrentOrgId, tx)
 
-			timeStr := time.Now().Format("2006-01-02")
-			timeArr := strings.Split(timeStr, "-")
-			total, _ := service.FindAllSelfDrugWarehouseOut(c.GetAdminUserInfo().CurrentOrgId, tx)
+		total = total + 1
+		warehousing_out_order := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 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)
+		operation_time := time.Now().Unix()
 
-			total = total + 1
-			warehousing_out_order := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 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)
-			operation_time := time.Now().Unix()
+		creater := c.GetAdminUserInfo().AdminUser.Id
+		//创建一个出库单
+		drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+			WarehouseOutOrderNumber: warehousing_out_order,
+			OperationTime:           operation_time,
+			OrgId:                   c.GetAdminUserInfo().CurrentOrgId,
+			Creater:                 creater,
+			Ctime:                   time.Now().Unix(),
+			Status:                  1,
+			WarehouseOutTime:        advice.AdviceDate,
+			Type:                    0,
+			PatientId:               advice.PatientId,
+			IsCheck:                 1,
+		}
 
-			creater := c.GetAdminUserInfo().AdminUser.Id
-			//创建一个出库单
-			drugWarehouseOut := models.XtSelfDrugWarehouseOut{
-				WarehouseOutOrderNumber: warehousing_out_order,
-				OperationTime:           operation_time,
-				OrgId:                   c.GetAdminUserInfo().CurrentOrgId,
-				Creater:                 creater,
-				Ctime:                   time.Now().Unix(),
-				Status:                  1,
-				WarehouseOutTime:        it.SysRecordTime,
-				Type:                    0,
-				PatientId:               it.PatientId,
-				IsCheck:                 2,
-			}
+		//查询今日是否有出库数据
+		lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, advice.AdviceDate, tx, 1)
 
-			//查询今日是否有出库数据
-			lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, it.SysRecordTime, tx)
+		if lastWarehouseOut.ID == 0 {
+			service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+		}
+		//出库
+		warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+			WarehouseOutId:          lastWarehouseOut.ID,
+			WarehouseOutOrderNumber: warehousing_out_order,
+			DrugId:                  advice.DrugId,
+			Count:                   total_count,
+			Price:                   0,
+			TotalPrice:              0,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   advice.AdviceDate,
+			Remark:                  "",
+			OrgId:                   advice.UserOrgId,
+			Type:                    0,
+			Manufacturer:            selfBasedrug.Manufacturer,
+			Dealer:                  selfBasedrug.Dealer,
+			RetailPrice:             0,
+			RetailTotalPrice:        0,
+			CountUnit:               advice.PrescribingNumberUnit,
+			ExpiryDate:              0,
+			ProductDate:             0,
+			Number:                  "",
+			BatchNumber:             "",
+			IsSys:                   0,
+			WarehouseInfoId:         0,
+			AdminUserId:             0,
+			StockCount:              "",
+			IsCheck:                 1,
+			SysRecordTime:           advice.AdviceDate,
+			PatientId:               advice.PatientId,
+			AdviceId:                advice.ID,
+			ClassType:               "",
+		}
+		warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
-			if lastWarehouseOut.ID == 0 {
-				service.AddSelfSigleDrugWarehouseOut(&lastWarehouseOut, tx)
-			}
+		for _, it := range warehousingOutInfo {
 
 			medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
 			drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
 			//出库逻辑
-			service.AutoSelfDrugDeliverInfoFourtyOne(c.GetAdminUserInfo().CurrentOrgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit, tx)
+			service.AutoSelfDrugDeliverInfoFourtyTwo(c.GetAdminUserInfo().CurrentOrgId, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
 
 			//查询剩余库存
 			stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)

controllers/mobile_api_controllers/patient_api_controller.go

 				return
 			}
 		}
+
+		//自备药
+		selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+		if selfPrescriptionOutOpen.IsOpen == 1 {
+
+			db := service.XTWriteDB()
+			tx := db.Begin()
+			defer func() {
+				if r := recover(); r != nil {
+					tx.Rollback()
+				} else {
+					tx.Commit()
+				}
+			}()
+
+			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+
+			if selfBasedrug.IsSelfDrug == 1 {
+
+				//查询是否有库存
+				info, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(advice.DrugId, advice.PatientId, advice.UserOrgId, tx)
+
+				if len(info) > 0 {
+					var total_count int64
+					var prescribing_number_total int64
+					for _, item := range info {
+						if item.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							item.StockMaxNumber = item.StockMaxNumber * selfBasedrug.MinNumber
+						}
+
+						total_count += item.StockMaxNumber + item.StockMinNumber
+					}
+
+					//判断单位是否相等
+					if selfBasedrug.MaxUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						prescribing_number_total = count * selfBasedrug.MinNumber
+					}
+
+					if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						prescribing_number_total = count
+
+					}
+
+					if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						prescribing_number_total = count
+
+					}
+
+					if prescribing_number_total > total_count {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "3",
+							"advice": advice,
+						})
+						return
+					}
+					var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+					//出库
+					if prescribing_number_total <= total_count {
+						timeStr := time.Now().Format("2006-01-02")
+						timeArr := strings.Split(timeStr, "-")
+						total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
+
+						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)
+						operation_time := time.Now().Unix()
+
+						creater := c.GetAdminUserInfo().AdminUser.Id
+						//创建一个出库单
+						drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+							WarehouseOutOrderNumber: warehousing_out_order,
+							OperationTime:           operation_time,
+							OrgId:                   adminUserInfo.Org.Id,
+							Creater:                 creater,
+							Ctime:                   time.Now().Unix(),
+							Status:                  1,
+							WarehouseOutTime:        advice.AdviceDate,
+							Type:                    0,
+							PatientId:               advice.PatientId,
+							IsCheck:                 1,
+							IsSys:                   1,
+						}
+
+						//查询今日是否有出库数据
+						lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, advice.AdviceDate, tx, 1)
+
+						if lastWarehouseOut.ID == 0 {
+							service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+						}
+						//出库
+						warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+							WarehouseOutOrderNumber: warehousing_out_order,
+							DrugId:                  advice.DrugId,
+							Count:                   total_count,
+							Price:                   0,
+							TotalPrice:              0,
+							Status:                  1,
+							Ctime:                   advice.AdviceDate,
+							Mtime:                   advice.AdviceDate,
+							Remark:                  "",
+							OrgId:                   advice.UserOrgId,
+							Type:                    0,
+							Manufacturer:            selfBasedrug.Manufacturer,
+							Dealer:                  selfBasedrug.Dealer,
+							RetailPrice:             0,
+							RetailTotalPrice:        0,
+							CountUnit:               advice.PrescribingNumberUnit,
+							ExpiryDate:              0,
+							ProductDate:             0,
+							Number:                  "",
+							BatchNumber:             "",
+							IsSys:                   0,
+							WarehouseInfoId:         0,
+							AdminUserId:             0,
+							StockCount:              "",
+							IsCheck:                 1,
+							SysRecordTime:           advice.AdviceDate,
+							PatientId:               advice.PatientId,
+							AdviceId:                advice.ID,
+							ClassType:               "",
+						}
+						warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+						for _, it := range warehousingOutInfo {
+
+							medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+							drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+							//出库逻辑
+							service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+							//查询剩余库存
+							stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+							var sum_count int64
+							for _, its := range stockInfo {
+								if its.MaxUnit == medical.MaxUnit {
+									its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+								}
+								sum_count += its.StockMaxNumber + its.StockMinNumber
+							}
+							service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+						}
+					}
+
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "3",
+						"advice": advice,
+					})
+					return
+				}
+
+			}
+
+		}
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":    "1",
 			"advice": advice,
 					}
 				}
 
-				fmt.Println("total_count-------------------------------", total_count)
-				fmt.Println("drug_count-------------------------------", drug_count)
 				if total_count == drug_count {
 					advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
 					tx.Commit()
 
 				//保存处方出库
 				config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
-				fmt.Println("config============================================")
+
 				if config.IsOpen != 1 {
 					//查询该药品是否有库存
 					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
 					}
 				}
 
-				fmt.Println("org_id =============================", adminInfo.Org.Id)
+				//自备药
+				selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminInfo.Org.Id)
+
+				if selfPrescriptionOutOpen.IsOpen == 1 {
+
+					selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+
+					if selfBasedrug.IsSelfDrug == 1 {
+
+						//查询是否有库存
+						info, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(advice.DrugId, advice.PatientId, advice.UserOrgId, tx)
+
+						if len(info) > 0 {
+							var total_count int64
+							var prescribing_number_total int64
+							for _, item := range info {
+								if item.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+									item.StockMaxNumber = item.StockMaxNumber * selfBasedrug.MinNumber
+								}
+
+								total_count += item.StockMaxNumber + item.StockMinNumber
+							}
+
+							//判断单位是否相等
+							if selfBasedrug.MaxUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								//转化为最小单位
+								prescribing_number_total = count * selfBasedrug.MinNumber
+							}
+
+							if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								prescribing_number_total = count
+
+							}
+
+							if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								prescribing_number_total = count
+
+							}
+
+							if prescribing_number_total > total_count {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "3",
+									"advice": advice,
+								})
+								return
+							}
+							var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+							//出库
+							if prescribing_number_total <= total_count {
+								timeStr := time.Now().Format("2006-01-02")
+								timeArr := strings.Split(timeStr, "-")
+								total, _ := service.FindAllSelfDrugWarehouseOut(adminInfo.Org.Id, tx)
+
+								total = total + 1
+								warehousing_out_order := strconv.FormatInt(adminInfo.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)
+								operation_time := time.Now().Unix()
+
+								creater := adminInfo.AdminUser.Id
+								//创建一个出库单
+								drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+									WarehouseOutOrderNumber: warehousing_out_order,
+									OperationTime:           operation_time,
+									OrgId:                   adminInfo.Org.Id,
+									Creater:                 creater,
+									Ctime:                   time.Now().Unix(),
+									Status:                  1,
+									WarehouseOutTime:        advice.AdviceDate,
+									Type:                    0,
+									PatientId:               advice.PatientId,
+									IsCheck:                 1,
+									IsSys:                   1,
+								}
+
+								//查询今日是否有出库数据
+								lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(adminInfo.Org.Id, advice.AdviceDate, tx, 1)
+
+								if lastWarehouseOut.ID == 0 {
+									service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+								}
+								//出库
+								warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+									WarehouseOutOrderNumber: warehousing_out_order,
+									DrugId:                  advice.DrugId,
+									Count:                   total_count,
+									Price:                   0,
+									TotalPrice:              0,
+									Status:                  1,
+									Ctime:                   advice.AdviceDate,
+									Mtime:                   advice.AdviceDate,
+									Remark:                  "",
+									OrgId:                   advice.UserOrgId,
+									Type:                    0,
+									Manufacturer:            selfBasedrug.Manufacturer,
+									Dealer:                  selfBasedrug.Dealer,
+									RetailPrice:             0,
+									RetailTotalPrice:        0,
+									CountUnit:               advice.PrescribingNumberUnit,
+									ExpiryDate:              0,
+									ProductDate:             0,
+									Number:                  "",
+									BatchNumber:             "",
+									IsSys:                   0,
+									WarehouseInfoId:         0,
+									AdminUserId:             0,
+									StockCount:              "",
+									IsCheck:                 1,
+									SysRecordTime:           advice.AdviceDate,
+									PatientId:               advice.PatientId,
+									AdviceId:                advice.ID,
+									ClassType:               "",
+								}
+								warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+								for _, it := range warehousingOutInfo {
+
+									medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+									drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+									//出库逻辑
+									service.AutoSelfDrugDeliverInfoFourtyTwo(adminInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+									//查询剩余库存
+									stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+									var sum_count int64
+									for _, its := range stockInfo {
+										if its.MaxUnit == medical.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+										}
+										sum_count += its.StockMaxNumber + its.StockMinNumber
+									}
+									service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+								}
+							}
+
+						} else {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "3",
+								"advice": advice,
+							})
+							return
+						}
+
+					}
+
+				}
+
 				////针对异常未出库问题的脚本
 				//if adminInfo.Org.Id == 10598 {
 				//

controllers/patient_api_controller.go

 			}
 		}
 
+		//自备药
+		selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.CurrentOrgId)
+
+		if selfPrescriptionOutOpen.IsOpen == 1 {
+
+			db := service.XTWriteDB()
+			tx := db.Begin()
+			defer func() {
+				if r := recover(); r != nil {
+					tx.Rollback()
+				} else {
+					tx.Commit()
+				}
+			}()
+
+			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+
+			fmt.Println("selfBasedrug-----------------------------------------", selfBasedrug.IsSelfDrug)
+
+			if selfBasedrug.IsSelfDrug == 1 {
+
+				//查询是否有库存
+				info, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(advice.DrugId, advice.PatientId, advice.UserOrgId, tx)
+
+				if len(info) > 0 {
+					var total_count int64
+					var prescribing_number_total int64
+					for _, item := range info {
+						if item.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							item.StockMaxNumber = item.StockMaxNumber * selfBasedrug.MinNumber
+						}
+
+						total_count += item.StockMaxNumber + item.StockMinNumber
+					}
+
+					//判断单位是否相等
+					if selfBasedrug.MaxUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						prescribing_number_total = count * selfBasedrug.MinNumber
+					}
+
+					if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						prescribing_number_total = count
+
+					}
+
+					if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						prescribing_number_total = count
+
+					}
+
+					if prescribing_number_total > total_count {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "3",
+							"advice": advice,
+						})
+						return
+					}
+					var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+					//出库
+					if prescribing_number_total <= total_count {
+						timeStr := time.Now().Format("2006-01-02")
+						timeArr := strings.Split(timeStr, "-")
+						total, _ := service.FindAllSelfDrugWarehouseOut(c.GetAdminUserInfo().CurrentOrgId, tx)
+
+						total = total + 1
+						warehousing_out_order := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 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)
+						operation_time := time.Now().Unix()
+
+						creater := c.GetAdminUserInfo().AdminUser.Id
+						//创建一个出库单
+						drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+							WarehouseOutOrderNumber: warehousing_out_order,
+							OperationTime:           operation_time,
+							OrgId:                   c.GetAdminUserInfo().CurrentOrgId,
+							Creater:                 creater,
+							Ctime:                   time.Now().Unix(),
+							Status:                  1,
+							WarehouseOutTime:        advice.AdviceDate,
+							Type:                    0,
+							PatientId:               advice.PatientId,
+							IsCheck:                 1,
+							IsSys:                   1,
+						}
+
+						//查询今日是否有出库数据
+						lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, advice.AdviceDate, tx, 1)
+
+						if lastWarehouseOut.ID == 0 {
+							service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+						}
+						//出库
+						warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+							WarehouseOutOrderNumber: warehousing_out_order,
+							DrugId:                  advice.DrugId,
+							Count:                   total_count,
+							Price:                   0,
+							TotalPrice:              0,
+							Status:                  1,
+							Ctime:                   advice.AdviceDate,
+							Mtime:                   advice.AdviceDate,
+							Remark:                  "",
+							OrgId:                   advice.UserOrgId,
+							Type:                    0,
+							Manufacturer:            selfBasedrug.Manufacturer,
+							Dealer:                  selfBasedrug.Dealer,
+							RetailPrice:             0,
+							RetailTotalPrice:        0,
+							CountUnit:               advice.PrescribingNumberUnit,
+							ExpiryDate:              0,
+							ProductDate:             0,
+							Number:                  "",
+							BatchNumber:             "",
+							IsSys:                   0,
+							WarehouseInfoId:         0,
+							AdminUserId:             0,
+							StockCount:              "",
+							IsCheck:                 1,
+							SysRecordTime:           advice.AdviceDate,
+							PatientId:               advice.PatientId,
+							AdviceId:                advice.ID,
+							ClassType:               "",
+						}
+						warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+						for _, it := range warehousingOutInfo {
+
+							medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+							drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+							//出库逻辑
+							service.AutoSelfDrugDeliverInfoFourtyTwo(c.GetAdminUserInfo().CurrentOrgId, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+							//查询剩余库存
+							stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+							var sum_count int64
+							for _, its := range stockInfo {
+								if its.MaxUnit == medical.MaxUnit {
+									its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+								}
+								sum_count += its.StockMaxNumber + its.StockMinNumber
+							}
+							service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+						}
+					}
+
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "3",
+						"advice": advice,
+					})
+					return
+				}
+
+			}
+
+		}
+
 		advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 		for _, item := range advices {
 
 			}
 
 		}
+
+		//自备药
+
+		selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.CurrentOrgId)
+
+		if selfPrescriptionOutOpen.IsOpen == 1 {
+
+			db := service.XTWriteDB()
+			tx := db.Begin()
+			defer func() {
+				if r := recover(); r != nil {
+					tx.Rollback()
+				} else {
+					tx.Commit()
+				}
+			}()
+
+			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+
+			if selfBasedrug.IsSelfDrug == 1 {
+
+				//查询是否有库存
+				info, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(advice.DrugId, advice.PatientId, advice.UserOrgId, tx)
+
+				if len(info) > 0 {
+					var total_count int64
+					var prescribing_number_total int64
+					for _, item := range info {
+						if item.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							item.StockMaxNumber = item.StockMaxNumber * selfBasedrug.MinNumber
+						}
+
+						total_count += item.StockMaxNumber + item.StockMinNumber
+					}
+
+					//判断单位是否相等
+					if selfBasedrug.MaxUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						prescribing_number_total = count * selfBasedrug.MinNumber
+					}
+
+					if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						prescribing_number_total = count
+
+					}
+
+					if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						prescribing_number_total = count
+
+					}
+
+					if prescribing_number_total > total_count {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "3",
+							"advice": advice,
+						})
+						return
+					}
+					var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+					//出库
+					if prescribing_number_total <= total_count {
+						timeStr := time.Now().Format("2006-01-02")
+						timeArr := strings.Split(timeStr, "-")
+						total, _ := service.FindAllSelfDrugWarehouseOut(c.GetAdminUserInfo().CurrentOrgId, tx)
+
+						total = total + 1
+						warehousing_out_order := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 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)
+						operation_time := time.Now().Unix()
+
+						creater := c.GetAdminUserInfo().AdminUser.Id
+						//创建一个出库单
+						drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+							WarehouseOutOrderNumber: warehousing_out_order,
+							OperationTime:           operation_time,
+							OrgId:                   c.GetAdminUserInfo().CurrentOrgId,
+							Creater:                 creater,
+							Ctime:                   time.Now().Unix(),
+							Status:                  1,
+							WarehouseOutTime:        advice.AdviceDate,
+							Type:                    0,
+							PatientId:               advice.PatientId,
+							IsCheck:                 1,
+							IsSys:                   1,
+						}
+
+						//查询今日是否有出库数据
+						lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, advice.AdviceDate, tx, 1)
+
+						if lastWarehouseOut.ID == 0 {
+							service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+						}
+						//出库
+						warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+							WarehouseOutOrderNumber: warehousing_out_order,
+							DrugId:                  advice.DrugId,
+							Count:                   total_count,
+							Price:                   0,
+							TotalPrice:              0,
+							Status:                  1,
+							Ctime:                   advice.AdviceDate,
+							Mtime:                   advice.AdviceDate,
+							Remark:                  "",
+							OrgId:                   advice.UserOrgId,
+							Type:                    0,
+							Manufacturer:            selfBasedrug.Manufacturer,
+							Dealer:                  selfBasedrug.Dealer,
+							RetailPrice:             0,
+							RetailTotalPrice:        0,
+							CountUnit:               advice.PrescribingNumberUnit,
+							ExpiryDate:              0,
+							ProductDate:             0,
+							Number:                  "",
+							BatchNumber:             "",
+							IsSys:                   0,
+							WarehouseInfoId:         0,
+							AdminUserId:             0,
+							StockCount:              "",
+							IsCheck:                 1,
+							SysRecordTime:           advice.AdviceDate,
+							PatientId:               advice.PatientId,
+							AdviceId:                advice.ID,
+							ClassType:               "",
+						}
+						warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+						for _, it := range warehousingOutInfo {
+
+							medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+							drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+							//出库逻辑
+							service.AutoSelfDrugDeliverInfoFourtyTwo(c.GetAdminUserInfo().CurrentOrgId, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+							//查询剩余库存
+							stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+							var sum_count int64
+							for _, its := range stockInfo {
+								if its.MaxUnit == medical.MaxUnit {
+									its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+								}
+								sum_count += its.StockMaxNumber + its.StockMinNumber
+							}
+							service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+						}
+					}
+
+				}
+
+			}
+
+		}
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":    "1",
 			"advice": advice,

controllers/self_drug_api_congtroller.go

 	beego.Router("/api/drug/getallselfdrugwarehouseout", &SelfDrugApiController{}, "Get:GetAllSelfDrugWarehouseOut")
 
 	beego.Router("/api/drug/deleteselfwarehouseoutlist", &SelfDrugApiController{}, "Get:DeleteSelfWarehouseOutList")
+
+	beego.Router("/api/drug/getselfDrugwarehouseoutdetailbypatientid", &SelfDrugApiController{}, "Get:GetSelfDrugWarehouseOutDetailByPatientId")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
 func (c *SelfDrugApiController) GetSelfDrugWarehouseInfoByID() {
 
 	id, _ := c.GetInt64("id")
-	info, _ := service.GetSelfDrugWarehouseInfoByID(id)
-	warehouseInfo, _ := service.GetSelfDrugWarehouseInfo(info.WarehousingId)
+	info, _ := service.GetSelfDrugWarehouseInfoByIDOne(id)
+	warehouseInfo, _ := service.GetSelfDrugWarehouseInfo(id)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	id, _ := c.GetInt64("id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	outInfo, _ := service.GetSelfDrugWarehouseOutById(id)
-
+	outOne, _ := service.GetSelfDrugWarehouseOutOne(id)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
 
+	patients, _ := service.GetAllpatient(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"outInfo":          outInfo,
 		"manufacturerList": manufacturerList,
 		"dealerList":       dealerList,
 		"drugTypeList":     drugTypeList,
+		"patients":         patients,
+		"outOne":           outOne,
 	})
 }
 
 		}
 	}()
 	patient_id, _ := c.GetInt64("patient_id")
+	fmt.Println("patinet_id=-------------------------------", patient_id)
 	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
+	fmt.Println("patinet_id=-------------------------------", warehouse_out_id)
 	ctime := time.Now().Unix()
 	adminUserInfo := c.GetAdminUserInfo()
-	warehousing_out_time := c.GetString("warehousing_out_time")
-	warehousingOutDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_out_time)
-	if parseDateErr != nil {
-		c.ErrorLog("日期(%v)解析错误：%v", warehousingOutDate, parseDateErr)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	timeStr := time.Now().Format("2006-01-02")
-	timeArr := strings.Split(timeStr, "-")
-	total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.CurrentOrgId, tx)
 
-	total = total + 1
-	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 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)
-	operation_time := time.Now().Unix()
-
-	creater := adminUserInfo.AdminUser.Id
-	//创建一个出库单
-	warehouseOut := models.XtSelfDrugWarehouseOut{
-		WarehouseOutOrderNumber: warehousing_out_order,
-		OperationTime:           operation_time,
-		OrgId:                   adminUserInfo.CurrentOrgId,
-		Creater:                 creater,
-		Ctime:                   ctime,
-		Status:                  1,
-		WarehouseOutTime:        warehousingOutDate.Unix(),
-		Type:                    0,
-		PatientId:               patient_id,
-		IsCheck:                 2,
-	}
-
-	lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOut(adminUserInfo.CurrentOrgId, tx)
+	lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutOne(adminUserInfo.CurrentOrgId, tx)
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 
 				warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
 					ID:                      id,
-					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+					WarehouseOutOrderNumber: lastWarehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          lastWarehouseOut.ID,
 					DrugId:                  drug_id,
 					Count:                   count,
 					Price:                   0,
 					TotalPrice:              0,
 					Status:                  1,
-					Ctime:                   warehousingOutDate.Unix(),
+					Ctime:                   lastWarehouseOut.WarehouseOutTime,
 					Mtime:                   ctime,
 					Remark:                  remark,
 					OrgId:                   adminUserInfo.CurrentOrgId,
 					AdminUserId:             0,
 					StockCount:              stock_count,
 					IsCheck:                 2,
-					SysRecordTime:           warehousingOutDate.Unix(),
+					SysRecordTime:           lastWarehouseOut.WarehouseOutTime,
 					PatientId:               patient_id,
 					ClassType:               class_type,
 				}
 func (c *SelfDrugApiController) GetSelfDrugQuery() {
 
 	keyword := c.GetString("keyword")
-	limit, _ := c.GetInt64("limit")
-	page, _ := c.GetInt64("page")
 	var goodIds []int64
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 	drugList, _ := service.GetDrugNameByword(org_id, keyword)
 	for _, it := range drugList {
 		goodIds = append(goodIds, it.ID)
 	}
-	list, total, _ := service.GetSelfDrugQuery(orgId, goodIds, limit, page)
+	list, total, _ := service.GetSelfDrugQuery(orgId, goodIds)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, org_id)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	patient_id, _ := c.GetInt64("patient_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
 		}
 		endTime = theTime.Unix()
 	}
-	list, total, _ := service.GetSelfDrugFlow(drug_id, startTime, endTime, orgId, page, limit)
+	list, total, _ := service.GetSelfDrugFlow(drug_id, startTime, endTime, orgId, page, limit, patient_id)
 	drug, _ := service.GetSelfBasedrugById(drug_id, orgId)
 	patients, _ := service.GetAllpatient(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	patient_id, _ := c.GetInt64("patient_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
 		endTime = theTime.Unix()
 	}
 
-	list, total, _ := service.GetSelfDrugBatchNumberList(drug_id, startTime, endTime, orgId, page, limit)
+	list, total, _ := service.GetSelfDrugBatchNumberList(drug_id, startTime, endTime, orgId, page, limit, patient_id)
 	drug, _ := service.GetSelfBasedrugById(drug_id, orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":  list,
 	appId := c.GetAdminUserInfo().CurrentAppId
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	check_type, _ := c.GetInt64("check_type")
 	patient_id, _ := c.GetInt64("patient_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 		endTime = theTime.Unix()
 	}
 
-	list, total, _ := service.GetAllSelfDrugWarehouseOut(startTime, endTime, orgId, page, limit, patient_id, keyword)
+	list, total, _ := service.GetAllSelfDrugWarehouseOut(startTime, endTime, orgId, page, limit, patient_id, keyword, check_type)
 	doctorList, _ := service.GetAllDoctorList(orgId, appId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":       list,
 		"ok": "msg",
 	})
 }
+
+func (c *SelfDrugApiController) GetSelfDrugWarehouseOutDetailByPatientId() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	page, _ := c.GetInt64("page")
+
+	limit, _ := c.GetInt64("limit")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, total, _ := service.GetSelfDrugWarehouseOutDetailByPatientId(patient_id, page, limit, orgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}

service/dialysis_service.go

 	}
 	return err
 }
+
+func GetHisExecutionDoctorsThree(orgid int64, patientid int64, id int64, tx *gorm.DB) (doctorAdvice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = tx.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? and patient_id = ? AND id = ? and status = 1 and execution_state = 1", orgid, patientid, id).Find(&doctorAdvice).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return doctorAdvice, err
+		}
+	}
+	return doctorAdvice, err
+}

service/self_drug_service.go

 	return selfDrugWarehouseInfo, err
 }
 
+func GetSelfDrugWarehouseInfoByIDOne(id int64) (selfDrugWarehouseInfo []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and status=1", id).Preload("BaseDrugLib", "status=1").Find(&selfDrugWarehouseInfo).Error
+
+	return selfDrugWarehouseInfo, err
+}
+
 func GetSelfDrugWarehouseInfo(id int64) (models.XtSelfDrugWarehouse, error) {
 
 	warehouse := models.XtSelfDrugWarehouse{}
 	return outInfo, err
 }
 
-func GetSelfDrugWarehouseOutById(id int64) (models.XtSelfDrugWarehouseOutInfo, error) {
+func GetSelfDrugWarehouseOutById(id int64) (outInfo []*models.XtSelfDrugWarehouseOutInfo, err error) {
 
-	outInfo := models.XtSelfDrugWarehouseOutInfo{}
 	err = XTReadDB().Where("warehouse_out_id = ? and status =1", id).Preload("BaseDrugLib", "status=1").Find(&outInfo).Error
 
 	return outInfo, err
 }
 
-func GetSelfDrugQuery(user_org_id int64, ids []int64, limit int64, page int64) (drug []*models.XtSelfDrugStockCount, total int64, err error) {
+func GetSelfDrugWarehouseOutOne(id int64) (models.XtSelfDrugWarehouseOut, error) {
+
+	out := models.XtSelfDrugWarehouseOut{}
+	err = XTReadDB().Where("id = ? and status =1", id).Find(&out).Error
+
+	return out, err
+}
+
+func GetSelfDrugQuery(user_org_id int64, ids []int64) (drug []*models.XtSelfDrugStockCount, total int64, err error) {
 
 	db := XTReadDB().Model(&drug).Where("status=1")
-	offset := (page - 1) * limit
+
 	if len(ids) > 0 {
 		db = db.Where("drug_id in(?)", ids)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Where("user_org_id = ? and status=1", user_org_id).Preload("BaseDrugLib", "org_id = ? and status =1", user_org_id).Find(&drug).Error
+	err = db.Count(&total).Where("user_org_id = ? and status=1", user_org_id).Preload("BaseDrugLib", "org_id = ? and status =1", user_org_id).Find(&drug).Error
 
 	return drug, total, err
 }
 
 func ReturnSelfCheckWarehouseingInfo(id int64, orgid int64, tx *gorm.DB) error {
 
-	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	err := tx.Model(&models.XtSelfDrugWarehouse{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
 	return err
 }
 
-func GetSelfDrugFlow(drug_id int64, start_time int64, end_time int64, user_org_id int64, page int64, limit int64) (flow []*models.XtSelfDrugFlow, total int64, err error) {
+func GetSelfDrugFlow(drug_id int64, start_time int64, end_time int64, user_org_id int64, page int64, limit int64, patient_id int64) (flow []*models.XtSelfDrugFlow, total int64, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status=1")
 
 	if drug_id > 0 {
 		db = db.Where("drug_id =?", drug_id)
 	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
 	if start_time > 0 {
 		db = db.Where("ctime>=?", start_time)
 	}
 	return lib, err
 }
 
-func GetSelfDrugBatchNumberList(drug_id int64, start_time int64, end_time int64, user_org_id int64, page int64, limit int64) (flow []*models.XtSelfDrugFlow, total int64, err error) {
+func GetSelfDrugBatchNumberList(drug_id int64, start_time int64, end_time int64, user_org_id int64, page int64, limit int64, patient_id int64) (flow []*models.XtSelfDrugFlow, total int64, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type =1")
 
 	if user_org_id > 0 {
 		db = db.Where("user_org_id =?", user_org_id)
 	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
 
 	offset := (page - 1) * limit
 
 	return err
 }
 
-func GetAllSelfDrugWarehouseOut(start_time int64, end_time int64, org_id int64, page int64, limit int64, patient_id int64, keyword string) (out []*models.XtSelfDrugWarehouseOut, total int64, err error) {
+func GetAllSelfDrugWarehouseOut(start_time int64, end_time int64, org_id int64, page int64, limit int64, patient_id int64, keyword string, check_type int64) (out []*models.XtSelfDrugWarehouseOut, total int64, err error) {
 
 	db := XTReadDB().Model(&out).Where("status=1")
 	offset := (page - 1) * limit
 	if patient_id > 0 {
 		db = db.Where("patient_id = ?", patient_id)
 	}
+	if check_type > 0 {
+		db = db.Where("is_check=?", check_type)
+	}
 
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("operation_time desc").Find(&out).Error
 
 
 	warehouseOut := models.XtSelfDrugWarehouseOut{}
 
-	err := XTWriteDB().Model(&warehouseOut).Where("id = ? an status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&warehouseOut).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 
 	err = XTWriteDB().Model(&models.XtSelfDrugWarehouseOutInfo{}).Where("warehouse_out_id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 
 	return flow, err
 }
 
-func GetSelfDrugLastWarehouseOutTwety(orgid int64, record_date int64, tx *gorm.DB) (models.XtSelfDrugWarehouseOut, error) {
+func GetSelfDrugLastWarehouseOutTwety(orgid int64, record_date int64, tx *gorm.DB, is_sys int64) (models.XtSelfDrugWarehouseOut, error) {
 	out := models.XtSelfDrugWarehouseOut{}
-	err := tx.Where("org_id = ? and status = 1 and warehouse_out_time = ?", orgid, record_date).Find(&out).Error
+	err := tx.Where("org_id = ? and status = 1 and warehouse_out_time = ? and is_sys =?", orgid, record_date, is_sys).Find(&out).Error
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()
 	}
 	return out, err
 }
+
+func GetSelfHisPrescriptionAdviceByID(id int64, tx *gorm.DB) (advices []*models.HisDoctorAdviceInfo, err error) {
+	err = tx.Model(&models.HisDoctorAdviceInfo{}).Where("prescription_id = ? AND status = 1", id).Find(&advices).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return advices, err
+		}
+	}
+	return
+}
+
+func GetSelfNewDrugWarehouseOutInfoSix(drugid int64, patient_id int64, record_date int64, org_id int64, advice_id int64, warehouse_info_id int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
+
+	info := models.DrugWarehouseOutInfo{}
+	var err error
+	err = tx.Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ? and status = 1 and advice_id = ? and warehouse_info_id = ?", drugid, patient_id, record_date, org_id, advice_id, warehouse_info_id).Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+
+	return info, err
+}
+
+func UpdateSelfDrugWarehouseOutInfoTen(patient_id int64, sys_record_time int64, advice_id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time  = ? and status=1 and advice_id = ?", patient_id, sys_record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetSelfWarehouseInfoByWarehouseInfoTwo(drug_id int64, patient_id int64, org_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("drug_id =? and patient_id =? and status=1 and org_id =?", drug_id, patient_id, org_id).Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
+func GetSelfDrugWarehouseOutDetailByPatientId(patient_id int64, page int64, limit int64, user_org_id int64) (out []*models.XtSelfDrugStockCount, total int64, err error) {
+
+	db := XTReadDB().Model(&out).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	offset := (page - 1) * limit
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("BaseDrugLib", "status=1 and org_id = ?", user_org_id).Find(&out).Error
+
+	return out, total, err
+}

service/stock_service.go

 	return out, err
 }
 
+func GetSelfDrugLastWarehouseOutOne(id int64, tx *gorm.DB) (models.XtSelfDrugWarehouseOut, error) {
+	out := models.XtSelfDrugWarehouseOut{}
+	err := tx.Where("id = ? and status = 1", id).Find(&out).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return out, err
+		}
+
+	}
+	return out, err
+}
+
 func GetDrugWarehouseOutListById(warehouse_out_id int64, orgId int64) (info []*models.DrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("warehouse_out_id = ? and org_id  =? and status = 1", warehouse_out_id, orgId).Preload("BaseDrugLib", "status=1").Find(&info).Error

service/warhouse_service.go

 			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
+		//更新出库id
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+		}
+		if lastDrugOutInfo.ID > 0 {
+
+			//删除在新增
+			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+
+		}
+
 		drugWareInfo, _ := GetSelfLastWarehouseOutInfoById(advice.DrugId, tx)
 		drugflow := models.XtSelfDrugFlow{
 			WarehouseOutId:          warehouseout.ID,
 
 		CreateSelfDrugFlowOne(drugflow, tx)
 
-		//更新出库id
-		UpdateSelfDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+		//出库数量相加
+		AddSelfDrugCount(advice.DrugId, orgID, advice.PatientId, drugflow.Count, tx)
+
+		fmt.Println("advice-------------------------------------", advice.ID)
+		fmt.Println("warehouse-------------------------------------", warehouse.ID)
+		fmt.Println("over_count====================================", over_count)
 
 		return nil
 
 			}
 			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+		}
+		if lastDrugOutInfo.ID > 0 {
+
+			//删除在新增
+			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+
+		}
 		drugWareInfo, _ := GetSelfLastWarehouseOutInfoById(advice.DrugId, tx)
 		drugflow := models.XtSelfDrugFlow{
 			WarehouseOutId:          warehouseout.ID,
 		}
 
 		CreateSelfDrugFlowOne(drugflow, tx)
+
+		AddSelfDrugCount(advice.DrugId, orgID, advice.PatientId, drugflow.Count, tx)
+		// 出库完成后，要将该批次库存清零
+
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		advice.CountUnit = drup.MinUnit
+
+		AutoSelfDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, unit, tx)
+	}
+
+	return
+}
+
+// 药品手动出库 递归方式
+func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, warehouseout *models.XtSelfDrugWarehouseOut, drup *models.BaseDrugLib, advice *models.XtSelfDrugWarehouseOutInfo, unit string, tx *gorm.DB) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+
+	var stock_number int64 = 0
+
+	var drug_price float64
+	if advice.CountUnit == drup.MaxUnit {
+		deliver_number = prescribingNumber * drup.MinNumber
+
+	} else {
+		deliver_number = prescribingNumber
+
+	}
+	if advice.CountUnit == drup.MaxUnit {
+		drug_price = drup.RetailPrice
+	}
+	fmt.Println(drug_price)
+
+	if advice.CountUnit == drup.MinUnit {
+		drug_price = drup.MinPrice
+	}
+
+	if advice.CountUnit != drup.MaxUnit || advice.CountUnit != drup.MinUnit {
+		drug_price = drup.RetailPrice
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	lastWarehouse, _ := FindSelfLastDrugWarehousingInfoByID(advice.DrugId, advice.PatientId, tx)
+
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeSelfMaxNumber(lastWarehouse.ID, stockMax, tx)
+			UpdateSelfMinNumber(lastWarehouse.ID, stockMin, tx)
+
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeSelfMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
+
+	}
+
+	warehouse, err := FindSelfLastDrugWarehousingInfoByID(advice.DrugId, advice.PatientId, tx)
+
+	// 将该批次的剩余库存数量转换为拆零数量
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if stock_number >= deliver_number {
+
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
+
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
+		}
+
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		warehouse.Mtime = time.Now().Unix()
+
+		if warehouse.StockMinNumber < minNumber {
+			//fmt.Println("金4")
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			}
+			if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			}
+		} else {
+			//fmt.Println("金5")
+			if minNumber > 0 {
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
+			}
+
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				//fmt.Println("6")
+				if warehouse.StockMinNumber > 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
+				}
+
+			}
+
+		}
+
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		errThree := UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
+
+		if errThree != nil {
+			return errors.New("扣减库存失败")
+		}
+
+		//查询该药品剩余库存
+		infolist, _ := FindSelfDrugWarehouseInfoFlushCount(advice.DrugId, advice.OrgId, tx)
+		var over_count int64
+		for _, its := range infolist {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			over_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
 		//更新出库id
-		UpdateSelfDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+		}
+		if lastDrugOutInfo.ID > 0 {
+
+			//删除在新增
+			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+
+		}
+
+		drugWareInfo, _ := GetSelfLastWarehouseOutInfoById(advice.DrugId, tx)
+		drugflow := models.XtSelfDrugFlow{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
+			Count:                   deliver_number,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
+			WarehousingDetailId:     warehouse.ID,
+			OverCount:               over_count,
+			RetailPrice:             drug_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
+			OperateTime:             time.Now().Unix(),
+		}
+		if warehouse.RetailPrice == 0 {
+			drugflow.Price = advice.Price
+		}
+
+		CreateSelfDrugFlowOne(drugflow, tx)
+
+		//出库数量相加
+		AddSelfDrugCount(advice.DrugId, orgID, advice.PatientId, drugflow.Count, tx)
+
+		fmt.Println("advice-------------------------------------", advice.ID)
+		fmt.Println("warehouse-------------------------------------", warehouse.ID)
+		fmt.Println("over_count====================================", over_count)
+
+		return nil
+
+	} else {
+		stock_number_int := strconv.FormatInt(stock_number, 10)
+		stock_number_int_count, _ := strconv.ParseFloat(stock_number_int, 64)
+		drug_price = stock_number_int_count * advice.Price
+		//扣减库存
+		warehouse.StockMaxNumber = 0
+		warehouse.StockMinNumber = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
+		if errThree != nil {
+			return errThree
+		}
+
+		//查询该药品剩余库存
+		infolist, _ := FindDrugWarehouseInfoFlushCount(advice.DrugId, advice.OrgId)
+		var over_count int64
+		for _, its := range infolist {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			over_count += its.StockMaxNumber + its.StockMinNumber
+		}
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+		}
+		if lastDrugOutInfo.ID > 0 {
+
+			//删除在新增
+			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+
+			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
+
+		}
+		drugWareInfo, _ := GetSelfLastWarehouseOutInfoById(advice.DrugId, tx)
+		drugflow := models.XtSelfDrugFlow{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
+			Count:                   stock_number,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
+			OverCount:               over_count,
+			RetailPrice:             drug_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
+			WarehousingDetailId:     warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
+			OperateTime:             time.Now().Unix(),
+		}
+
+		CreateSelfDrugFlowOne(drugflow, tx)
+
+		AddSelfDrugCount(advice.DrugId, orgID, advice.PatientId, drugflow.Count, tx)
 		// 出库完成后，要将该批次库存清零
 
 		prescribingNumber_two_temp := deliver_number - stock_number