2024/6/17

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = prod
+runmode = dev
 #dev/prod
 
 #

controllers/base_api_controller.go

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

controllers/his_api_controller.go

@@ -3366,7 +3366,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								if s.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 									total_count += prescribingNumberSeven
 								}
-								if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 10265 {
+								if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
 									storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 									lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
 									if s.Price != lastWarehouse.RetailPrice {
@@ -4985,7 +4985,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 					//查询该病人的该药品是否已经入库
 					selfdruginfo, _ := service.GetSelfDrugWarehouseInfoByInfo(item.ID, item.PatientId, item.AdviceDate, item.UserOrgId, item.DrugId, tx)
-					selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId)
+					selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId, tx)
 					var in_count int64
 					if len(selfdruginfo) > 0 {
 						for _, item := range selfdruginfo {
@@ -5689,7 +5689,6 @@ func (c *HisApiController) DeletePrescription() {
 	////同步到自备药
 	selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(c.GetAdminUserInfo().CurrentOrgId)
 
-	fmt.Println("selfPrescriptionOpen=---------------------------", selfPrescriptionOpen)
 	var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
 
 	if selfPrescriptionOpen.IsOpen == 1 {
@@ -5712,7 +5711,7 @@ func (c *HisApiController) DeletePrescription() {
 
 			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)
@@ -5740,7 +5739,7 @@ func (c *HisApiController) DeletePrescription() {
 			if lastWarehouseOut.ID == 0 {
 				service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
 			}
-			selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId)
+			selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId, tx)
 
 			var total_count int64
 			prescribingNumberSix := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
@@ -6383,7 +6382,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 			}
 		}()
 
-		selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+		selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId, tx)
 
 		var total_count int64
 		prescribingNumberSix := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -10672,3 +10672,208 @@ func (c *DialysisAPIController) BatchCheckAdvice() {
 
 	return
 }
