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

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id 10344
+		subscibe.OrgId = 10510 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10510 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 11211 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英10344或4
+		subscibe.OrgId = 10510 //机构id小英10344或4或10666
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,8 +337,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10510 //机构id小英10344或4或10666
+		adminUserInfo.CurrentAppId = 11211 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -542,7 +542,7 @@ func (c *DialysisApiController) PostPrescription() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 11*60*60
+				advice.StartTime = recordDate.Unix() + 9*60*60
 			}
 		}
 		// 抗凝剂名称
@@ -1523,7 +1523,7 @@ func (c *DialysisApiController) PostSoulution() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 11*60*60
+				advice.StartTime = recordDate.Unix() + 9*60*60
 			}
 		}
 		// 抗凝剂名称

controllers/doctor_schedule_api_controller.go

@@ -1,13 +1,14 @@
 package controllers
 
 import (
+	"fmt"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"time"
 )
 
 type DoctorScheduleApiController struct {
@@ -282,17 +283,17 @@ func (this *DoctorScheduleApiController) AddSchedule() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	doctor_id, _ := this.GetInt64("doctor_id")
-	fmt.Println("doctor_id", doctor_id)
+
 	doctor_type, _ := this.GetInt64("doctor_type")
-	fmt.Println("doctor_type", doctor_type)
+
 	start_time, _ := this.GetInt64("start_time")
-	fmt.Println("start_time", start_time)
+
 	end_time, _ := this.GetInt64("end_time")
-	fmt.Println("end_time", end_time)
+
 	schedule_type, _ := this.GetInt64("schedule_type")
-	fmt.Println("schedule_type", schedule_type)
+
 	schedule_week, _ := this.GetInt64("schedule_week")
-	fmt.Println("schedule_week", schedule_week)
+
 	schedule_date, _ := this.GetInt64("schedule_date")
 	schedule := models.StaffSchedule{
 		DoctorId:     doctor_id,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2178,7 +2178,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				}
 
 				if schedulePatient.ScheduleType == 2 {
-					advice.StartTime = recordDate.Unix() + 10*60*60
+					advice.StartTime = recordDate.Unix() + 9*60*60
 				}
 			}
 			// 抗凝剂名称
@@ -4191,7 +4191,7 @@ func (c *DialysisAPIController) PostSolution() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 10*60*60
+				advice.StartTime = recordDate.Unix() + 9*60*60
 			}
 		}
 		// 抗凝剂名称
@@ -4483,7 +4483,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10610 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4551,7 +4551,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -9628,9 +9628,6 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		}
 	}