+
+func (c *DialysisAPIController) GetAllMobileDrugList() {
+
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+
+	drugList, _ := service.GetAllDrugList(org_id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"drugList": drugList,
+	})
+}
+
+func (c *DialysisAPIController) SaveLongMobileAdvice() {
+
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	if dataBody["advice_type"] == nil || reflect.TypeOf(dataBody["advice_type"]).String() != "float64" {
+		utils.ErrorLog("advice_type")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adviceType := int64(dataBody["advice_type"].(float64))
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+	time_arr := strings.Split(startTime2, " ")
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
+	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+		utils.ErrorLog("advice_date")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	advice_date, _ := dataBody["advice_date"].(string)
+
+	var advicedateunix int64
+	if len(advice_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", advice_date+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		advicedateunix = theTime.Unix()
+	}
+
+	adviceDate := startTime2
+	if len(adviceDate) == 0 {
+		utils.ErrorLog("len(adviceDate) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err := time.ParseInLocation(timeLayout, adviceDate, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	AdviceDate := advicedateunix
+	RecordDate := advicedateunix
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	startTime, _ := dataBody["start_time"].(string)
+
+	if len(startTime) == 0 {
+		utils.ErrorLog("len(start_time) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	StartTime := theTime.Unix()
+
+	advice_name, _ := dataBody["advice_name"].(string)
+
+	advice_desc, _ := dataBody["advice_desc"].(string)
+
+	delivery_way, _ := dataBody["delivery_way"].(string)
+
+	execution_frequency, _ := dataBody["execution_frequency"].(string)
+
+	frequency_type := int64(dataBody["frequency_type"].(float64))
+
+	frequency_week, _ := dataBody["frequency_week"].(string)
+
+	prescribing_number := dataBody["prescribing_number"].(float64)
+
+	prescribing_number_unit := dataBody["prescribing_number_unit"].(string)
+
+	remark := dataBody["remark"].(string)
+
+	single_dose := dataBody["single_dose"].(float64)
+
+	single_dose_unit := dataBody["single_dose_unit"].(string)
+
+	patient_id := int64(dataBody["patient_id"].(float64))
+
+	day_count := int64(dataBody["day_count"].(float64))
+	advice_doctor := c.GetMobileAdminUserInfo().AdminUser.Id
+
+	adviceLast, _ := service.GetLastLongAdviceList(org_id)
+	var template_id = ""
+	adviceLastId := strconv.FormatInt(adviceLast.ID, 10)
+	template_id = "M" + adviceLastId
+	advice := models.DoctorAdvice{
+		UserOrgId:             org_id,
+		PatientId:             patient_id,
+		AdviceType:            adviceType,
+		AdviceDate:            AdviceDate,
+		StartTime:             StartTime,
+		AdviceName:            advice_name,
+		AdviceDesc:            advice_desc,
+		ReminderDate:          0,
+		SingleDose:            single_dose,
+		SingleDoseUnit:        single_dose_unit,
+		DrugSpec:              0,
+		DrugSpecUnit:          "",
+		PrescribingNumber:     prescribing_number,
+		PrescribingNumberUnit: prescribing_number_unit,
+		DeliveryWay:           delivery_way,
+		ExecutionFrequency:    execution_frequency,
+		AdviceDoctor:          advice_doctor,
+		Status:                1,
+		CreatedTime:           time.Now().Unix(),
+		UpdatedTime:           0,
+		AdviceAffirm:          "",
+		Remark:                remark,
+		StopTime:              0,
+		StopReason:            "",
+		StopDoctor:            0,
+		StopState:             0,
+		ParentId:              0,
+		ExecutionTime:         0,
+		ExecutionStaff:        0,
+		ExecutionState:        0,
+		Checker:               0,
+		RecordDate:            RecordDate,
+		DialysisOrderId:       0,
+		CheckTime:             0,
+		CheckState:            0,
+		AdviceId:              0,
+		RemindType:            0,
+		FrequencyType:         frequency_type,
+		DayCount:              day_count,
+		WeekDay:               frequency_week,
+		ChildDoctorAdvice:     nil,
+		TemplateId:            template_id,
+		Modifier:              0,
+		IsCheck:               0,
+		Way:                   0,
+		DrugId:                0,
+		DrugNameId:            0,
+		IsMedicine:            0,
+		PushStartTime:         0,
+		IsSettle:              0,
+		IsPrescription:        0,
+	}
+
+	service.CreateMobileAdivce(advice)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功!",
+	})
+
+}
+
+func (c *DialysisAPIController) GetLongDoctorAdviceByPatient() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+	app_id := c.GetMobileAdminUserInfo().App.Id
+	adviceList, _ := service.GetLongDoctorAdviceByPatient(patient_id, org_id)
+	adminRoles, _ := service.GetAllDoctorTwo(org_id, app_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+		"adminRoles": adminRoles,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -213,4 +213,10 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/sch/coversch", &DialysisAPIController{}, "Get:MobileCoverSch")
 
 	beego.Router("/m/api/batchcheckadvice", &DialysisAPIController{}, "Get:BatchCheckAdvice")
+
+	beego.Router("/m/api/getallmobiledruglist", &DialysisAPIController{}, "Get:GetAllMobileDrugList")
+
+	beego.Router("/m/api/savelongmobileadvice", &DialysisAPIController{}, "Post:SaveLongMobileAdvice")
+
+	beego.Router("/m/api/getlongdoctoradvicebypatient", &DialysisAPIController{}, "Get:GetLongDoctorAdviceByPatient")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -10,8 +10,6 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"github.com/jinzhu/gorm"
-
 	// "fmt"
 	"reflect"
 	"strconv"
@@ -582,6 +580,20 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 		return
 	}
 
+	//自备药
+	selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+	if selfPrescriptionOutOpenOne.IsOpen == 1 {
+		//查询库存是否是自备药
+		selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+		if selfBasedrug.IsSelfDrug == 1 {
+			creater := adminUserInfo.AdminUser.Id
+			//退库
+			service.SelfDrugAutoAddCancelInfoOne(&advice, creater)
+		}
+	}
+
 	//if !adminUserInfo.AdminUser.IsSuperAdmin && advice.AdviceDoctor != adminUserInfo.AdminUser.Id {
 	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
 	//	return
@@ -659,6 +671,50 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 
 			for _, item := range advices {
+
+				//自备药
+				selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+				if selfPrescriptionOutOpenOne.IsOpen == 1 {
+					//查询库存是否
+					selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+					if selfBasedrug.IsSelfDrug == 1 {
+						selfDrugStockCount, _ := service.GetSelfDrugStockCountByPatientId(advice.DrugId, advice.PatientId, advice.UserOrgId)
+						var prescribing_number_total_one int64
+						//判断单位是否相等
+						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_one = 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_one = 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_one = count
+						}
+						if prescribing_number_total_one > selfDrugStockCount.FlushCount {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
+
+						}
+					}
+
+				}
+
 				//恒泰中医院
 				if item.UserOrgId == 10490 || item.UserOrgId == 10602 {
 					if item.DrugId == 0 || item.DrugNameId == 0 {
@@ -692,6 +748,47 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		} else {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
+				//自备药
+				selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+				if selfPrescriptionOutOpenOne.IsOpen == 1 {
+					//查询库存是否
+					selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+					if selfBasedrug.IsSelfDrug == 1 {
+						selfDrugStockCount, _ := service.GetSelfDrugStockCountByPatientId(advice.DrugId, advice.PatientId, advice.UserOrgId)
+						var prescribing_number_total_one int64
+						//判断单位是否相等
+						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_one = 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_one = 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_one = count
+						}
+						if prescribing_number_total_one > selfDrugStockCount.FlushCount {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
+						}
+					}
+
+				}
 				//恒泰中医院
 				if item.UserOrgId == 10490 || item.UserOrgId == 10602 {
 					if item.DrugId == 0 || item.DrugNameId == 0 {
@@ -861,7 +958,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.Org.Id)
 
 		//自备药信息
-		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
+		//privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
 
 		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.Org.Id)
 
@@ -1162,107 +1259,107 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 
-		if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
-			if groupno > 0 {
-				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-				for _, item := range advices {
-
-					if item.ExecutionState == 1 && item.Way == 2 {
-						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
-
-						total = total + 1
-						warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-						number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-						number = number + total
-						warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-						//插入自备药出库单
-						outStock := models.XtSelfOutStock{
-							DrugName:       item.AdviceName,
-							DrugNameId:     item.DrugNameId,
-							DrugSpec:       item.AdviceDesc,
-							OutstoreNumber: count,
-							AdminUserId:    adminUserInfo.AdminUser.Id,
-							StorckTime:     item.AdviceDate,
-							UserOrgId:      adminUserInfo.Org.Id,
-							CreatedTime:    time.Now().Unix(),
-							Status:         1,
-							PatientId:      item.PatientId,
-							ExitMode:       2,
-							MedicId:        item.DrugId,
-							StockOutNumber: warehousing_out_order,
-						}
-						//查询 该患者是否已出库
-						out, errcode := service.GetSelfOutStock(adminUserInfo.Org.Id, item.AdviceDate, item.PatientId, item.AdviceName, item.AdviceDesc)
-
-						if errcode == gorm.ErrRecordNotFound {
-							service.CreateOutStock(&outStock)
-						} else if errcode == nil {
-							err := service.UpdatedSelfOutSatock(out.ID, &outStock)
-							fmt.Println("err", err)
-						}
-					}
-				}
-			} else {
-
-				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-				for _, item := range advices {
-
-					if item.ExecutionState == 1 && item.Way == 2 {
-
-						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
-
-						total = total + 1
-						warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-						number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-						number = number + total
-						warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-
-						//插入自备药出库单
-						outStock := models.XtSelfOutStock{
-							DrugName:       item.AdviceName,
-							DrugNameId:     item.DrugNameId,
-							DrugSpec:       item.AdviceDesc,
-							OutstoreNumber: count,
-							AdminUserId:    adminUserInfo.AdminUser.Id,
-							StorckTime:     item.AdviceDate,
-							UserOrgId:      adminUserInfo.Org.Id,
-							CreatedTime:    time.Now().Unix(),
-							Status:         1,
-							PatientId:      item.PatientId,
-							ExitMode:       2,
-							MedicId:        item.DrugId,
-							StockOutNumber: warehousing_out_order,
-						}
-
-						//查询 该患者是否已出库
-						out, errcode := service.GetSelfOutStock(adminUserInfo.Org.Id, item.AdviceDate, item.PatientId, item.AdviceName, item.AdviceDesc)
-
-						if errcode == gorm.ErrRecordNotFound {
-							service.CreateOutStock(&outStock)
-						} else if errcode == nil {
-							err := service.UpdatedSelfOutSatock(out.ID, &outStock)
-							fmt.Println("err", err)
-						}
-					}
-				}
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "1",
-					"advice": advice,
-					"ids":    ids,
-				})
-				return
-			}
-		}
+		//if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
+		//	if groupno > 0 {
+		//		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+		//		for _, item := range advices {
+		//
+		//			if item.ExecutionState == 1 && item.Way == 2 {
+		//				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+		//				count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+		//
+		//				timeStr := time.Now().Format("2006-01-02")
+		//				timeArr := strings.Split(timeStr, "-")
+		//				total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
+		//
+		//				total = total + 1
+		//				warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		//				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+		//				number = number + total
+		//				warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+		//				//插入自备药出库单
+		//				outStock := models.XtSelfOutStock{
+		//					DrugName:       item.AdviceName,
+		//					DrugNameId:     item.DrugNameId,
+		//					DrugSpec:       item.AdviceDesc,
+		//					OutstoreNumber: count,
+		//					AdminUserId:    adminUserInfo.AdminUser.Id,
+		//					StorckTime:     item.AdviceDate,
+		//					UserOrgId:      adminUserInfo.Org.Id,
+		//					CreatedTime:    time.Now().Unix(),
+		//					Status:         1,
+		//					PatientId:      item.PatientId,
+		//					ExitMode:       2,
+		//					MedicId:        item.DrugId,
+		//					StockOutNumber: warehousing_out_order,
+		//				}
+		//				//查询 该患者是否已出库
+		//				out, errcode := service.GetSelfOutStock(adminUserInfo.Org.Id, item.AdviceDate, item.PatientId, item.AdviceName, item.AdviceDesc)
+		//
+		//				if errcode == gorm.ErrRecordNotFound {
+		//					service.CreateOutStock(&outStock)
+		//				} else if errcode == nil {
+		//					err := service.UpdatedSelfOutSatock(out.ID, &outStock)
+		//					fmt.Println("err", err)
+		//				}
+		//			}
+		//		}
+		//	} else {
+		//
+		//		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+		//		for _, item := range advices {
+		//
+		//			if item.ExecutionState == 1 && item.Way == 2 {
+		//
+		//				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+		//				count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+		//
+		//				timeStr := time.Now().Format("2006-01-02")
+		//				timeArr := strings.Split(timeStr, "-")
+		//				total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
+		//
+		//				total = total + 1
+		//				warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+		//				number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+		//				number = number + total
+		//				warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+		//
+		//				//插入自备药出库单
+		//				outStock := models.XtSelfOutStock{
+		//					DrugName:       item.AdviceName,
+		//					DrugNameId:     item.DrugNameId,
+		//					DrugSpec:       item.AdviceDesc,
+		//					OutstoreNumber: count,
+		//					AdminUserId:    adminUserInfo.AdminUser.Id,
+		//					StorckTime:     item.AdviceDate,
+		//					UserOrgId:      adminUserInfo.Org.Id,
+		//					CreatedTime:    time.Now().Unix(),
+		//					Status:         1,
+		//					PatientId:      item.PatientId,
+		//					ExitMode:       2,
+		//					MedicId:        item.DrugId,
+		//					StockOutNumber: warehousing_out_order,
+		//				}
+		//
+		//				//查询 该患者是否已出库
+		//				out, errcode := service.GetSelfOutStock(adminUserInfo.Org.Id, item.AdviceDate, item.PatientId, item.AdviceName, item.AdviceDesc)
+		//
+		//				if errcode == gorm.ErrRecordNotFound {
+		//					service.CreateOutStock(&outStock)
+		//				} else if errcode == nil {
+		//					err := service.UpdatedSelfOutSatock(out.ID, &outStock)
+		//					fmt.Println("err", err)
+		//				}
+		//			}
+		//		}
+		//		c.ServeSuccessJSON(map[string]interface{}{
+		//			"msg":    "1",
+		//			"advice": advice,
+		//			"ids":    ids,
+		//		})
+		//		return
+		//	}
+		//}
 
 		//自备药
 		selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
@@ -1279,149 +1376,150 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}()
 