-
-	fmt.Println("config233322333223", config.IsOpen)
-
 	//血透客户
 	if config.IsOpen == 2 || config.IsOpen == 0 {
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1288,6 +1288,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		ids = strings.Split(advice_ids, ",")
 		if len(execution_time) <= 0 {
 			utils.ErrorLog("execution_time")
+			tx.Rollback()
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
@@ -1297,6 +1298,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		if errs != nil {
 			utils.ErrorLog(errs.Error())
+			tx.Rollback()
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
@@ -1304,16 +1306,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		var err error
 		for _, item := range advices {
 			if item.ExecutionState == 1 {
+				tx.Rollback()
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
 				return
 			}
 
 			if item.Checker >= 0 && item.Checker == adminInfo.AdminUser.Id {
+				tx.Rollback()
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 				return
 			}
 
 			if item.StartTime > theTime.Unix() {
+				tx.Rollback()
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExceBeforeStart)
 				return
 			}
@@ -1341,6 +1346,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					infor, _ := service.GetDialysisInformationByRecordDate(item.PatientId, item.AdviceDate, item.UserOrgId, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
+						tx.Rollback()
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
 						return
 					}
@@ -1436,7 +1442,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 					advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
-					tx.Commit()
+					tx.Rollback()
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "7",
 						"advice": advice,
@@ -1489,6 +1495,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				var total int64
 				var prescribing_number_total int64
 
+				//保存处方出库
 				config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
 
 				if config.IsOpen != 1 {
@@ -1529,7 +1536,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
-							tx.Commit()
+							tx.Rollback()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",
 								"advice": advice,
@@ -1555,7 +1562,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
-							tx.Commit()
+							tx.Rollback()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "3",
 								"advice": advice,
@@ -1578,7 +1585,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
-							tx.Commit()
+							tx.Rollback()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "2",
 								"advice": advice,
@@ -1588,10 +1595,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 
-					fmt.Println("hhahhahahahhhhhha", prescribing_number_total)
-					fmt.Println("total0000000000000", total)
-					fmt.Println("medical22222222222222", medical.IsUse)
-					fmt.Println("config.isp", config.IsOpen)
 					if prescribing_number_total <= total {
 
 						pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
@@ -1601,9 +1604,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if config.IsOpen != 1 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 
-									//service.NewHisDrugsDelivery(adminInfo.Org.Id, creater, &advice, tx)
-									//service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-
 									if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 10265 {
 										//查询该药品是否有出库记录
 										flowMap, _ := service.GetDrugFLowByAdviceByIdOne(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate, tx)
@@ -1625,7 +1625,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 												}
 												service.CreateDrugError(drugError)
 											}
-											tx.Commit()
+											tx.Rollback()
 											c.ServeSuccessJSON(map[string]interface{}{
 												"msg":    "6",
 												"advice": advice,
@@ -1662,7 +1662,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 												}
 												service.CreateDrugError(drugError)
 											}
-											tx.Commit()
+											tx.Rollback()
 											c.ServeSuccessJSON(map[string]interface{}{
 												"msg":    "6",
 												"advice": advice,
@@ -1693,26 +1693,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 
-				//fmt.Println("config+++++++++++", config.IsOpen)
-				//fmt.Println("config+++++++++++", item.UserOrgId)
-				//
-				//if config.IsOpen == 1 && item.UserOrgId == 10402 {
-				//
-				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-				//	//更新字典里面的库存
-				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-				//	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.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-				//	//剩余库存
-				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				//}
-
 			}
 		}
 		tx.Commit()

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1431,16 +1431,16 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			}
 		}
 
-		if org_id == 10206 || org_id == 10344 {
-			hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			project, _ := service.GetHisPrescriptionProjectList(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			if len(hisAdvice) > 0 {
-				service.UpdateHisAdviceObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			}
-			if len(project) > 0 {
-				service.UpdateProjectObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
-			}
-		}
+		//if org_id == 10206 || org_id == 10344 {
+		//	hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	project, _ := service.GetHisPrescriptionProjectList(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	if len(hisAdvice) > 0 {
+		//		service.UpdateHisAdviceObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	}
+		//	if len(project) > 0 {
+		//		service.UpdateProjectObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+		//	}
+		//}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "ok",

controllers/patient_api_controller.go

@@ -2798,7 +2798,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//1.判断是否启用药品管理和自备药出库功能
 
-		//药品管理信息
+		//药品自动出库开关管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
 
 		if drugStockConfig.IsOpen == 1 {
@@ -2806,46 +2806,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advices, _ := service.GetHisExecutionDoctorsTwo(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
 				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
-				//查询这个患者这个患者这个药已经出库的所有数量
-				//advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-				//drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-				//var total_count int64 // 现在出库的
-				//var drug_count int64  // 已经出库的
-				//for _, it := range advicelist {
-				//	if it.PrescribingNumberUnit == medical.MaxUnit {
-				//		prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-				//		prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				//		total_count += prenumber * medical.MinNumber
-				//	}
-				//	if it.PrescribingNumberUnit == medical.MinUnit {
-				//		prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-				//		prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				//		total_count += prenumber
-				//	}
-				//
-				//}
-				//
-				//
-				//for _, its := range drugoutlist {
-				//	if its.CountUnit == medical.MaxUnit {
-				//		drug_count += its.Count * medical.MinNumber
-				//	}
-				//	if its.CountUnit == medical.MinUnit {
-				//		drug_count += its.Count
-				//	}
-				//}
-				//fmt.Println("total_count23232323232323232wode",total_count)
-				//fmt.Println("total_count23232323232323232wode",drug_count)
-				//if total_count == drug_count {
-				//	c.ServeSuccessJSON(map[string]interface{}{
-				//		"msg":    "1",
-				//		"advice": advice,
-				//	})
-				//	return
-				//}
 
 				var total int64
 				var prescribing_number_total int64
+				//药品保存处方出库
 				config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
 				if config.IsOpen != 1 {
 					//查询默认出库仓库

controllers/pharmacy_controller.go

@@ -179,7 +179,7 @@ func (this *PharmacyController) IssuedDrug() {
 	}
 
 	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
-	fmt.Println("LIST=================", list)
+
 	var flist []models.TmpPatientOne
 	if len(list) > 0 {
 		for _, item := range list {
@@ -335,6 +335,10 @@ func (this *PharmacyController) GetPharmacyContent() {
 	appId := this.GetAdminUserInfo().CurrentAppId
 	adminUserES, _ := service.GetAllAdminUserES(orgid, appId)
 	allDoctor, _ := service.GetAllDoctor(orgid, appId)
+
+	prescriptionListByToDay, _ := service.GetPrescriptionListByToDay(orgid, patient_id, stime)
+
+	diagnose, _ := service.FindAllDiagnose(orgid)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -349,7 +353,8 @@ func (this *PharmacyController) GetPharmacyContent() {
 	return_value["zoneList"] = zoneList
 	return_value["adminUserES"] = adminUserES
 	return_value["doctors"] = allDoctor
-
+	return_value["prescription"] = prescriptionListByToDay
+	return_value["diagnose"] = diagnose
 	//if is_medicine == 1{发药时间先不展示
 	//	return_value["time"] = time
 	//}
@@ -384,48 +389,50 @@ func (this *PharmacyController) DispensingMedicine() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
+	tmp_bool := service.IsPharmacyConfig(orgid)
+	if tmp_bool == true {
+		advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+		if len(advicelist) > 0 {
+			var total int64
+			var prescribing_number_total int64
+			for _, item := range advicelist {
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				//如果是药房发药的方式
+				if medical.IsPharmacy == 1 {
+					houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
+					//查询该药品是否有库存
+					list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
+
+					//判断单位是否相等
+					if medical.MaxUnit == item.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count * medical.MinNumber
+					}
+					if medical.MinUnit == item.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count
+					}
 
-	advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
-	if len(advicelist) > 0 {
-		var total int64
-		var prescribing_number_total int64
-		for _, item := range advicelist {
-			//查询改药品信息
-			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			//如果是药房发药的方式
-			if medical.IsPharmacy == 1 {
-				houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
-				//查询该药品是否有库存
-				list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
-
-				//判断单位是否相等
-				if medical.MaxUnit == item.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					//转化为最小单位
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count * medical.MinNumber
-				}
-				if medical.MinUnit == item.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count
-				}
-
-				if medical.IsUse != 1 {
-					//如果出库数量大于库存数量
-					if prescribing_number_total > total {
-						err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
-						if err != nil {
-							utils.ErrorLog(err.Error())
-							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
-							return
+					if medical.IsUse != 1 {
+						//如果出库数量大于库存数量
+						if prescribing_number_total > total {
+							err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "库存不足")
+							if err != nil {
+								utils.ErrorLog(err.Error())
+								this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+								return
+							}
 						}
 					}
 				}
-			}
 
+			}
 		}
 	}
 

controllers/schedule_api_controller.go

@@ -742,16 +742,16 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						}
 					}
 
-					if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
-						hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						if len(hisAdvice) > 0 {
-							service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						}
-						if len(project) > 0 {
-							service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
-						}
-					}
+					//if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
+					//	hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	if len(hisAdvice) > 0 {
+					//		service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	}
+					//	if len(project) > 0 {
+					//		service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+					//	}
+					//}
 					service.SaveSch(&schedule)
 				}
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)

controllers/self_drug_api_congtroller.go

@@ -2950,7 +2950,7 @@ func (this *SelfDrugApiController) GetGoodExpiryDateQuery() {
 		goodIds = append(goodIds, it.ID)
 	}
 	list, total, err := service.GetGoodExpiryDateQuery(storehouse_id, expiry_type, keyword, page, limit, orgId, ids, goodIds, nowtime, endTime)
-	fmt.Println("total233223322332323232323223", total)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 
 	if err != nil {

controllers/sign_api_controller.go

@@ -1223,7 +1223,7 @@ func (this *SignApiController) ToAutoDrug() {
 
 func (this *SignApiController) ToAutoDiagnose() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//order, _ := service.GetDialysisOrderTotalCount()
 	//
@@ -1238,22 +1238,24 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	list, _ := service.GetAllDialysisOrder(10490)
-	for _, item := range list {
-		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
-	}
+	//list, _ := service.GetAllDialysisOrder(10469)
+	//for _, item := range list {
+	//	schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+	//}
 
-	//drugList, _ := service.GetAllBaseDrugList(10571)
+	//drugList, _ := service.GetAllBaseDrugList(10653)
 	//for _, item := range drugList {
-	//	//service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
+	//	service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
 	//
-	//	service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
+	//	//service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
 	//}
 
 	//goodList, _ := service.GetAllGoodList(10571)
 	//for _, item := range goodList {
 	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)
 	//}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})

service/gobal_config_service.go

@@ -1368,3 +1368,12 @@ func GetMobiledialysiOrder(user_org_id int64, patient_id int64, record_date int6
 
 	return dialysisOrder, err
 }
+
+func GetPrescriptionListByToDay(user_org_id int64, patient_id int64, record_Date int64) (models.HisPrescriptionInfo, error) {
+
+	prescriptionInfo := models.HisPrescriptionInfo{}
+
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status =1", user_org_id, patient_id, record_Date).Find(&prescriptionInfo).Error
+
+	return prescriptionInfo, err
+}

service/his_service.go

@@ -905,6 +905,44 @@ func CreateHisDoctorAdviceOne(s *models.HisDoctorAdviceInfo, tx *gorm.DB) (err e
 	return
 }
 
+func GetHisToday(patient_id int64, advice_date int64, user_org_id int64, drug_id int64, tx *gorm.DB) (list []*models.HisDoctorAdviceInfo, err error) {
+
+	err = tx.Where("patient_id = ? and advice_date = ? and user_org_id = ? and status =1 and drug_id = ?", patient_id, advice_date, user_org_id, drug_id).Find(&list).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return list, err
+		}
+	}
+	return list, err
+}
+
+func GetLastDrugAuto(advice_id int64, drug_id int64, advice_date int64, patient_id int64, user_org_id int64, tx *gorm.DB) (models.DrugAutomaticReduceDetail, error) {
+
+	automaticReduceDetail := models.DrugAutomaticReduceDetail{}
+
+	err := XTReadDB().Where("advice_id = ? and drug_id = ? and record_time= ? and patient_id =? and status=1 and org_id = ?", advice_id, drug_id, advice_date, patient_id, user_org_id).Find(&automaticReduceDetail).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return automaticReduceDetail, err
+		}
+	}
+	return automaticReduceDetail, err
+}
+
+func UpdateTodayHis(drug_id int64, advice_date int64, patient_id int64, user_org_id int64, min_unit string, count_total int64, id int64, tx *gorm.DB) (models.XtDrugAutomaticReduceDetail, error) {
+
+	drugAutomaticReduceDetail := models.XtDrugAutomaticReduceDetail{}
+
+	err = tx.Model(&drugAutomaticReduceDetail).Where("drug_id = ? and record_time = ? and patient_id =? and org_id = ? and status=1 and advice_id = ?", drug_id, advice_date, patient_id, user_org_id, id).Updates(map[string]interface{}{"count": count_total, "count_unit": min_unit}).Error
+	if err != nil {
+		tx.Rollback()
+		return drugAutomaticReduceDetail, err
+	}
+	return drugAutomaticReduceDetail, err
+}
+
 func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
 
 	tx := writeDb.Begin()
@@ -3081,3 +3119,157 @@ func UpdateGood(good_id int64, user_org_id int64, packing_price float64) (models
 
 	return goodInfo, err
 }
+
+func GetHistory(id int64, user_org_id int64, tx *gorm.DB) (models.HisDoctorAdviceInfo, error) {
+
+	adviceInfo := models.HisDoctorAdviceInfo{}
+
+	err := tx.Where("id = ? and user_org_id = ? and status=1", id, user_org_id).Find(&adviceInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return adviceInfo, err
+		}
+	}
+	return adviceInfo, err
+}
+
+func GetLastHisDoctorAdviceById(patient_id int64, user_org_id int64, advice_date int64, drug_id int64, tx *gorm.DB) (models.HisDoctorAdviceInfo, error) {
+
+	adviceInfo := models.HisDoctorAdviceInfo{}
+
+	err := tx.Where("patient_id = ? and user_org_id = ? and advice_date = ? and drug_id = ? and status =1", patient_id, user_org_id, advice_date, drug_id).Last(&adviceInfo).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return adviceInfo, err
+		}
+	}
+	return adviceInfo, err
+}
+
+func GetDrugWarehouseOutInfoByAdviceId(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, tx *gorm.DB) (outInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and drug_id = ? and status=1 and advice_id = 0", patient_id, user_org_id, sys_record_date, drug_id).Find(&outInfo).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func GetDrugWarehouseOutInfoByAdviceIdTwo(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, advice_id int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
+
+	outInfo := models.DrugWarehouseOutInfo{}
+	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and drug_id = ? and status=1 and advice_id = ?", patient_id, user_org_id, sys_record_date, drug_id, advice_id).Order("id desc").First(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func GetDrugAutoOutInfoByAdviceIdTwo(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, advice_id int64, tx *gorm.DB) (models.DrugAutomaticReduceDetail, error) {
+
+	outInfo := models.DrugAutomaticReduceDetail{}
+	err = tx.Where("patient_id = ? and org_id =? and record_time = ? and drug_id = ? and status=1 and advice_id = ?", patient_id, user_org_id, sys_record_date, drug_id, advice_id).Order("id desc").First(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func GetDrugAutoDetail(patient_id int64, org_id int64, record_time int64, drug_id int64, tx *gorm.DB) (automaticReduceDetail []*models.DrugAutomaticReduceDetail, err error) {
+
+	err = tx.Where("patient_id = ? and org_id = ? and record_time =? and drug_id = ? and status =1 and advice_id = 0", patient_id, org_id, record_time, drug_id).Find(&automaticReduceDetail).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return automaticReduceDetail, err
+		}
+	}
+	return automaticReduceDetail, err
+}
+
+func UpdateDrugAutoDetail(id int64, advice_id int64, tx *gorm.DB) error {
+
+	drugAutomaticReduceDetail := models.DrugAutomaticReduceDetail{}
+
+	err := tx.Model(&drugAutomaticReduceDetail).Where("id = ? and status=1", id).Updates(map[string]interface{}{"advice_id": advice_id}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateDrugOutInfoByAdviceId(id int64, advice_id int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
+
+	info := models.DrugWarehouseOutInfo{}
+
+	err := tx.Model(&info).Where("id = ? and status=1", id).Updates(map[string]interface{}{"advice_id": advice_id}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return info, err
+	}
+
+	return info, err
+}
+
+func ModifyDrugWarehouseOutInfoByNumber(id int64, cha_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count - ?", cha_count)).Error
+
+	err = tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).UpdateColumn("over_count", gorm.Expr("over_count + ?", cha_count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ModifyDrugAuToWarehouseOut(id int64, cha_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugAutomaticReduceDetail{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count - ?", cha_count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func DeleteDrugWarehouseOutInfoByNumber(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func DeleteDrugWarehouseAutoByNumber(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugAutomaticReduceDetail{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/new_warehouse_service.go

@@ -3682,9 +3682,9 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 	var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
-	fmt.Println(deliver_number)
-	fmt.Println(deliver_number_one)
-	fmt.Println(stock_number)
+	//fmt.Println(deliver_number)
+	//fmt.Println(deliver_number_one)
+	//fmt.Println(stock_number)
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
@@ -3857,12 +3857,6 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 		//扣减库存数据
 		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
 
-		//更改字典里面的价格
-		//if advice.UserOrgId == 10265 || advice.UserOrgId == 10215 {
-		//
-		//	UpdateNewBasePrice(lastWarehouse.DrugId, lastWarehouse.RetailPrice, tx)
-		//}
-		//
 		////查询剩余库存
 		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
 		var sum_count int64
@@ -3873,55 +3867,54 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
-		if orgID != 10188 && orgID != 10217 && orgID != 3877 {
-			warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseout.ID,
-				Status:                  1,
-				Ctime:                   advice.RecordDate,
-				Mtime:                   time.Now().Unix(),
-				Remark:                  warehouse.Remark,
-				OrgId:                   orgID,
-				Type:                    1,
-				Manufacturer:            warehouse.Manufacturer,
-				Dealer:                  warehouse.Dealer,
-				IsSys:                   1,
-				SysRecordTime:           advice.RecordDate,
-				DrugId:                  advice.DrugId,
-				Number:                  warehouse.Number,
-				BatchNumber:             warehouse.BatchNumber,
-				Price:                   warehouse.RetailPrice,
-				CountUnit:               drup.MinUnit,
-				RetailPrice:             warehouse.RetailPrice,
-				ProductDate:             warehouse.ProductDate,
-				ExpiryDate:              warehouse.ExpiryDate,
-				PatientId:               advice.PatientId,
-				Count:                   deliver_number, //出最小单位
-				WarehouseInfoId:         warehouse.ID,
-				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-				StorehouseId:            storeConfig.DrugStorehouseOut,
-				IsCheck:                 1,
-				OverCount:               sum_count,
-				AdviceId:                advice.ID,
-			}
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			RetailPrice:             warehouse.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   deliver_number, //出最小单位
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
 
-			//查询今日该药品该患者是否有出库数据
-			lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
 
-			if lastDrugOutInfo.ID == 0 {
-				//删除在新增
-				UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
-				AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
-			}
-			if lastDrugOutInfo.ID > 0 {
+		if lastDrugOutInfo.ID == 0 {
+			//删除在新增
+			UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		if lastDrugOutInfo.ID > 0 {
 
-				//删除在新增
-				UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
+			//删除在新增
+			UpdateNewDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
 
-				AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
 
-			}
 		}
+
 		//
 		var out_count int64
 		var cancel_count int64
@@ -3938,44 +3931,18 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			cancel_count += item.Count
 		}
 
-		if deliver_number_one-(out_count-cancel_count) >= 0 {
-			if (deliver_number_one - out_count - cancel_count) != 0 {
+		fmt.Println("已经出库数据", out_count)
 
-				if orgID == 10217 || orgID == 10188 || orgID == 3877 {
-					warehouseOutInfo := &models.DrugWarehouseOutInfo{
-						WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-						WarehouseOutId:          warehouseout.ID,
-						Status:                  1,
-						Ctime:                   advice.RecordDate,
-						Mtime:                   time.Now().Unix(),
-						Remark:                  warehouse.Remark,
-						OrgId:                   orgID,
-						Type:                    1,
-						Manufacturer:            warehouse.Manufacturer,
-						Dealer:                  warehouse.Dealer,
-						IsSys:                   1,
-						SysRecordTime:           advice.RecordDate,
-						DrugId:                  advice.DrugId,
-						Number:                  warehouse.Number,
-						BatchNumber:             warehouse.BatchNumber,
-						Price:                   warehouse.RetailPrice,
-						CountUnit:               drup.MinUnit,
-						RetailPrice:             warehouse.RetailPrice,
-						ProductDate:             warehouse.ProductDate,
-						ExpiryDate:              warehouse.ExpiryDate,
-						PatientId:               advice.PatientId,
-						Count:                   deliver_number_one - (out_count - cancel_count), //出最小单位
-						WarehouseInfoId:         warehouse.ID,
-						SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-						StorehouseId:            storeConfig.DrugStorehouseOut,
-						IsCheck:                 1,
-						OverCount:               sum_count,
-						AdviceId:                advice.ID,
-					}
+		fmt.Println("已经退库数据", cancel_count)
 
-					AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		fmt.Println("当前正在出库的数据", deliver_number_one)
+
+		fmt.Println("差", deliver_number_one-out_count-cancel_count)
+
+		//如果本次出库数据大于历史出库数据 新增1条退库流水
+		if deliver_number_one-(out_count-cancel_count) >= 0 {
+			if (deliver_number_one - out_count - cancel_count) != 0 {
 
-				}
 				lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
 
 				drugflow := models.DrugFlow{
@@ -4143,7 +4110,6 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			AdviceId:                advice.ID,
 		}
-
 		AddNewSigleDrugAutoReduceRecordInfo(details, tx)
 
 		return nil
@@ -4476,3 +4442,792 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 
 	return
 }
+
+func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64, unit string, tx *gorm.DB) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+
+	var stock_number int64 = 0
+
+	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
+	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number = count * drup.MinNumber
+
+	} else {
+		deliver_number = count
+
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	storeConfig, _ := GetNewAllStoreHouseConfig(advice.UserOrgId, tx)
+	lastWarehouse, _ := FindNewLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut, 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
+
+			ChangeNewMaxNumber(lastWarehouse.ID, stockMax, tx)
+			UpdateNewMinNumber(lastWarehouse.ID, stockMin, tx)
+
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeNewMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
+
+	}
+
+	warehouse, _ := FindNewLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut, 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
+
+	}
+
+	//fmt.Println("stock_number", stock_number)
+	//fmt.Println("deliver_number=============", deliver_number)
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	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()
+
+		//fmt.Println("hahhahahah", warehouse.StockMinNumber)
+		//fmt.Println("howowowoowow", minNumber)
+		if warehouse.StockMinNumber < minNumber {
+
+			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 {
+
+			if minNumber > 0 {
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
+			}
+
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+
+				if warehouse.StockMinNumber > 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
+				}
+
+			}
+
+		}
+
+		//fmt.Println("maxNumber", maxNumber)
+		//fmt.Println("minNumber", maxNumber)
+		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
+		}
+
+		//fmt.Println("warehouse.StockMaxNumber-------------------", warehouse.StockMaxNumber)
+		//
+		//fmt.Println("warehouse.StockMinNumber-------------------", warehouse.StockMinNumber)
+
+		//扣减库存数据
+		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
+
+		////查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			RetailPrice:             warehouse.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   deliver_number, //出最小单位
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
+
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		//如果有数量则新增数量
+		if lastDrugOutInfo.ID > 0 {
+
+			UpdateSigleDrugWarehouseOutInfoDetail(lastDrugOutInfo.ID, warehouseOutInfo.Count, tx)
+
+		}
+
+		drugflow := models.DrugFlow{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   deliver_number, //按最小单位计算,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               orgID,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 advice.ExecutionStaff,
+			IsSys:                   1,
+			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			LastPrice:               warehouse.Price,
+		}
+
+		CreateNewDrugFlowOne(drugflow, tx)
+
+		AddNewDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count, tx)
+
+		//查询是否存在数据
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   deliver_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+
+		//查找是否有数据
+		autoMaticReduceDetail, _ := GetDrugAutoMaticReduceDetail(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if autoMaticReduceDetail.ID == 0 {
+			AddNewSigleDrugAutoReduceRecordInfo(details, tx)
+		}
+
+		if autoMaticReduceDetail.ID > 0 {
+			UpdateNewSingleDrugAutoReduceRecordInfo(autoMaticReduceDetail.ID, deliver_number, tx)
+		}
+
+		return nil
+
+	} else {
+
+		info := models.XtDrugWarehouseInfo{
+			ID:                warehouse.ID,
+			WarehousingId:     warehouse.WarehousingId,
+			DrugId:            warehouse.DrugId,
+			Number:            warehouse.Number,
+			ProductDate:       warehouse.ProductDate,
+			ExpiryDate:        warehouse.ExpiryDate,
+			WarehousingCount:  warehouse.WarehousingCount,
+			Price:             warehouse.RetailPrice,
+			TotalPrice:        warehouse.TotalPrice,
+			Dealer:            warehouse.Dealer,
+			Manufacturer:      warehouse.Manufacturer,
+			Remark:            warehouse.Remark,
+			Ctime:             warehouse.Ctime,
+			Mtime:             warehouse.Mtime,
+			Status:            1,
+			OrgId:             warehouse.OrgId,
+			IsReturn:          warehouse.IsReturn,
+			WarehousingOrder:  warehouse.WarehousingOrder,
+			Type:              warehouse.Type,
+			RetailPrice:       warehouse.RetailPrice,
+			RetailTotalPrice:  warehouse.RetailPrice,
+			StockMaxNumber:    0,
+			StockMinNumber:    0,
+			BatchNumber:       warehouse.BatchNumber,
+			MaxUnit:           warehouse.MaxUnit,
+			MinUnit:           drup.MinUnit,
+			WarehousingInfoId: warehouse.WarehousingInfoId,
+			SupplyWarehouseId: warehouse.SupplyWarehouseId,
+			StorehouseId:      storeConfig.DrugStorehouseOut,
+			IsCheck:           1,
+		}
+		//扣减库存
+		UpDateNewDrugWarehouseInfoByStock(&info, tx)
+
+		//查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   stock_number,
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
+
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		//如果有数量则新增数量
+		if lastDrugOutInfo.ID > 0 {
+
+			UpdateSigleDrugWarehouseOutInfoDetail(lastDrugOutInfo.ID, warehouseOutInfo.Count, tx)
+
+		}
+
+		//查询是否存在数据
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   stock_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+
+		//查找是否有数据
+		autoMaticReduceDetail, _ := GetDrugAutoMaticReduceDetail(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if autoMaticReduceDetail.ID == 0 {
+			AddNewSigleDrugAutoReduceRecordInfo(details, tx)
+		}
+
+		if autoMaticReduceDetail.ID > 0 {
+			UpdateNewSingleDrugAutoReduceRecordInfo(autoMaticReduceDetail.ID, deliver_number, tx)
+		}
+
+		drugflow := models.DrugFlow{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   stock_number,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               orgID,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 advice.ExecutionStaff,
+			IsSys:                   1,
+			PatientId:               advice.PatientId,
+			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			LastPrice:               warehouse.Price,
+			SystemTime:              advice.AdviceDate,
+		}
+
+		CreateNewDrugFlowOne(drugflow, tx)
+		//出库数量相加
+		AddNewDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count, tx)
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		overPlusNumber := float64(prescribingNumber_two_temp)
+
+		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
+		advice.PrescribingNumberUnit = drup.MinUnit
+
+		HisStoryBloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber, unit, tx)
+	}
+
+	return
+}
+
+func NewHisDrugCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, cha_count int64, drug models.BaseDrugLibSeven, tx *gorm.DB) (err error) {
+
+	storeConfig, _ := GetNewAllStoreHouseConfig(advice.UserOrgId, tx)
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	drugOutInfo, _ := GetDrugWarehouseOutInfoByAdviceIdTwo(advice.PatientId, advice.UserOrgId, advice.AdviceDate, advice.DrugId, advice.ID, tx)
+
+	if drugOutInfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count * drug.MinNumber
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+	if out_count >= cha_count {
+		//退库 退回 cha_count 的数量
+		ModifyNewDrugWarehouseInfoStockMinNumber(cha_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteDrugWarehouseOutInfoByNumber(drugOutInfo.ID, tx)
+		}
+
+		//减去出库单里面的数量
+		ModifyDrugWarehouseOutInfoByNumber(drugOutInfo.ID, cha_count, tx)
+
+		//创建退库单
+		//查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		//创建退库单
+		operation_time := time.Now().Unix()
+		ctime := time.Now().Unix()
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+		cancelStock := models.DrugCancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        advice.UserOrgId,
+			Creater:      advice.ExecutionStaff,
+			Ctime:        ctime,
+			Status:       1,
+			ReturnTime:   advice.AdviceDate,
+			Dealer:       0,
+			Manufacturer: 0,
+			Type:         1,
+			StorehouseId: storeConfig.DrugStorehouseOut,
+			IsCheck:      1,
+		}
+
+		_, errCode := FindNewDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+		if errCode == gorm.ErrRecordNotFound {
+			AddNewSigleDrugCancelStock(&cancelStock, tx)
+		}
+		lastDrugCancelStock, _ := FindNewLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+
+		manufactureName, _ := GetNewManufactureById(drugOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(drugOutInfo.Dealer, tx)
+		cancelInfo, _ := GetNewLastDrugCancelStockById(advice.UserOrgId, tx)
+		cancelStockInfo := models.DrugCancelStockInfo{
+			OrderNumber:      cancelInfo.OrderNumber,
+			CancelStockId:    lastDrugCancelStock.ID,
+			DrugId:           advice.DrugId,
+			Count:            cha_count,
+			Status:           1,
+			Ctime:            advice.AdviceDate,
+			Mtime:            time.Now().Unix(),
+			OrgId:            advice.UserOrgId,
+			Type:             1,
+			Manufacturer:     manufactureName.ManufacturerName,
+			Dealer:           dealer.DealerName,
+			Total:            0,
+			RetailPrice:      drugOutInfo.RetailPrice,
+			RetailTotalPrice: drugOutInfo.RetailTotalPrice,
+			Price:            drugOutInfo.Price,
+			RegisterAccount:  "",
+			Remark:           drugOutInfo.Remark,
+			BatchNumber:      drugOutInfo.BatchNumber,
+			MaxUnit:          drugOutInfo.CountUnit,
+			ProductDate:      drugOutInfo.ProductDate,
+			ExpiryDate:       drugOutInfo.ExpiryDate,
+			BatchNumberId:    drugOutInfo.WarehouseInfoId,
+			StorehouseId:     storeConfig.DrugStorehouseOut,
+			IsCheck:          1,
+		}
+		CreatedNewCancelStock(cancelStockInfo, tx)
+
+		flow := models.DrugFlow{
+			WarehousingId:           drugOutInfo.WarehouseInfoId,
+			DrugId:                  drugOutInfo.DrugId,
+			Number:                  "",
+			BatchNumber:             drugOutInfo.BatchNumber,
+			Count:                   cha_count,
+			UserOrgId:               advice.UserOrgId,
+			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			ConsumableType:          7,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           cancelStock.ID,
+			CancelOrderNumber:       cancelStock.OrderNumber,
+			Manufacturer:            drugOutInfo.Manufacturer,
+			Dealer:                  drugOutInfo.Dealer,
+			Creator:                 advice.ExecutionStaff,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			Price:                   drugOutInfo.RetailPrice,
+			WarehousingDetailId:     drugOutInfo.ID,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       lastDrugCancelStock.ID,
+			ExpireDate:              drugOutInfo.ExpiryDate,
+			ProductDate:             drugOutInfo.ProductDate,
+			MaxUnit:                 drugOutInfo.CountUnit,
+			MinUnit:                 "",
+			AdviceId:                advice.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			LastPrice:               drugOutInfo.Price,
+			OverCount:               sum_count,
+		}
+		CreateNewDrugFlowOne(flow, tx)
+
+		AddNewCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count, tx)
+
+		ReduceNewDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count, tx)
+
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//把该出库单的数量退完
+		ModifyNewDrugWarehouseInfoStockMinNumber(out_count, drugOutInfo.DrugId, drugOutInfo.OrgId, drugOutInfo.WarehouseInfoId, tx)
+
+		//删除该出库单
+		DeleteDrugWarehouseOutInfoByNumber(drugOutInfo.ID, tx)
+
+		//创建退库单
+		//查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		//创建退库单
+		operation_time := time.Now().Unix()
+		ctime := time.Now().Unix()
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+		cancelStock := models.DrugCancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        advice.UserOrgId,
+			Creater:      advice.ExecutionStaff,
+			Ctime:        ctime,
+			Status:       1,
+			ReturnTime:   advice.AdviceDate,
+			Dealer:       0,
+			Manufacturer: 0,
+			Type:         1,
+			StorehouseId: storeConfig.DrugStorehouseOut,
+			IsCheck:      1,
+		}
+
+		_, errCode := FindNewDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+		if errCode == gorm.ErrRecordNotFound {
+			AddNewSigleDrugCancelStock(&cancelStock, tx)
+		}
+		lastDrugCancelStock, _ := FindNewLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId, tx)
+
+		manufactureName, _ := GetNewManufactureById(drugOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(drugOutInfo.Dealer, tx)
+		cancelInfo, _ := GetNewLastDrugCancelStockById(advice.UserOrgId, tx)
+		cancelStockInfo := models.DrugCancelStockInfo{
+			OrderNumber:      cancelInfo.OrderNumber,
+			CancelStockId:    lastDrugCancelStock.ID,
+			DrugId:           advice.DrugId,
+			Count:            out_count,
+			Status:           1,
+			Ctime:            advice.AdviceDate,
+			Mtime:            time.Now().Unix(),
+			OrgId:            advice.UserOrgId,
+			Type:             1,
+			Manufacturer:     manufactureName.ManufacturerName,
+			Dealer:           dealer.DealerName,
+			Total:            0,
+			RetailPrice:      drugOutInfo.RetailPrice,
+			RetailTotalPrice: drugOutInfo.RetailTotalPrice,
+			Price:            drugOutInfo.Price,
+			RegisterAccount:  "",
+			Remark:           drugOutInfo.Remark,
+			BatchNumber:      drugOutInfo.BatchNumber,
+			MaxUnit:          drugOutInfo.CountUnit,
+			ProductDate:      drugOutInfo.ProductDate,
+			ExpiryDate:       drugOutInfo.ExpiryDate,
+			BatchNumberId:    drugOutInfo.WarehouseInfoId,
+			StorehouseId:     storeConfig.DrugStorehouseOut,
+			IsCheck:          1,
+		}
+		CreatedNewCancelStock(cancelStockInfo, tx)
+
+		flow := models.DrugFlow{
+			WarehousingId:           drugOutInfo.WarehouseInfoId,
+			DrugId:                  drugOutInfo.DrugId,
+			Number:                  "",
+			BatchNumber:             drugOutInfo.BatchNumber,
+			Count:                   out_count,
+			UserOrgId:               advice.UserOrgId,
+			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			ConsumableType:          7,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           cancelStock.ID,
+			CancelOrderNumber:       cancelStock.OrderNumber,
+			Manufacturer:            drugOutInfo.Manufacturer,
+			Dealer:                  drugOutInfo.Dealer,
+			Creator:                 advice.ExecutionStaff,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			Price:                   drugOutInfo.RetailPrice,
+			WarehousingDetailId:     drugOutInfo.ID,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       lastDrugCancelStock.ID,
+			ExpireDate:              drugOutInfo.ExpiryDate,
+			ProductDate:             drugOutInfo.ProductDate,
+			MaxUnit:                 drugOutInfo.CountUnit,
+			MinUnit:                 "",
+			AdviceId:                advice.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			LastPrice:               drugOutInfo.Price,
+			OverCount:               sum_count,
+		}
+		CreateNewDrugFlowOne(flow, tx)
+
+		AddNewCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count, tx)
+
+		ReduceNewDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisDrugCancelInfo(orgID, creater, advice, over_count, drug, tx)
+	}
+	return err
+
+}
+
+func NewHisDrugAutoCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, cha_count int64, drug models.BaseDrugLibSeven, tx *gorm.DB) error {
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	drugOutInfo, _ := GetDrugAutoOutInfoByAdviceIdTwo(advice.PatientId, advice.UserOrgId, advice.AdviceDate, advice.DrugId, advice.ID, tx)
+
+	if drugOutInfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count * drug.MinNumber
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	if drugOutInfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+
+		out_count = drugOutInfo.Count
+	}
+
+	//fmt.Println("out_count++++==++", out_count)
+	//fmt.Println("cha_count-------", cha_count)
+
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+	if out_count >= cha_count {
+		//减去出库单里面的数量
+		ModifyDrugAuToWarehouseOut(drugOutInfo.ID, cha_count, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteDrugWarehouseAutoByNumber(drugOutInfo.ID, tx)
+		}
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//删除该出库单
+		DeleteDrugWarehouseAutoByNumber(drugOutInfo.ID, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisDrugAutoCancelInfo(orgID, creater, advice, over_count, drug, tx)
+	}
+	return err
+}