-			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId, tx)
 
 			if selfBasedrug.IsSelfDrug == 1 {
 
 				//查询是否有库存
-				info, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(advice.DrugId, advice.PatientId, advice.UserOrgId, tx)
+				infoList, _ := 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
+				var total_count int64
+				var prescribing_number_total int64
+				for _, items := range infoList {
+					if items.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+						items.StockMaxNumber = items.StockMaxNumber * selfBasedrug.MinNumber
 					}
 
-					//判断单位是否相等
-					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
-					}
+					total_count += items.StockMaxNumber + items.StockMinNumber
+				}
 
-					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 total_count == 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "2",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
 
-					}
+				//判断单位是否相等
+				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
+				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.GetMobileAdminUserInfo().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,
 					}
-					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)
+					//查询今日是否有出库数据
+					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)
+					if lastWarehouseOut.ID == 0 {
+						service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+					}
+					//出库
+					warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+						WarehouseOutId:          lastWarehouseOut.ID,
+						WarehouseOutOrderNumber: warehousing_out_order,
+						DrugId:                  advice.DrugId,
+						Count:                   prescribing_number_total,
+						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:               selfBasedrug.MinUnit,
+						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 {
+					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)
+						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
+						//查询剩余库存
+						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
 							}
-							service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+							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
 				}
 
 			}
@@ -1982,7 +2080,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				if selfPrescriptionOutOpen.IsOpen == 1 {
 
-					selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+					selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId, tx)
 
 					if selfBasedrug.IsSelfDrug == 1 {
 
@@ -2043,7 +2141,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
 								operation_time := time.Now().Unix()
 
-								creater := adminInfo.AdminUser.Id
+								creater := c.GetMobileAdminUserInfo().AdminUser.Id
 								//创建一个出库单
 								drugWarehouseOut := models.XtSelfDrugWarehouseOut{
 									WarehouseOutOrderNumber: warehousing_out_order,
@@ -2067,9 +2165,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 								//出库
 								warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+									WarehouseOutId:          lastWarehouseOut.ID,
 									WarehouseOutOrderNumber: warehousing_out_order,
 									DrugId:                  advice.DrugId,
-									Count:                   total_count,
+									Count:                   prescribing_number_total,
 									Price:                   0,
 									TotalPrice:              0,
 									Status:                  1,
@@ -2082,7 +2181,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									Dealer:                  selfBasedrug.Dealer,
 									RetailPrice:             0,
 									RetailTotalPrice:        0,
-									CountUnit:               advice.PrescribingNumberUnit,
+									CountUnit:               selfBasedrug.MinUnit,
 									ExpiryDate:              0,
 									ProductDate:             0,
 									Number:                  "",
@@ -5956,6 +6055,20 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 			}
 		}
+
+		//自备药
+		selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+		if selfPrescriptionOutOpenOne.IsOpen == 1 {
+			//查询库存是否是自备药
+			selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+			if selfBasedrug.IsSelfDrug == 1 {
+				creater := adminUserInfo.AdminUser.Id
+				//退库
+				service.SelfDrugAutoAddCancelInfoOne(&advice, creater)
+			}
+		}
 		err := service.DeleteDoctorAdvice(&advice)
 		//记录日志
 		byterequest, _ := json.Marshal(advice)
@@ -6058,6 +6171,21 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 				}
 			}
+
+			//自备药
+			selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+			if selfPrescriptionOutOpenOne.IsOpen == 1 {
+				//查询库存是否是自备药
+				selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+				if selfBasedrug.IsSelfDrug == 1 {
+					creater := adminUserInfo.AdminUser.Id
+					//退库
+					service.SelfDrugAutoAddCancelInfoOne(&advice, creater)
+				}
+			}
+
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
 			//记录日志
 			byterequest, _ := json.Marshal(advice)
@@ -6114,6 +6242,21 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			advicelist, _ := service.GetBatchDoctorAdviceList(ids, adminUserInfo.Org.Id)
 
 			for _, item := range advicelist {
+
+				//自备药
+				selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+				if selfPrescriptionOutOpenOne.IsOpen == 1 {
+					//查询库存是否是自备药
+					selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(item.DrugId, item.UserOrgId)
+
+					if selfBasedrug.IsSelfDrug == 1 {
+						creater := adminUserInfo.AdminUser.Id
+						//退库
+						service.SelfDrugAutoAddCancelInfoOne(item, creater)
+					}
+				}
+
 				//记录日志
 				byterequest, _ := json.Marshal(item)
 				adviceLog := models.XtDoctorAdviceLog{

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1419,7 +1419,6 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			DeathTime:         death_time,
 			OutReason:         out_reason,
 			RelativePhone:     relative_phone,
-			Remark:            "",
 			SchRemark:         remark,
 			TreatmentPlan:     treatment_plan,
 		}
@@ -1452,7 +1451,6 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
-			Remark:            "",
 			SchRemark:         remark,
 			TreatmentPlan:     treatment_plan,
 		}

controllers/patient_api_controller.go

@@ -2295,6 +2295,51 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		advice, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
 
+		//自备药
+		selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.CurrentOrgId)
+
+		if selfPrescriptionOutOpenOne.IsOpen == 1 {
+			//查询库存是否
+			selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+			if selfBasedrug.IsSelfDrug == 1 {
+				selfDrugStockCount, _ := service.GetSelfDrugStockCountByPatientId(advice.DrugId, advice.PatientId, advice.UserOrgId)
+				var prescribing_number_total_one int64
+				//判断单位是否相等
+				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_one = 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_one = 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_one = count
+				}
+
+				fmt.Println("prescribing_number_total_one------------------", prescribing_number_total_one)
+				fmt.Println("selfDrugStockCount.FlushCount", selfDrugStockCount.FlushCount)
+				//库存不足
+				if prescribing_number_total_one > selfDrugStockCount.FlushCount {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "2",
+						"advice": advice,
+					})
+					return
+				}
+			}
+
+		}
+
 		if advice.ID == 0 || advice.PatientId != patient {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 			return
@@ -2643,9 +2688,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}()
 
-			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
-
-			fmt.Println("selfBasedrug-----------------------------------------", selfBasedrug.IsSelfDrug)
+			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId, tx)
 
 			if selfBasedrug.IsSelfDrug == 1 {
 
@@ -2730,9 +2773,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 						//出库
 						warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+							WarehouseOutId:          lastWarehouseOut.ID,
 							WarehouseOutOrderNumber: warehousing_out_order,
 							DrugId:                  advice.DrugId,
-							Count:                   total_count,
+							Count:                   prescribing_number_total,
 							Price:                   0,
 							TotalPrice:              0,
 							Status:                  1,
@@ -2745,7 +2789,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							Dealer:                  selfBasedrug.Dealer,
 							RetailPrice:             0,
 							RetailTotalPrice:        0,
-							CountUnit:               advice.PrescribingNumberUnit,
+							CountUnit:               selfBasedrug.MinUnit,
 							ExpiryDate:              0,
 							ProductDate:             0,
 							Number:                  "",
@@ -3457,7 +3501,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}()
 
-			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
+			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId, tx)
 
 			if selfBasedrug.IsSelfDrug == 1 {
 
@@ -3542,9 +3586,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 						//出库
 						warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+							WarehouseOutId:          lastWarehouseOut.ID,
 							WarehouseOutOrderNumber: warehousing_out_order,
 							DrugId:                  advice.DrugId,
-							Count:                   total_count,
+							Count:                   prescribing_number_total,
 							Price:                   0,
 							TotalPrice:              0,
 							Status:                  1,
@@ -3557,7 +3602,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							Dealer:                  selfBasedrug.Dealer,
 							RetailPrice:             0,
 							RetailTotalPrice:        0,
-							CountUnit:               advice.PrescribingNumberUnit,
+							CountUnit:               selfBasedrug.MinUnit,
 							ExpiryDate:              0,
 							ProductDate:             0,
 							Number:                  "",
@@ -4246,6 +4291,20 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 
 		}
 	}
+	//自备药
+	selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.CurrentOrgId)
+
+	if selfPrescriptionOutOpenOne.IsOpen == 1 {
+		//查询库存是否是自备药
+		selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+		if selfBasedrug.IsSelfDrug == 1 {
+			creater := adminUserInfo.AdminUser.Id
+			//退库
+			service.SelfDrugAutoAddCancelInfoOne(&advice, creater)
+		}
+	}
+
 	err := service.DeleteDoctorAdvice(&advice)
 
 	//记录日志
@@ -4297,6 +4356,20 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 		return
 	}
 
+	//自备药
+	selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.CurrentOrgId)
+
+	if selfPrescriptionOutOpenOne.IsOpen == 1 {
+		//查询库存是否是自备药
+		selfBasedrug, _ := service.GetSelfBasedrugByIdTwo(advice.DrugId, advice.UserOrgId)
+
+		if selfBasedrug.IsSelfDrug == 1 {
+			creater := adminUserInfo.AdminUser.Id
+			//退库
+			service.SelfDrugAutoAddCancelInfoOne(&advice, creater)
+		}
+	}
+
 	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//if appRole.UserType == 3 {
 	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)

controllers/self_drug_api_congtroller.go

@@ -5644,7 +5644,7 @@ func (c *SelfDrugApiController) GetSelfDrugQuery() {
 	keyword := c.GetString("keyword")
 	var goodIds []int64
 	org_id := c.GetAdminUserInfo().CurrentOrgId
-	drugList, _ := service.GetDrugNameByword(org_id, keyword)
+	drugList, _ := service.GetDrugNameBywordOne(org_id, keyword)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	for _, it := range drugList {
 		goodIds = append(goodIds, it.ID)
@@ -5678,7 +5678,7 @@ func (c *SelfDrugApiController) CheckSelfDrugOutQuery() {
 	}()
 	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
 
-	patient_id, _ := c.GetInt64("patient_id")
+	//patient_id, _ := c.GetInt64("patient_id")
 
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	warehousingOutInfoList, _ := service.GetSelfDrugWarehouseOutListByIdOne(warehouse_out_id, orgId, tx)
@@ -5726,33 +5726,13 @@ func (c *SelfDrugApiController) CheckSelfDrugOutQuery() {
 			return
 		}
 	}
-	warehousingOutInfoListTwo, _ := service.GetSelfDrugWarehouseOutListByIdOne(warehouse_out_id, orgId, tx)
-
-	for _, it := range warehousingOutInfoListTwo {
-		medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
-		////出库数量累加
-		var out_count_one int64
 
-		if it.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-			out_count_one = it.Count * medical.MinNumber
-		}
-
-		if it.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-			out_count_one = it.Count
-		}
-
-		if it.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
-			out_count_one = it.Count
-		}
-		service.AddSelfDrugCount(it.DrugId, it.OrgId, patient_id, out_count_one, tx)
-
-	}
 	warehousingOutInfoListThree, _ := service.GetSelfDrugWarehouseOutListByIdOne(warehouse_out_id, orgId, tx)
 	for _, it := range warehousingOutInfoListThree {
 		medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
 		drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
 		//出库逻辑
-		service.AutoSelfDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit, tx)
+		service.AutoSelfDrugDeliverInfoFourtyThree(orgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit, tx)
 
 		//查询剩余库存
 		stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