service/pharmacy_service.go

@@ -300,7 +300,6 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				DataSources:  "临时医嘱",
 				Remarks:      v.Remark,
 				DrugId:       v.DrugId,
-				Price:        v.Price,
 			})
 		}
 		return
@@ -370,7 +369,8 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionState: v.ExecutionState,
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
-				Price:          v.Price,
+				//Price:        v.Price,
+
 			})
 		}
 		return
@@ -867,12 +867,16 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 	if len(adviceList) > 0 {
 		for _, item := range adviceList {
 
-			//扣减库存
-			err = HisDrugsDelivery(orgid, creater, item)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
+			pharmacyConfig := IsPharmacyConfig(orgid)
+			if pharmacyConfig == true {
+				//扣减库存
+				err = HisDrugsDelivery(orgid, creater, item)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
 			}
+
 			//修改发药状态
 			err = UpdateIsMedicalHisAdvice(item.ID)
 			if err != nil {

service/schedule_service.go

@@ -1524,8 +1524,14 @@ func GetDoctorAdviceListSchedule(org_id int64, patient_id int64) (advices []*mod
 func GetLastDialysisPrescriptionTwo(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.NewDialysisPrescription, error) {
 
 	dialysisprescription := models.NewDialysisPrescription{}
-	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date = ?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
-	return dialysisprescription, err
+
+	if org_id == 10340 {
+		err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date <= ?", org_id, patient_id, mode_id, schedule_date).Order("id desc").Last(&dialysisprescription).Error
+		return dialysisprescription, err
+	} else {
+		err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date = ?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
+		return dialysisprescription, err
+	}
 
 }
 
@@ -1838,23 +1844,23 @@ func GetHisPrescriptionProjectList(patient_id int64, record_date int64, user_org
 
 func UpdateProjectObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
-	err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("patient_id = ? and record_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("patient_id = ? and record_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
 func UpdateAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
-	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
 func UpdateHisAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
-	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 

service/self_drug_service.go

@@ -2002,7 +2002,7 @@ func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWar
 
 func UpdateDrugById(id int64, orgid int64, limit_count int64, total_count int64) error {
 
-	err := XTWriteDB().Model(&models.BaseDrugLibTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "total_count": total_count}).Error
+	err := XTWriteDB().Model(&models.BaseDrugLibTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "sum_count": total_count}).Error
 	return err
 }
 

service/sign_service.go

@@ -2112,14 +2112,22 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 
 func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", 21767).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1", 28449).Find(&list).Error
 
 	return list, err
 }
 
-func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64) error {
+func GetLastScheduleByUserOrg(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64) (models.Schedule, error) {
 
-	err := XTWriteDB().Model(&models.XtSchedule{}).Where("schedule_date =? and user_org_id =? and patient_id =?", schedule_date, user_org_id, patient_id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1}).Error
+	schedule := models.Schedule{}
+	err := XTReadDB().Where("patient_id = ? and schedule_date = ? and status=0", patient_id, schedule_date).First(&schedule).Error
+
+	return schedule, err
+}
+
+func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64, id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ?", id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1}).Error
 	return err
 }
 