@@ -5816,6 +5796,7 @@ func (c *SelfDrugApiController) ReturnCheckSelfOutDrugQuery() {
 		medical, _ := service.GetSelfBaseDrugMedical(item.DrugId, tx)
 		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			service.UpdateSelfDrugMaxNumber(item.Count, item.WarehouseInfoId, tx)
+			service.DeleteSelfDrugOutFlow(item.ID, item.OrgId, tx)
 			drugInfoList, _ := service.FindSelfDrugWarehouseInfoList(item.DrugId, item.OrgId, tx)
 			var drug_max_number int64
 			var drug_min_number int64
@@ -5900,7 +5881,7 @@ func (c *SelfDrugApiController) ReturnSelfCheckWarehouse() {
 	}
 	for _, item := range list {
 		//删除流水
-		service.UpdateSelfWarehousingInfoFlow(item.ID, orgId, tx)
+		service.UpdateSelfWarehousingInfoFlow(item.WarehousingId, orgId, tx)
 		medical, _ := service.GetSelfBaseDrugMedical(item.DrugId, tx)
 		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			//新增库存
@@ -5982,7 +5963,7 @@ func (c *SelfDrugApiController) GetSelfDrugFlow() {
 		endTime = theTime.Unix()
 	}
 	list, total, _ := service.GetSelfDrugFlow(drug_id, startTime, endTime, orgId, page, limit, patient_id)
-	drug, _ := service.GetSelfBasedrugById(drug_id, orgId)
+	drug, _ := service.GetSelfBasedrugByIdOne(drug_id, orgId)
 	patients, _ := service.GetAllpatient(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":     list,
@@ -6025,7 +6006,7 @@ func (c *SelfDrugApiController) GetSelfDrugBatchNumberList() {
 	}
 
 	list, total, _ := service.GetSelfDrugBatchNumberList(drug_id, startTime, endTime, orgId, page, limit, patient_id)
-	drug, _ := service.GetSelfBasedrugById(drug_id, orgId)
+	drug, _ := service.GetSelfBasedrugByIdOne(drug_id, orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":  list,
 		"total": total,

models/self_drug_models.go

@@ -80,6 +80,7 @@ type XtBaseDrug struct {
 	TotalCountOne          int64   `gorm:"column:total_count_one" json:"total_count" form:"total_count_one"`
 	TotalCountTwo          int64   `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
 	IsShow                 int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
+	IsSelfDrug             int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 }
 
 func (XtBaseDrug) TableName() string {

service/dialysis_service.go

@@ -2576,3 +2576,27 @@ func GetHisExecutionDoctorsThree(orgid int64, patientid int64, id int64, tx *gor
 	}
 	return doctorAdvice, err
 }
+
+func CreateMobileAdivce(advice models.DoctorAdvice) error {
+
+	err := XTWriteDB().Create(&advice).Error
+
+	return err
+}
+
+func GetLongDoctorAdviceByPatient(patient_id int64, org_id int64) (advice []*models.XtDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and status=1 and advice_type =1", patient_id, org_id).Order("start_time desc").Find(&advice).Error
+
+	return advice, err
+}
+
+func GetLastLongAdviceList(user_org_id int64) (models.XtDoctorAdvice, error) {
+
+	advice := models.XtDoctorAdvice{}
+
+	err := XTReadDB().Where("user_org_id =? and stauts=1 and advice_type =1", user_org_id).Last(&advice).Error
+
+	return advice, err
+
+}

service/manage_center_service.go

@@ -223,28 +223,56 @@ func GetDrugAutoWarehouseOutEight(patient_id int64, advicedate int64, drugid int
 	return detail, err
 }
 
+func GetSelfDrugAutoWarehouseOutEight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (models.XtSelfDrugWarehouseOutInfo, error) {
+	detail := models.XtSelfDrugWarehouseOutInfo{}
+	err = XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&detail).Error
+	return detail, err
+}
+
 func GetDrugAutoWarehouseOutTen(patient_id int64, advicedate int64, drugid int64, adviceid int64, warehouse_info_id int64) (models.DrugWarehouseOutInfo, error) {
 	detail := models.DrugWarehouseOutInfo{}
 	err = XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ? and warehouse_info_id = ?", patient_id, advicedate, drugid, adviceid, warehouse_info_id).Find(&detail).Error
 	return detail, err
 }
 
+func GetSelfDrugAutoWarehouseOutTen(patient_id int64, advicedate int64, drugid int64, adviceid int64, warehouse_info_id int64) (models.XtSelfDrugWarehouseOutInfo, error) {
+	detail := models.XtSelfDrugWarehouseOutInfo{}
+	err = XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ? and warehouse_info_id = ?", patient_id, advicedate, drugid, adviceid, warehouse_info_id).Find(&detail).Error
+	return detail, err
+}
+
 func GetDrugAutoWarehouseOutNight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (night []*models.DrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&night).Error
 	return night, err
 }
 
+func GetSelfDrugAutoWarehouseOutNight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (night []*models.XtSelfDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&night).Error
+	return night, err
+}
+
 func UpdateDrugWarehouse(id int64, info models.DrugWarehouseInfo) error {
 	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
 	return err
 }
 
+func UpdateSelfDrugWarehouseOne(id int64, info models.XtSelfDrugWarehouseInfo) error {
+	err := writeDb.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
+	return err
+}
+
 func UpdateDrugWarehouseOne(id int64, info models.DrugWarehouseInfo) error {
 	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
 	return err
 }
 
+func UpdateSelfDrugWarehouseTwo(id int64, info models.XtSelfDrugWarehouseInfo) error {
+	err := writeDb.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
+	return err
+}
+
 func GetBaseDrugLibList(org_id int64, keyword string, page int64, limit int64, is_use int64, is_charge int64, is_inject int64, manufacturer int64, isRecord int64) (list []*models.BaseDrugLib, total int64, err error) {
 
 	db := readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id)

service/new_stock_service.go

@@ -379,6 +379,18 @@ func AddCancelSumCountOne(storehouse_id int64, drug_id int64, user_org_id int64,
 	return err
 }
 
+func AddSelfCancelSumCountOne(patient_id int64, drug_id int64, user_org_id int64, cancel_count int64) error {
+
+	db := writeDb.Begin()
+	err = db.Model(&models.XtSelfDrugStockCount{}).Where("user_org_id = ? and patient_id  = ? and drug_id = ? and status = 1", user_org_id, patient_id, drug_id).UpdateColumn("sum_cancel_count", gorm.Expr("sum_cancel_count + ?", cancel_count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
 func AddNewCancelSumCountOne(storehouse_id int64, drug_id int64, user_org_id int64, cancel_count int64, tx *gorm.DB) error {
 
 	err = tx.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_cancel_count", gorm.Expr("sum_cancel_count + ?", cancel_count)).Error
@@ -416,6 +428,17 @@ func UpdateSumDrug(orgid int64, storehouse_id int64, drug_id int64, flush_count
 	return err
 }
 
+func UpdateSumDrugTwo(orgid int64, patient_id int64, drug_id int64, flush_count int64) error {
+	db := writeDb.Begin()
+	err := db.Model(&models.XtSelfDrugStockCount{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and status = 1", orgid, patient_id, drug_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
 func UpdateSumOutDrug(orgid int64, storehouse_id int64, drug_id int64, sum_out_count int64) error {
 	db := writeDb.Begin()
 	err := db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id = ? and drug_id = ? and status = 1", orgid, storehouse_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", sum_out_count)).Error
@@ -427,6 +450,17 @@ func UpdateSumOutDrug(orgid int64, storehouse_id int64, drug_id int64, sum_out_c
 	return err
 }
 
+func UpdateSelfSumOutDrug(orgid int64, patient_id int64, drug_id int64, sum_out_count int64) error {
+	db := writeDb.Begin()
+	err := db.Model(&models.XtSelfDrugStockCount{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and status = 1", orgid, patient_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", sum_out_count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
 func GetAutoGoodLastCount(goodid int64, count int64, record_time int64, patient_id int64) (models.AutomaticReduceDetail, error) {
 
 	detail := models.AutomaticReduceDetail{}

service/patientmanage_service.go

@@ -1,13 +1,14 @@
 package service
 
 import (
-	"XT_New/models"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetIllnessListTwo() (ills []*models.Illness, err error) {
@@ -950,14 +951,14 @@ func GetNewPatient(id int64) (models.XtPatientsNew, error) {
 
 func UpdatedPatient(patients models.Patients, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan}).Error
 
 	return err
 }
 
 func UpdateXtPatientNew(patients models.XtPatientsNew, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "sch_remark": patients.SchRemark, "treatment_plan": patients.TreatmentPlan}).Error
 
 	return err
 }

service/self_drug_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"fmt"
+	"strconv"
 	"time"
 
 	"XT_New/models"
@@ -1293,6 +1294,19 @@ func GetDrugNameByword(orgid int64, keyword string) (list []*models.XtBaseDrug,
 	return list, err
 }
 
+func GetDrugNameBywordOne(orgid int64, keyword string) (list []*models.XtBaseDrug, err error) {
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&list).Where("status = 1 and is_self_drug =1")
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ?", likeKey)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
 func GetGoodWarehouseInfoByOrgId(orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 	db := XTReadDB().Model(&info).Where("is_check =1 and status =1")
 	if orgid > 0 {
@@ -3841,8 +3855,11 @@ func GetSelfDrugQuery(user_org_id int64, ids []int64) (drug []*models.XtSelfDrug
 	if len(ids) > 0 {
 		db = db.Where("drug_id in(?)", ids)
 	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
 
-	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
+	err = db.Preload("BaseDrugLib", "org_id = ? and status =1", user_org_id).Find(&drug).Error
 
 	return drug, total, err
 }
@@ -4249,7 +4266,7 @@ func GetSelfDrugFlow(drug_id int64, start_time int64, end_time int64, user_org_i
 	return flow, total, err
 }
 
-func GetSelfBasedrugById(drug_id int64, user_org_id int64) (models.BaseDrugLib, error) {
+func GetSelfBasedrugByIdOne(drug_id int64, user_org_id int64) (models.BaseDrugLib, error) {
 
 	lib := models.BaseDrugLib{}
 
@@ -4258,6 +4275,29 @@ func GetSelfBasedrugById(drug_id int64, user_org_id int64) (models.BaseDrugLib,
 	return lib, err
 }
 
+func GetSelfDrugStockCountByPatientId(drug_id int64, patient_id int64, user_org_id int64) (models.XtSelfDrugStockCount, error) {
+
+	selfDrugStockCount := models.XtSelfDrugStockCount{}
+	err := XTReadDB().Where("drug_id = ? and patient_id = ? and user_org_id = ? and status =1", drug_id, patient_id, user_org_id).Find(&selfDrugStockCount).Error
+	return selfDrugStockCount, err
+}
+
+func GetSelfBasedrugById(drug_id int64, user_org_id int64, tx *gorm.DB) (models.BaseDrugLib, error) {
+
+	lib := models.BaseDrugLib{}
+
+	err := tx.Where("id = ? and org_id =? and status=1", drug_id, user_org_id).Find(&lib).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return lib, err
+		}
+	}
+
+	return lib, err
+}
+
 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")
@@ -4481,7 +4521,7 @@ func UpdateSelfDrugWarehouseOutInfoTen(patient_id int64, sys_record_time int64,
 
 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
+	err = tx.Where("drug_id =? and patient_id =? and status=1 and org_id =? and is_check=1", drug_id, patient_id, org_id).Find(&info).Error
 
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
@@ -4509,3 +4549,629 @@ func GetSelfDrugWarehouseOutDetailByPatientId(patient_id int64, page int64, limi
 
 	return out, total, err
 }
+
+func GetSelfBasedrugByIdTwo(drug_id int64, user_org_id int64) (models.BaseDrugLib, error) {
+
+	lib := models.BaseDrugLib{}
+
+	err := XTReadDB().Where("id = ? and org_id =? and status=1", drug_id, user_org_id).Find(&lib).Error
+
+	return lib, err
+}
+
+//自动退库分装方法
+
+func SelfDrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) error {
+
+	//查询该批次病人该药品出库数据
+	info, _ := GetSelfDrugAutoWarehouseOutEight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+	list, _ := GetSelfDrugAutoWarehouseOutNight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+
+	//退库
+	drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+
+	//如果剩余数量 + 退库数量 < 总入库数量
+	if len(list) > 0 {
+		for _, its := range list {
+			//查询该批次病人该药品出库数据
+			infos, _ := GetSelfDrugAutoWarehouseOutTen(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID, its.WarehouseInfoId)
+
+			//查询该药品出库批次总入库数量
+			druginfo, _ := GetSelfDrugInfoSix(its.WarehouseInfoId, infos.OrgId)
+
+			var out_count int64  //该批次出库库存
+			var sum_count int64  //该批次总库存
+			var over_count int64 //剩余数量
+
+			if druginfo.MaxUnit != druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			}
+			if druginfo.MaxUnit == druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber + druginfo.StockMinNumber
+			}
+
+			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = infos.Count * drug.MinNumber
+
+			}
+			if infos.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = infos.Count
+			}
+
+			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				out_count = infos.Count
+			}
+
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount * drug.MinNumber
+			}
+
+			if druginfo.MaxUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
+
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
+
+			if (over_count + out_count) <= sum_count {
+				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+					//退库
+					warehouseInfo := models.XtSelfDrugWarehouseInfo{
+						StockMinNumber: its.Count,
+					}
+					UpdateSelfDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
+
+					//增加退库数量
+					AddSelfCancelSumCountOne(advice.PatientId, advice.DrugId, advice.UserOrgId, its.Count)
+					//出库数量减少
+					UpdateSelfSumOutDrug(advice.UserOrgId, advice.PatientId, advice.DrugId, its.Count)
+
+				}
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+					warehouseInfo := models.XtSelfDrugWarehouseInfo{
+						StockMaxNumber: its.Count,
+					}
+					UpdateSelfDrugWarehouseTwo(its.WarehouseInfoId, warehouseInfo)
+
+					//增加退库数量
+					AddSelfCancelSumCountOne(advice.PatientId, advice.DrugId, advice.UserOrgId, its.Count*drug.MinNumber)
+					//出库数量减少
+					UpdateSelfSumOutDrug(advice.UserOrgId, advice.PatientId, advice.DrugId, its.Count*drug.MinNumber)
+				}
+
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+					warehouseInfo := models.XtSelfDrugWarehouseInfo{
+						StockMaxNumber: its.Count,
+					}
+					UpdateSelfDrugWarehouseTwo(its.WarehouseInfoId, warehouseInfo)
+					//增加退库数量
+					AddSelfCancelSumCountOne(advice.PatientId, advice.DrugId, advice.UserOrgId, its.Count*drug.MinNumber)
+					//出库数量减少
+					UpdateSelfSumOutDrug(advice.UserOrgId, advice.PatientId, advice.DrugId, its.Count*drug.MinNumber)
+				}
+
+			}
+		}
+
+		floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+		prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+		if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+			//查询剩余库存
+			stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+			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
+			}
+			var count_one int64
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			flow := models.XtSelfDrugFlow{
+				WarehousingId:           info.WarehouseInfoId,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   count_one,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   info.SysRecordTime,
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     info.WarehouseInfoId,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 drug.MinUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            0,
+				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
+			}
+			CreateSelfDrugFlowTwo(flow)
+
+			//删除出库记录
+			UpdateSelfDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTensOne(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+			//查询剩余库存
+			stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+			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
+			}
+
+			var count_one int64
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+
+			flow := models.XtSelfDrugFlow{
+				WarehousingId:           info.WarehouseInfoId,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   count_one,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   info.SysRecordTime,
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     info.WarehouseInfoId,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 drug.MinUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            0,
+				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
+			}
+
+			CreateSelfDrugFlowTwo(flow)
+			//删除出库记录
+			UpdateSelfDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTensOne(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+			//查询剩余库存
+			stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+			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
+			}
+
+			flow := models.XtSelfDrugFlow{
+				WarehousingId:           info.WarehouseInfoId,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   info.SysRecordTime,
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     info.WarehouseInfoId,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            0,
+				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
+			}
+
+			CreateSelfDrugFlowTwo(flow)
+			//删除出库记录
+			UpdateSelfDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTensOne(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+
+		//更新字典里面的库存
+		stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+		//查询改药品信息
+		medical, _ := GetBaseDrugMedical(advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		//更新库存
+		UpdateSumDrugTwo(advice.UserOrgId, advice.PatientId, advice.DrugId, sum_count_one)
+
+	}
+	return err
+}
+
+func SelfDrugAutoAddCancelInfoOne(advice *models.DoctorAdvice, creater int64) error {
+
+	//查询该批次病人该药品出库数据
+	info, _ := GetSelfDrugAutoWarehouseOutEight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+	list, _ := GetSelfDrugAutoWarehouseOutNight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+
+	//退库
+	drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+
+	//如果剩余数量 + 退库数量 < 总入库数量
+	if len(list) > 0 {
+		for _, its := range list {
+			//查询该批次病人该药品出库数据
+			infos, _ := GetSelfDrugAutoWarehouseOutTen(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID, its.WarehouseInfoId)
+
+			//查询该药品出库批次总入库数量
+			druginfo, _ := GetSelfDrugInfoSix(its.WarehouseInfoId, infos.OrgId)
+
+			var out_count int64  //该批次出库库存
+			var sum_count int64  //该批次总库存
+			var over_count int64 //剩余数量
+
+			if druginfo.MaxUnit != druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			}
+			if druginfo.MaxUnit == druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber + druginfo.StockMinNumber
+			}
+
+			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = infos.Count * drug.MinNumber
+
+			}
+			if infos.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = infos.Count
+			}
+
+			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				out_count = infos.Count
+			}
+
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount * drug.MinNumber
+			}
+
+			if druginfo.MaxUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
+
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
+			fmt.Println("over_count-----------", over_count)
+			fmt.Println("out_count-----------", out_count)
+			fmt.Println("sum_count-----------", sum_count)
+			fmt.Println("its.count-------------", its.CountUnit)
+			fmt.Println("drug.MaxUnit-------------", drug.MaxUnit)
+			fmt.Println("drug.MinUnit-------------", drug.MinUnit)
+			if (over_count + out_count) <= sum_count {
+				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+					//退库
+					warehouseInfo := models.XtSelfDrugWarehouseInfo{
+						StockMinNumber: its.Count,
+					}
+					UpdateSelfDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
+
+					//增加退库数量
+					AddSelfCancelSumCountOne(advice.PatientId, advice.DrugId, advice.UserOrgId, its.Count)
+					//出库数量减少
+					UpdateSelfSumOutDrug(advice.UserOrgId, advice.PatientId, advice.DrugId, its.Count)
+
+				}
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+					warehouseInfo := models.XtSelfDrugWarehouseInfo{
+						StockMaxNumber: its.Count,
+					}
+					UpdateSelfDrugWarehouseTwo(its.WarehouseInfoId, warehouseInfo)
+
+					//增加退库数量
+					AddSelfCancelSumCountOne(advice.PatientId, advice.DrugId, advice.UserOrgId, its.Count*drug.MinNumber)
+					//出库数量减少
+					UpdateSelfSumOutDrug(advice.UserOrgId, advice.PatientId, advice.DrugId, its.Count*drug.MinNumber)
+				}
+
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+					warehouseInfo := models.XtSelfDrugWarehouseInfo{
+						StockMaxNumber: its.Count,
+					}
+					UpdateSelfDrugWarehouseTwo(its.WarehouseInfoId, warehouseInfo)
+					//增加退库数量
+					AddSelfCancelSumCountOne(advice.PatientId, advice.DrugId, advice.UserOrgId, its.Count*drug.MinNumber)
+					//出库数量减少
+					UpdateSelfSumOutDrug(advice.UserOrgId, advice.PatientId, advice.DrugId, its.Count*drug.MinNumber)
+				}
+
+			}
+		}
+
+		floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+		prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+		if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+			//查询剩余库存
+			stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+			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
+			}
+			var count_one int64
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			flow := models.XtSelfDrugFlow{
+				WarehousingId:           info.WarehouseInfoId,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   count_one,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   info.SysRecordTime,
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     info.WarehouseInfoId,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 drug.MinUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            0,
+				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
+			}
+			CreateSelfDrugFlowTwo(flow)
+
+			//删除出库记录
+			UpdateSelfDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTensOne(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+			//查询剩余库存
+			stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+			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
+			}
+
+			var count_one int64
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+
+			flow := models.XtSelfDrugFlow{
+				WarehousingId:           info.WarehouseInfoId,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   count_one,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   info.SysRecordTime,
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     info.WarehouseInfoId,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 drug.MinUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            0,
+				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
+			}
+
+			CreateSelfDrugFlowTwo(flow)
+			//删除出库记录
+			UpdateSelfDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTensOne(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+			//查询剩余库存
+			stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+			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
+			}
+
+			flow := models.XtSelfDrugFlow{
+				WarehousingId:           info.WarehouseInfoId,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   info.SysRecordTime,
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     info.WarehouseInfoId,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            0,
+				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
+			}
+
+			CreateSelfDrugFlowTwo(flow)
+			//删除出库记录
+			UpdateSelfDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTensOne(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+
+		//更新字典里面的库存
+		stockInfo, _ := GetSelfDrugAllStockInfoOne(advice.PatientId, advice.UserOrgId, advice.DrugId)
+		//查询改药品信息
+		medical, _ := GetBaseDrugMedical(advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		//更新库存
+		UpdateSumDrugTwo(advice.UserOrgId, advice.PatientId, advice.DrugId, sum_count_one)
+
+	}
+	return err
+}

service/stock_service.go

@@ -750,6 +750,17 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 	return err
 }
 
+func CreateSelfDrugFlowTwo(flow models.XtSelfDrugFlow) error {
+	ut := writeDb.Begin()
+	err := ut.Create(&flow).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
 func CreateNewDrugFlowOne(flow models.DrugFlow, tx *gorm.DB) error {
 
 	err := tx.Create(&flow).Error
@@ -767,12 +778,25 @@ func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice
 	return detail, err
 }
 
+func UpdateSelfDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64) (models.XtSelfDrugWarehouseOutInfo, error) {
+
+	detail := models.XtSelfDrugWarehouseOutInfo{}
+	err = XTWriteDB().Model(&models.XtSelfDrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =?", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	return detail, err
+}
+
 func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id int64, advice_id int64) (models.DrugFlow, error) {
 	flow := models.DrugFlow{}
 	err := XTWriteDB().Model(&flow).Where("patient_id =? and warehouse_out_order_number = ? and drug_id = ? and status = 1 and advice_id =?", patientid, warehouse_out_number, drug_id, advice_id).Updates(map[string]interface{}{"is_read": 1}).Error
 	return flow, err
 }
 
+func UpdateDrugFlowTensOne(patientid int64, warehouse_out_number string, drug_id int64, advice_id int64) (models.XtSelfDrugFlow, error) {
+	flow := models.XtSelfDrugFlow{}
+	err := XTWriteDB().Model(&flow).Where("patient_id =? and warehouse_out_order_number = ? and drug_id = ? and status = 1 and advice_id =?", patientid, warehouse_out_number, drug_id, advice_id).Updates(map[string]interface{}{"is_read": 1}).Error
+	return flow, err
+}
+
 func CreateDrugFlowTwo(flow *models.DrugFlow) error {
 	tx := XTWriteDB().Begin()
 	err := tx.Create(&flow).Error
@@ -8444,6 +8468,12 @@ func GetDrugAllStockInfo(storehouse_id int64, orgid int64, drugid int64) (info [
 	return info, err
 }
 
+func GetSelfDrugAllStockInfoOne(patient_id int64, orgid int64, drugid int64) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("patient_id  = ? and org_id = ? and status = 1 and drug_id = ? and is_check = 1", patient_id, orgid, drugid).Find(&info).Error
+	return info, err
+}
+
 func GetNewDrugAllStockInfo(storehouse_id int64, orgid int64, drugid int64, tx *gorm.DB) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = tx.Where("storehouse_id  = ? and org_id = ? and status = 1 and drug_id = ? and is_check = 1", storehouse_id, orgid, drugid).Find(&info).Error
@@ -8604,6 +8634,13 @@ func GetDrugInfoSix(id int64, orgid int64) (models.DrugWarehouseInfo, error) {
 	return info, err
 }
 
+func GetSelfDrugInfoSix(id int64, orgid int64) (models.XtSelfDrugWarehouseInfo, error) {
+
+	info := models.XtSelfDrugWarehouseInfo{}
+	err := XTReadDB().Where("id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
 func GetPrintList(storehouse_id int64, good_name string, orgid int64, limit int64, page int64) (storeinventory []*models.XtStockInventory, err error) {
 
 	db := XTReadDB().Model(&storeinventory).Where("status = 1")

service/warhouse_service.go

@@ -9915,10 +9915,11 @@ func AutoSelfDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, ware
 		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
 
 		if lastDrugOutInfo.ID == 0 {
+			advice.WarehouseInfoId = lastWarehouse.ID
 			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
 		}
 		if lastDrugOutInfo.ID > 0 {
-
+			advice.WarehouseInfoId = lastWarehouse.ID
 			//删除在新增
 			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
 
@@ -9973,10 +9974,6 @@ func AutoSelfDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, ware
 		//出库数量相加
 		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 {
@@ -10006,10 +10003,11 @@ func AutoSelfDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, ware
 		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
 
 		if lastDrugOutInfo.ID == 0 {
+			advice.WarehouseInfoId = lastWarehouse.ID
 			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
 		}
 		if lastDrugOutInfo.ID > 0 {
-
+			advice.WarehouseInfoId = lastWarehouse.ID
 			//删除在新增
 			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
 
@@ -10250,10 +10248,11 @@ func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, ware
 		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
 
 		if lastDrugOutInfo.ID == 0 {
+			advice.WarehouseInfoId = lastWarehouse.ID
 			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
 		}
 		if lastDrugOutInfo.ID > 0 {
-
+			advice.WarehouseInfoId = lastWarehouse.ID
 			//删除在新增
 			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
 
@@ -10308,9 +10307,9 @@ func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, ware
 		//出库数量相加
 		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)
+		//fmt.Println("advice-------------------------------------", advice.ID)
+		//fmt.Println("warehouse-------------------------------------", warehouse.ID)
+		//fmt.Println("over_count====================================", over_count)
 
 		return nil
 
@@ -10341,10 +10340,11 @@ func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, ware
 		lastDrugOutInfo, _ := GetSelfNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.SysRecordTime, advice.OrgId, advice.AdviceId, warehouse.ID, tx)
 
 		if lastDrugOutInfo.ID == 0 {
+			advice.WarehouseInfoId = lastWarehouse.ID
 			AddSelfSigleDrugWarehouseOutInfo(advice, tx)
 		}
 		if lastDrugOutInfo.ID > 0 {
-
+			advice.WarehouseInfoId = lastWarehouse.ID
 			//删除在新增
 			UpdateSelfDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID, tx)
 
@@ -10404,3 +10404,320 @@ func AutoSelfDrugDeliverInfoFourtyTwo(orgID int64, prescribingNumber int64, ware
 
 	return
 }
+
+func AutoSelfDrugDeliverInfoFourtyThree(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
+		}
+
+		//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:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    advice.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)
+
+		//更新出库id
+		UpdateSelfDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+
+		//出库数量相加
+		AddSelfDrugCount(advice.DrugId, orgID, advice.PatientId, drugflow.Count, tx)
+
+		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:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+			WarehouseOutDetailId:    advice.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
+
+		advice.CountUnit = drup.MinUnit
+
+		AutoSelfDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, unit, tx)
+	}
+
+	return
+}