service/stock_service.go

@@ -876,6 +876,11 @@ func FindLastDrugWarehousingInfoByID(drug_id int64, storehouse_id int64) (info m
 	return info, err
 }
 
+func FindLastDrugWarehousingInfoByIDTwo(drug_id int64, storehouse_id int64) (info models.XtDrugWarehouseInfo, err error) {
+	err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 and storehouse_id = ? and is_check = 1", drug_id, storehouse_id).Order("ctime").Last(&info).Error
+	return info, err
+}
+
 func FindNewLastDrugWarehousingInfoByID(drug_id int64, storehouse_id int64, tx *gorm.DB) (info models.XtDrugWarehouseInfo, err error) {
 	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and storehouse_id = ? and is_check = 1", drug_id, storehouse_id).Order("ctime").First(&info).Error
 	if err != gorm.ErrRecordNotFound {
@@ -3468,6 +3473,20 @@ func AddNewSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo, tx *gorm
 	}
 	return err
 }
+
+func UpdateSigleDrugWarehouseOutInfoDetail(id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status=1", id).UpdateColumn("count", gorm.Expr("count + ?", count)).Error
+
+	err = tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status=1", id).UpdateColumn("over_count", gorm.Expr("over_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
 func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
 	ut := writeDb.Begin()
 	err := ut.Create(&detail).Error
@@ -3485,6 +3504,31 @@ func AddSigleDrugAutoReduceRecordInfo(detail *models.DrugAutomaticReduceDetail)
 
 }
 
+func GetDrugAutoMaticReduceDetail(drug_id int64, patient_id int64, record_time int64, org_id int64, adivce_id int64, warehouse_info_id int64, tx *gorm.DB) (models.DrugAutomaticReduceDetail, error) {
+
+	detail := models.DrugAutomaticReduceDetail{}
+	err := tx.Where("drug_id = ? and patient_id =? and record_time =? and org_id = ? and advice_id = ? and warehouse_info_id =?", drug_id, patient_id, record_time, org_id, adivce_id, warehouse_info_id).Find(&detail).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return detail, err
+		}
+	}
+	return detail, err
+}
+
+func UpdateNewSingleDrugAutoReduceRecordInfo(id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(models.DrugAutomaticReduceDetail{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count + ?", count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func AddNewSigleDrugAutoReduceRecordInfo(detail *models.DrugAutomaticReduceDetail, tx *gorm.DB) error {
 
 	err := tx.Create(&detail).Error
@@ -5923,14 +5967,11 @@ func DeleteDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time in
 	return err
 }
 
-func DeleteNewDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time int64, advice_id int64, tx *gorm.DB) error {
+func DeleteNewDrugAutoWarehouseSeven(drugid int64, patient_id int64, record_time int64, advice_id int64) error {
+
+	err := XTWriteDB().Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1", drugid, patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 
-	err := tx.Model(models.DrugAutomaticReduceDetail{}).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	err = tx.Model(models.DrugFlow{}).Where("drug_id = ? and patient_id = ? and system_time = ? and status = 1 and advice_id = ?", drugid, patient_id, record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
 	return err
 }
 

service/warhouse_service.go

@@ -7849,7 +7849,6 @@ func NewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdv
 	if isHasWay {
 		//判断当天当前机构有没有创建出库单，没有则创建
 		out, err := FindNewDrugStockOutByIsSys(orgID, 1, record_time, tx)
-		fmt.Println(out)
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		if err == gorm.ErrRecordNotFound {
 			timeStr := time.Now().Format("2006-01-02")
@@ -7890,8 +7889,7 @@ func NewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdv
 		drup, _ := FindNewBaseDrugLibRecord(orgID, advice.DrugId, tx)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-			fmt.Println(prescribingNumber)
-			NewBloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit, tx)
+			HisStoryBloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit, tx)
 
 		} else {
 			return errors.New("药品信息不存在")