2024/6/17

controllers/base_api_controller.go

@@ -94,7 +94,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18173 //4
+		adminUserInfo.CurrentAppId = 17876 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -340,7 +340,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18173 //4
+		adminUserInfo.CurrentAppId = 17876 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/his_api_controller.go

@@ -3182,11 +3182,10 @@ func (c *HisApiController) CreateHisPrescription() {
 	}
 
 	//定义切片
-
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10666 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 9675 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 9675 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3367,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 {
+								if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 10265 {
 									storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 									lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
 									if s.Price != lastWarehouse.RetailPrice {
@@ -3724,7 +3723,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									projectDetail, _ := service.GetHisPrescriptonProjectById(p.ID)
 									p.IsOut = projectDetail.IsOut
 								}
-								if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+								if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 10265 {
 									storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 									if p.Type == 3 {
 										lastWarehouse, _ := service.FindFirstWarehousingInfoByStockThree(p.ProjectId, storeConfig.DrugStorehouseOut)
@@ -4940,6 +4939,443 @@ func (c *HisApiController) CreateHisPrescription() {
 					}
 				}
 			}
+
+			////同步到自备药
+			selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(adminInfo.CurrentOrgId)
+
+			fmt.Println("selfPrescriptionOpen--------------------------------------------------", selfPrescriptionOpen.IsOpen)
+			if selfPrescriptionOpen.IsOpen == 1 {
+
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindSelfAllWarehouseTotal(adminInfo.CurrentOrgId, tx)
+				total = total + 1
+
+				operation_time := time.Now().Unix()
+				creater := adminInfo.AdminUser.Id
+
+				warehousing_order := "YPRKD" + strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+				warehousing := models.XtSelfDrugWarehouse{
+					WarehousingOrder: warehousing_order,
+					OperationTime:    operation_time,
+					OrgId:            adminInfo.CurrentOrgId,
+					Creater:          creater,
+					Ctime:            time.Now().Unix(),
+					Status:           1,
+					WarehousingTime:  recordDateTime,
+					Type:             0,
+					StorehouseId:     0,
+					IsCheck:          1,
+					PatientId:        patient_id,
+					IsSys:            1,
+				}
+
+				selfDrugWarehouse, _ := service.GetSelfDrugWarehouseByWaresingId(patient_id, recordDateTime, adminInfo.CurrentOrgId, tx)
+
+				if selfDrugWarehouse.ID == 0 {
+					service.AddSelfDrugWarehouse(&warehousing, tx)
+				}
+				if selfDrugWarehouse.ID > 0 {
+					service.UpdateSelfDrugWarehouse(&warehousing, tx)
+				}
+				info, _ := service.FindLastSelfWarehousing(adminInfo.CurrentOrgId, patient_id, tx)
+				fmt.Println(info)
+
+				for _, item := range hisdoctorlist {
+
+					//查询该病人的该药品是否已经入库
+					selfdruginfo, _ := service.GetSelfDrugWarehouseInfoByInfo(item.ID, item.PatientId, item.AdviceDate, item.UserOrgId, item.DrugId, tx)
+					selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId)
+					var in_count int64
+					if len(selfdruginfo) > 0 {
+						for _, item := range selfdruginfo {
+							var in_count_one int64
+							if item.WarehouseingUnit != selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+								in_count_one = item.WarehousingCount * selfBasedrug.MinNumber
+							}
+
+							if item.WarehouseingUnit == selfBasedrug.MinUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+								in_count_one = item.WarehousingCount
+							}
+
+							if item.WarehouseingUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+								in_count_one = item.WarehousingCount
+							}
+
+							in_count += in_count_one
+						}
+
+					}
+
+					fmt.Println("selfBasedrug--------------------", selfBasedrug.IsSelfDrug)
+					if selfBasedrug.IsSelfDrug == 1 {
+						var total_count int64
+
+						prescribingNumberSix := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+						prescribingNumberSeven, _ := strconv.ParseInt(prescribingNumberSix, 10, 64)
+
+						if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							total_count += prescribingNumberSeven * selfBasedrug.MinNumber
+						}
+
+						if item.PrescribingNumberUnit == selfBasedrug.MinUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							total_count += prescribingNumberSeven
+						}
+
+						if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+							total_count += prescribingNumberSeven
+						}
+
+						fmt.Println("tota_count==================================", total_count)
+						fmt.Println("in_count==================================", in_count)
+						//入库
+						if total_count > in_count {
+
+							selfwarehouseInfo := &models.XtSelfDrugWarehouseInfo{
+								WarehousingOrder: warehousing_order,
+								WarehousingId:    info.ID,
+								DrugId:           item.DrugId,
+								Number:           "",
+								ProductDate:      0,
+								ExpiryDate:       0,
+								WarehousingCount: total_count - in_count,
+								WarehouseingUnit: selfBasedrug.MinUnit,
+								Price:            0,
+								TotalPrice:       0,
+								Status:           1,
+								Ctime:            time.Now().Unix(),
+								Remark:           "",
+								OrgId:            adminInfo.CurrentOrgId,
+								Type:             0,
+								Manufacturer:     selfBasedrug.Manufacturer,
+								Dealer:           selfBasedrug.Dealer,
+								StockMaxNumber:   total_count - in_count,
+								RetailTotalPrice: 0,
+								BatchNumber:      "",
+								MaxUnit:          selfBasedrug.MinUnit,
+								MinUnit:          selfBasedrug.MinUnit,
+								RetailPrice:      0,
+								StorehouseId:     0,
+								IsCheck:          1,
+								StockMinNumber:   0,
+								PatientId:        patient_id,
+								IsSys:            1,
+								RecordDate:       item.RecordDate,
+								AdviceId:         item.ID,
+							}
+
+							service.CreateSelfDrugWarehouseInfo(selfwarehouseInfo, tx)
+
+							lastDrugWarhouseInfo, _ := service.GetLastSelfDrugWarehouseInfoById(adminInfo.CurrentOrgId, tx)
+							Creator := adminInfo.AdminUser.Id
+
+							//查询默认仓库剩余多少库存
+							list, _ := service.GetDrugSumCountByPatient(patient_id, adminInfo.CurrentOrgId, item.DrugId, tx)
+							var sum_count int64
+							for _, it := range list {
+								baseDrug, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+								if it.MaxUnit == baseDrug.MaxUnit {
+									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+								}
+								sum_count += it.StockMaxNumber + it.StockMinNumber
+							}
+							flow := &models.XtSelfDrugFlow{
+								WarehousingId:           info.ID,
+								DrugId:                  item.DrugId,
+								Number:                  "",
+								BatchNumber:             "",
+								Count:                   total_count - in_count,
+								UserOrgId:               adminInfo.CurrentOrgId,
+								PatientId:               item.PatientId,
+								SystemTime:              time.Now().Unix(),
+								ConsumableType:          1,
+								IsSys:                   1,
+								WarehousingOrder:        warehousing_order,
+								WarehouseOutId:          0,
+								WarehouseOutOrderNumber: "",
+								IsEdit:                  0,
+								CancelStockId:           0,
+								CancelOrderNumber:       "",
+								Manufacturer:            selfBasedrug.Manufacturer,
+								Dealer:                  selfBasedrug.Dealer,
+								Creator:                 Creator,
+								UpdateCreator:           Creator,
+								Status:                  1,
+								Ctime:                   item.AdviceDate,
+								Mtime:                   0,
+								Price:                   item.Price,
+								WarehousingDetailId:     lastDrugWarhouseInfo.ID,
+								WarehouseOutDetailId:    0,
+								CancelOutDetailId:       0,
+								ExpireDate:              0,
+								ProductDate:             0,
+								MaxUnit:                 selfBasedrug.MinUnit,
+								MinUnit:                 selfBasedrug.MinUnit,
+								StorehouseId:            0,
+								OverCount:               sum_count,
+								OperateTime:             time.Now().Unix(),
+								AdviceId:                item.ID,
+							}
+							service.CreateSelfDrugFlow(flow, tx)
+
+							drugInfolist, _ := service.GetSelfDrugSumCountByStorehouseId(item.PatientId, item.UserOrgId, item.DrugId, tx)
+
+							var total_count int64 // 入库总数量
+							var over_count int64  //剩余库存
+							for _, it := range drugInfolist {
+								if it.MaxUnit == selfBasedrug.MaxUnit {
+									it.WarehousingCount = it.WarehousingCount * selfBasedrug.MinNumber
+									it.StockMaxNumber = it.StockMaxNumber * selfBasedrug.MinNumber
+								}
+							}
+							for _, it := range drugInfolist {
+								total_count += it.WarehousingCount
+								over_count += it.StockMaxNumber + it.StockMinNumber
+
+							}
+							//查询该仓库是否有默认数据
+							selfDrugStock, _ := service.GetSelfDrugStockCount(item.PatientId, item.DrugId, item.UserOrgId, tx)
+
+							if selfDrugStock.ID == 0 {
+								drugStock := models.XtSelfDrugStockCount{
+									UserOrgId:      item.UserOrgId,
+									PatientId:      item.PatientId,
+									SumInCount:     total_count,
+									SumOutCount:    0,
+									SumCancelCount: 0,
+									DrugId:         item.DrugId,
+									Ctime:          time.Now().Unix(),
+									Mtime:          0,
+									Status:         1,
+									FlushCount:     over_count,
+									SumActOutCount: 0,
+								}
+								service.CreateSelfDrugStockSum(drugStock, tx)
+
+							}
+							if selfDrugStock.ID > 0 {
+								service.UpdateSelfDrugStockSum(item.PatientId, item.DrugId, item.UserOrgId, total_count, over_count, tx)
+							}
+
+						}
+
+						//查询这个单据的出库数量
+
+						drugFlowList, _ := service.GetSelfDrugWarehouseOutDrugFlow(item.PatientId, item.DrugId, item.UserOrgId, item.ID, tx)
+
+						var his_out_count int64
+						for _, item := range drugFlowList {
+							his_out_count += item.Count
+						}
+
+						//如果已经出库的数量加上现有的数量 小于或等于 总的入库数量
+						if (total_count + his_out_count) <= in_count {
+							// 出库
+							if total_count < in_count {
+
+								var cha_count int64
+
+								cha_count = in_count - total_count
+
+								var stock_number int64 = 0
+								//查询库存是否充足
+								warehouse, _ := service.FindSelfLastDrugWarehousingInfoByID(item.DrugId, item.PatientId, tx)
+
+								// 将该批次的剩余库存数量转换为拆零数量
+								if warehouse.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+
+									stock_number = warehouse.StockMaxNumber*selfBasedrug.MinNumber + warehouse.StockMinNumber
+
+								}
+								if warehouse.MaxUnit == selfBasedrug.MinUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+
+									stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
+								}
+								if warehouse.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+
+									stock_number = warehouse.StockMaxNumber*selfBasedrug.MinNumber + warehouse.StockMinNumber
+
+								}
+
+								if stock_number >= cha_count {
+
+									var maxNumber int64 = 0
+									var minNumber int64 = 0
+
+									maxNumber = cha_count / selfBasedrug.MinNumber
+									minNumber = cha_count % selfBasedrug.MinNumber
+
+									fmt.Println("maxNumber----------------------------", maxNumber)
+									fmt.Println("minNumber----------------------------", minNumber)
+									if warehouse.StockMaxNumber == 0 && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+										minNumber = maxNumber
+									}
+
+									if selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+										if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											return
+										}
+									}
+
+									if selfBasedrug.MinUnit == warehouse.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+
+										warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*selfBasedrug.MinNumber
+									}
+
+									if selfBasedrug.MaxUnit == warehouse.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+
+										warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+									}
+									if selfBasedrug.MaxUnit == warehouse.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.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 {
+										warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+										if warehouse.MaxUnit != warehouse.MinUnit {
+											warehouse.StockMinNumber = warehouse.StockMinNumber + selfBasedrug.MinNumber - minNumber
+										}
+										if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+											warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+										}
+									} else {
+										if minNumber > 0 {
+											if (warehouse.StockMinNumber - minNumber) >= 0 {
+												warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+											}
+
+										}
+
+										if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+
+											if warehouse.StockMinNumber > 0 {
+												if warehouse.StockMinNumber-cha_count >= 0 {
+													warehouse.StockMinNumber = warehouse.StockMinNumber - cha_count
+												}
+
+											}
+
+										}
+
+									}
+
+									if maxNumber == 1 && minNumber == 0 && selfBasedrug.MaxUnit != selfBasedrug.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
+										if (warehouse.StockMinNumber - cha_count) >= 0 {
+											warehouse.StockMinNumber = warehouse.StockMinNumber - cha_count
+										}
+
+									}
+
+									if selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+										if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+											c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											return
+										}
+									}
+									if warehouse.StockMinNumber <= 0 {
+										warehouse.StockMinNumber = 0
+									}
+
+									service.UpDateSelfDrugWarehouseInfoByStock(&warehouse, tx)
+
+									//查询该药品剩余库存
+									infolist, _ := service.FindSelfDrugWarehouseInfoFlushCount(item.DrugId, item.UserOrgId, tx)
+									var over_count int64
+									for _, its := range infolist {
+										if its.MaxUnit == selfBasedrug.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * selfBasedrug.MinNumber
+										}
+										over_count += its.StockMaxNumber + its.StockMinNumber
+									}
+
+									drugWareInfo, _ := service.GetSelfLastWarehouseOutInfoById(item.DrugId, tx)
+									drugflow := models.XtSelfDrugFlow{
+										WarehouseOutId:          0,
+										WarehouseOutOrderNumber: warehousing_order,
+										WarehousingOrder:        warehousing_order,
+										DrugId:                  item.DrugId,
+										Number:                  warehouse.Number,
+										ProductDate:             warehouse.ProductDate,
+										ExpireDate:              warehouse.ExpiryDate,
+										Count:                   cha_count,
+										Price:                   warehouse.RetailPrice,
+										Status:                  1,
+										Ctime:                   item.AdviceDate,
+										Mtime:                   time.Now().Unix(),
+										UserOrgId:               item.UserOrgId,
+										Manufacturer:            warehouse.Manufacturer,
+										Dealer:                  warehouse.Dealer,
+										BatchNumber:             warehouse.BatchNumber,
+										MaxUnit:                 selfBasedrug.MinUnit,
+										ConsumableType:          20,
+										IsEdit:                  1,
+										Creator:                 0,
+										IsSys:                   3,
+										WarehouseOutDetailId:    drugWareInfo.ID,
+										AdviceId:                item.ID,
+										SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+										StorehouseId:            0,
+										AdminUserId:             creater,
+										LastPrice:               warehouse.Price,
+										StockCount:              "",
+										WarehousingDetailId:     0,
+										OverCount:               over_count,
+										RetailPrice:             item.Price, //手动出库出库价格
+										WarehousingId:           warehouse.ID,
+										SystemTime:              item.AdviceDate,
+										PatientId:               item.PatientId,
+										Remark:                  "保存处方入库数据差",
+										OperateTime:             time.Now().Unix(),
+									}
+									if warehouse.RetailPrice == 0 {
+										drugflow.Price = item.Price
+									}
+									service.CreateSelfDrugFlowOne(drugflow, tx)
+
+									var out_count int64
+									out_count = in_count - total_count
+
+									fmt.Println("in_count------------------", in_count)
+									fmt.Println("total_count------------------", total_count)
+									//添加出库数量
+									service.AddSelfDrugCount(item.DrugId, item.UserOrgId, patient_id, out_count, tx)
+
+									//查询剩余库存
+									stockInfo, _ := service.GetSelfDrugAllStockInfo(item.PatientId, item.UserOrgId, item.DrugId, tx)
+									var sum_count int64
+									for _, its := range stockInfo {
+										if its.MaxUnit == selfBasedrug.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * selfBasedrug.MinNumber
+										}
+										sum_count += its.StockMaxNumber + its.StockMinNumber
+									}
+									service.UpdateSelfDrugStockCount(item.DrugId, item.UserOrgId, item.PatientId, sum_count, tx)
+								} else {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+									return
+								}
+							}
+						}
+
+					}
+
+				}
+			}
+
 		}
 		tx.Commit()
 		if err == nil {
@@ -5251,10 +5687,129 @@ func (c *HisApiController) CreateHisPrescription() {
 //}
 
 func (c *HisApiController) DeletePrescription() {
+
 	prescription_id, _ := c.GetInt64("id")
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
 	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
-	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+
+	////同步到自备药
+	selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(c.GetAdminUserInfo().CurrentOrgId)
+	var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+	if selfPrescriptionOpen.IsOpen == 1 {
+		// 开始主事务
+		db := service.XTWriteDB()
+		tx := db.Begin()
+
+		// 在函数结束时处理事务回滚
+		defer func() {
+			if r := recover(); r != nil {
+				tx.Rollback()
+			}
+		}()
+		for _, item := range advices {
+			selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId)
+
+			var total_count int64
+			prescribingNumberSix := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+			prescribingNumberSeven, _ := strconv.ParseInt(prescribingNumberSix, 10, 64)
+
+			if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+				total_count += prescribingNumberSeven * selfBasedrug.MinNumber
+			}
+
+			if item.PrescribingNumberUnit == selfBasedrug.MinUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+				total_count += prescribingNumberSeven
+			}
+
+			if item.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+				total_count += prescribingNumberSeven
+			}
+			//出库
+			warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+				DrugId:           item.DrugId,
+				Count:            total_count,
+				Price:            0,
+				TotalPrice:       0,
+				Status:           1,
+				Ctime:            item.AdviceDate,
+				Mtime:            item.AdviceDate,
+				Remark:           "",
+				OrgId:            item.UserOrgId,
+				Type:             0,
+				Manufacturer:     selfBasedrug.Manufacturer,
+				Dealer:           selfBasedrug.Dealer,
+				RetailPrice:      0,
+				RetailTotalPrice: 0,
+				CountUnit:        item.PrescribingNumberUnit,
+				ExpiryDate:       0,
+				ProductDate:      0,
+				Number:           "",
+				BatchNumber:      "",
+				IsSys:            0,
+				WarehouseInfoId:  0,
+				AdminUserId:      0,
+				StockCount:       "",
+				IsCheck:          2,
+				SysRecordTime:    item.AdviceDate,
+				PatientId:        item.PatientId,
+				ClassType:        "",
+			}
+			warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+		}
+
+		for _, it := range warehousingOutInfo {
+
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllSelfDrugWarehouseOut(c.GetAdminUserInfo().CurrentOrgId, tx)
+
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+			operation_time := time.Now().Unix()
+
+			creater := c.GetAdminUserInfo().AdminUser.Id
+			//创建一个出库单
+			drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           operation_time,
+				OrgId:                   c.GetAdminUserInfo().CurrentOrgId,
+				Creater:                 creater,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        it.SysRecordTime,
+				Type:                    0,
+				PatientId:               it.PatientId,
+				IsCheck:                 2,
+			}
+
+			//查询今日是否有出库数据
+			lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, it.SysRecordTime, tx)
+
+			if lastWarehouseOut.ID == 0 {
+				service.AddSelfSigleDrugWarehouseOut(&lastWarehouseOut, tx)
+			}
+
+			medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+			drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+			//出库逻辑
+			service.AutoSelfDrugDeliverInfoFourtyOne(c.GetAdminUserInfo().CurrentOrgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit, tx)
+
+			//查询剩余库存
+			stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+			var sum_count int64
+			for _, its := range stockInfo {
+				if its.MaxUnit == medical.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+		}
+
+	}
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
@@ -5267,11 +5822,9 @@ func (c *HisApiController) DeletePrescription() {
 	new_prescription, p_err := service.GetPrescriptionById(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
 	new_prescriptions, _ := service.GetHisPrescription(c.GetAdminUserInfo().CurrentOrgId, new_prescription.PatientId, new_prescription.RecordDate, new_prescription.PType)
 
-	//for _, item := range new_prescriptions {
 	if new_prescription.IsMedicine == 1 {
 		isMedicine = true
 	}
-	//}
 
 	for _, item := range new_prescriptions {
 		if item.OrderStatus == 4 {
@@ -5810,8 +6363,123 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
 
-	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	////同步到自备药
+	selfPrescriptionOpen, _ := service.GeteSelfPrescriptionOpen(c.GetAdminUserInfo().CurrentOrgId)
+	var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+	if selfPrescriptionOpen.IsOpen == 1 {
+		// 开始主事务
+		db := service.XTWriteDB()
+		tx := db.Begin()
+
+		// 在函数结束时处理事务回滚
+		defer func() {
+			if r := recover(); r != nil {
+				tx.Rollback()
+			}
+		}()
+
+		selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId)
 
+		var total_count int64
+		prescribingNumberSix := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)
+		prescribingNumberSeven, _ := strconv.ParseInt(prescribingNumberSix, 10, 64)
+
+		if advice.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+			total_count += prescribingNumberSeven * selfBasedrug.MinNumber
+		}
+
+		if advice.PrescribingNumberUnit == selfBasedrug.MinUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+			total_count += prescribingNumberSeven
+		}
+
+		if advice.PrescribingNumberUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+			total_count += prescribingNumberSeven
+		}
+		//出库
+		warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+			DrugId:           advice.DrugId,
+			Count:            total_count,
+			Price:            0,
+			TotalPrice:       0,
+			Status:           1,
+			Ctime:            advice.AdviceDate,
+			Mtime:            advice.AdviceDate,
+			Remark:           "",
+			OrgId:            advice.UserOrgId,
+			Type:             0,
+			Manufacturer:     selfBasedrug.Manufacturer,
+			Dealer:           selfBasedrug.Dealer,
+			RetailPrice:      0,
+			RetailTotalPrice: 0,
+			CountUnit:        advice.PrescribingNumberUnit,
+			ExpiryDate:       0,
+			ProductDate:      0,
+			Number:           "",
+			BatchNumber:      "",
+			IsSys:            0,
+			WarehouseInfoId:  0,
+			AdminUserId:      0,
+			StockCount:       "",
+			IsCheck:          2,
+			SysRecordTime:    advice.AdviceDate,
+			PatientId:        advice.PatientId,
+			ClassType:        "",
+		}
+		warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+		for _, it := range warehousingOutInfo {
+
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := service.FindAllSelfDrugWarehouseOut(c.GetAdminUserInfo().CurrentOrgId, tx)
+
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+			operation_time := time.Now().Unix()
+
+			creater := c.GetAdminUserInfo().AdminUser.Id
+			//创建一个出库单
+			drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           operation_time,
+				OrgId:                   c.GetAdminUserInfo().CurrentOrgId,
+				Creater:                 creater,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        it.SysRecordTime,
+				Type:                    0,
+				PatientId:               it.PatientId,
+				IsCheck:                 2,
+			}
+
+			//查询今日是否有出库数据
+			lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(c.GetAdminUserInfo().CurrentOrgId, it.SysRecordTime, tx)
+
+			if lastWarehouseOut.ID == 0 {
+				service.AddSelfSigleDrugWarehouseOut(&lastWarehouseOut, tx)
+			}
+
+			medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+			drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+			//出库逻辑
+			service.AutoSelfDrugDeliverInfoFourtyOne(c.GetAdminUserInfo().CurrentOrgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit, tx)
+
+			//查询剩余库存
+			stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+			var sum_count int64
+			for _, its := range stockInfo {
+				if its.MaxUnit == medical.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
+			}
+			service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+		}
+
+	}
 	drugOutConfig, _ := service.FindDrugOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 
 	//已收费和已发药的限制逻辑

controllers/manager_center_api_controller.go

@@ -164,6 +164,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_project, _ := c.GetInt64("is_project")
 	is_show, _ := c.GetInt64("is_show")
 	adminInfo := c.GetAdminUserInfo()
+	is_self_drug, _ := c.GetInt64("is_self_drug")
 
 	hans := drug_name // 要转换的汉字字符串
 
@@ -254,6 +255,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Bck01b:                      "10",
 		IsProject:                   is_project,
 		IsShow:                      is_show,
+		IsSelfDrug:                  is_self_drug,
 	}
 	drugLib.FirstLetter = firstLetter
 	drugLib.Pinyin = firstLetter
@@ -366,6 +368,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	bby01 := c.GetString("bby01")
 	is_project, _ := c.GetInt64("is_project")
 	is_show, _ := c.GetInt64("is_show")
+	is_self_drug, _ := c.GetInt64("is_self_drug")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -461,6 +464,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsProject:                   is_project,
 		FirstLetter:                 firstLetter,
 		IsShow:                      is_show,
+		IsSelfDrug:                  is_self_drug,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -1036,6 +1036,54 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			afterevaluation.PulseFrequency = 80
 		}
 
+		if adminUserInfo.Org.Id == 10693 {
+
+			afterevaluation.ActualUltrafiltration = assessmentAfterDislysis.ActualUltrafiltration
+
+			afterevaluation.SystolicBloodPressure = assessmentAfterDislysis.SystolicBloodPressure
+
+			afterevaluation.DiastolicBloodPressure = assessmentAfterDislysis.DiastolicBloodPressure
+
+			afterevaluation.PulseFrequency = assessmentAfterDislysis.PulseFrequency
+
+			if afterevaluation.ActualUltrafiltration == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwenty(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+
+				UltrafiltrationVolumeOne, _ := strconv.ParseFloat(lastRecord.UltrafiltrationVolumeOne, 64)
+				afterevaluation.ActualUltrafiltration = UltrafiltrationVolumeOne
+
+			}
+
+			if afterevaluation.SystolicBloodPressure == 0 {
+				lastRecord, _ := service.GetLastMonitorRecordTwentyOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+
+				systolicBloodPressureOne, _ := strconv.ParseFloat(lastRecord.MonitorSystolicBloodPressureOne, 64)
+
+				afterevaluation.SystolicBloodPressure = systolicBloodPressureOne
+			}
+
+			if afterevaluation.DiastolicBloodPressure == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwentyTwo(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+				MonitorDiastolicBloodPressureOne, _ := strconv.ParseFloat(lastRecord.MonitorDiastolicBloodPressureOne, 64)
+				afterevaluation.DiastolicBloodPressure = MonitorDiastolicBloodPressureOne
+			}
+
+			if afterevaluation.PulseFrequency == 0 {
+				lastRecord, _ := service.GetLastMonitorRecordTwentyThree(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+				PulseFrequencyOne, _ := strconv.ParseFloat(lastRecord.PulseFrequencyOne, 64)
+				afterevaluation.PulseFrequency = PulseFrequencyOne
+			}
+
+			if afterevaluation.ActualDisplacement == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwentyFour(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+				DisplacementQuantityOne, _ := strconv.ParseFloat(lastRecord.DisplacementQuantityOne, 64)
+				afterevaluation.ActualDisplacement = DisplacementQuantityOne
+			}
+		}
+
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
 
 		//记录日志

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1609,6 +1609,47 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 			}
 		}
 
+		//孝康
+		//孝康
+		if adminUserInfo.Org.Id == 10693 {
+
+			if assessmentAfterDislysis.ActualUltrafiltration == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwenty(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+
+				UltrafiltrationVolumeOne, _ := strconv.ParseFloat(lastRecord.UltrafiltrationVolumeOne, 64)
+
+				assessmentAfterDislysis.ActualUltrafiltration = UltrafiltrationVolumeOne
+
+			}
+
+			if assessmentAfterDislysis.SystolicBloodPressure == 0 {
+				lastRecord, _ := service.GetLastMonitorRecordTwentyOne(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				systolicBloodPressureOne, _ := strconv.ParseFloat(lastRecord.MonitorSystolicBloodPressureOne, 64)
+				assessmentAfterDislysis.SystolicBloodPressure = systolicBloodPressureOne
+			}
+
+			if assessmentAfterDislysis.DiastolicBloodPressure == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwentyTwo(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				MonitorDiastolicBloodPressureOne, _ := strconv.ParseFloat(lastRecord.MonitorDiastolicBloodPressureOne, 64)
+				assessmentAfterDislysis.DiastolicBloodPressure = MonitorDiastolicBloodPressureOne
+			}
+
+			if assessmentAfterDislysis.PulseFrequency == 0 {
+				lastRecord, _ := service.GetLastMonitorRecordTwentyThree(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				PulseFrequencyOne, _ := strconv.ParseFloat(lastRecord.PulseFrequencyOne, 64)
+				assessmentAfterDislysis.PulseFrequency = PulseFrequencyOne
+			}
+
+			if assessmentAfterDislysis.ActualDisplacement == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwentyFour(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				DisplacementQuantityOne, _ := strconv.ParseFloat(lastRecord.DisplacementQuantityOne, 64)
+				assessmentAfterDislysis.ActualDisplacement = DisplacementQuantityOne
+			}
+		}
+
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 
 		//记录日志
@@ -1701,6 +1742,48 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 				assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
 			}
 		}
+
+		//孝康
+		if adminUserInfo.Org.Id == 10693 {
+
+			fmt.Println("adminUserInfo.Org.Id", assessmentAfterDislysis.ActualUltrafiltration)
+			if assessmentAfterDislysis.ActualUltrafiltration == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwenty(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+
+				UltrafiltrationVolumeOne, _ := strconv.ParseFloat(lastRecord.UltrafiltrationVolumeOne, 64)
+
+				assessmentAfterDislysis.ActualUltrafiltration = UltrafiltrationVolumeOne
+
+			}
+
+			if assessmentAfterDislysis.SystolicBloodPressure == 0 {
+				lastRecord, _ := service.GetLastMonitorRecordTwentyOne(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				systolicBloodPressureOne, _ := strconv.ParseFloat(lastRecord.MonitorSystolicBloodPressureOne, 64)
+				assessmentAfterDislysis.SystolicBloodPressure = systolicBloodPressureOne
+			}
+
+			if assessmentAfterDislysis.DiastolicBloodPressure == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwentyTwo(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				MonitorDiastolicBloodPressureOne, _ := strconv.ParseFloat(lastRecord.MonitorDiastolicBloodPressureOne, 64)
+				assessmentAfterDislysis.DiastolicBloodPressure = MonitorDiastolicBloodPressureOne
+			}
+
+			if assessmentAfterDislysis.PulseFrequency == 0 {
+				lastRecord, _ := service.GetLastMonitorRecordTwentyThree(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				PulseFrequencyOne, _ := strconv.ParseFloat(lastRecord.PulseFrequencyOne, 64)
+				assessmentAfterDislysis.PulseFrequency = PulseFrequencyOne
+			}
+
+			if assessmentAfterDislysis.ActualDisplacement == 0 {
+
+				lastRecord, _ := service.GetLastMonitorRecordTwentyFour(adminUserInfo.Org.Id, id, assessmentAfter.AssessmentDate)
+				DisplacementQuantityOne, _ := strconv.ParseFloat(lastRecord.DisplacementQuantityOne, 64)
+				assessmentAfterDislysis.ActualDisplacement = DisplacementQuantityOne
+			}
+		}
+
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 
 		//记录日志

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2996,7 +2996,7 @@ func (this *NewDialysisApiController) GetInspectionGroup() {
 
 	patient, _ := service.GetPatientDetailTwo(patient_id)
 	inspection, _ := service.GetInspectionGroup(patient.BloodId, org_id)
-	fmt.Println("inspection+++++++++=============", inspection)
+
 	if len(inspection) > 0 {
 		for _, item := range inspection {
 			lastInspection, _ := service.GetLastInspectionProject(item.PatientId, org_id, item.ProjectId)

controllers/patient_api_controller.go

@@ -1745,6 +1745,14 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 		}
 
+		//针对康桥
+		if adminUserInfo.CurrentOrgId == 10702 {
+			if adviceType == 3 {
+				adviceType = 2
+			}
+
+		}
+
 		if adviceNameM["children"] != nil && reflect.TypeOf(adviceNameM["children"]).String() == "string" {
 			executionFrequency, _ := adviceNameM["execution_frequency"].(string)
 			advice.ExecutionFrequency = executionFrequency

controllers/schedule_api_controller.go

@@ -4800,7 +4800,7 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	timenow := time.Now().Format("2006-01-02")
 	timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timenow)
-	if adminInfo.CurrentOrgId == 10346 || adminInfo.CurrentOrgId == 10585 {
+	if adminInfo.CurrentOrgId == 10346 || adminInfo.CurrentOrgId == 10585 || adminInfo.CurrentOrgId == 10495 {
 
 		if len(schdules) > 0 {
 			//获取长期医嘱里面的透析器灌流器

controllers/self_drug_api_congtroller.go

@@ -149,6 +149,8 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/drug/tocheckselfwarehouseinginfo", &SelfDrugApiController{}, "Get:TocheckSelfWarehouseingInfo")
 
+	beego.Router("/api/drug/returnselfcheckwarehouse", &SelfDrugApiController{}, "Get:ReturnSelfCheckWarehouse")
+
 	beego.Router("/api/drug/getselfdrugbatchnumber", &SelfDrugApiController{}, "Get:GetSelfDrugBatchNumber")
 
 	beego.Router("/api/drug/postsetfdrugwarehouseout", &SelfDrugApiController{}, "Post:PostSelfDrugWarehouseOut")
@@ -162,6 +164,22 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/modifyselfdrugwarehouseout", &SelfDrugApiController{}, "Post:ModifySelfDrugWarehouseOut")
 
 	beego.Router("/api/drug/getselfdrugquery", &SelfDrugApiController{}, "Get:GetSelfDrugQuery")
+
+	beego.Router("/api/drug/checkselfdrugoutquery", &SelfDrugApiController{}, "Get:CheckSelfDrugOutQuery")
+
+	beego.Router("/api/drug/returncheckselfoutdrugquery", &SelfDrugApiController{}, "Get:ReturnCheckSelfOutDrugQuery")
+
+	beego.Router("/api/drug/getselfdrugflow", &SelfDrugApiController{}, "Get:GetSelfDrugFlow")
+
+	beego.Router("/api/drug/getselfdrugbatchnumberlist", &SelfDrugApiController{}, "Get:GetSelfDrugBatchNumberList")
+
+	beego.Router("/api/drug/getallselfdrugwarehouse", &SelfDrugApiController{}, "Get:GetAllSelfDrugWarehouse")
+
+	beego.Router("/api/drug/deleteselfwarehouse", &SelfDrugApiController{}, "Get:DeleteSelfWarehouse")
+
+	beego.Router("/api/drug/getallselfdrugwarehouseout", &SelfDrugApiController{}, "Get:GetAllSelfDrugWarehouseOut")
+
+	beego.Router("/api/drug/deleteselfwarehouseoutlist", &SelfDrugApiController{}, "Get:DeleteSelfWarehouseOutList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -4760,7 +4778,6 @@ func (c *SelfDrugApiController) GetSelfDrugWarehouseInfoByID() {
 
 	id, _ := c.GetInt64("id")
 	info, _ := service.GetSelfDrugWarehouseInfoByID(id)
-
 	warehouseInfo, _ := service.GetSelfDrugWarehouseInfo(info.WarehousingId)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
@@ -4784,7 +4801,6 @@ func (c *SelfDrugApiController) ModifySelfDrugWarehouse() {
 	warehousing_time := c.GetString("warehousing_time")
 	warehousing_id, _ := c.GetInt64("warehousing_id")
 	adminUserInfo := c.GetAdminUserInfo()
-
 	warehousingDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_time)
 
 	if parseDateErr != nil {
@@ -4809,31 +4825,8 @@ func (c *SelfDrugApiController) ModifySelfDrugWarehouse() {
 	total, _ := service.FindSelfAllWarehouseTotal(adminUserInfo.CurrentOrgId, tx)
 	total = total + 1
 
-	//operation_time := time.Now().Unix()
-	//creater := adminUserInfo.AdminUser.Id
-
 	warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
-	//warehousing := models.XtSelfDrugWarehouse{
-	//	ID:               warehousing_id,
-	//	WarehousingOrder: warehousing_order,
-	//	OperationTime:    operation_time,
-	//	OrgId:            adminUserInfo.CurrentOrgId,
-	//	Creater:          creater,
-	//	Ctime:            time.Now().Unix(),
-	//	Status:           1,
-	//	WarehousingTime:  warehousingDate.Unix(),
-	//	Type:             0,
-	//	StorehouseId:     0,
-	//	IsCheck:          2,
-	//	PatientId:        patient_id,
-	//}
-	//if warehousing_id == 0 {
-	//	service.AddSelfDrugWarehouse(&warehousing, tx)
-	//}
-	//if warehousing_id > 0 {
-	//	service.UpdateSelfDrugWarehouse(&warehousing, tx)
-	//}
 	info, _ := service.FindLastSelfWarehousing(adminUserInfo.CurrentOrgId, patient_id, tx)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -5017,9 +5010,9 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 
 	id, _ := c.GetInt64("warehousing_id")
 	patient_id, _ := c.GetInt64("patient_id")
-	orgId := c.GetAdminUserInfo().CurrentOrgId
-	info, _ := service.GetSelfWarehouseInfoByWarehouseInfo(id, patient_id, orgId)
 
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	checker := c.GetAdminUserInfo().AdminUser.Id
 	db := service.XTWriteDB()
 	tx := db.Begin()
 	defer func() {
@@ -5029,16 +5022,21 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 			tx.Commit()
 		}
 	}()
+	//更改核对状态
+	service.CheckSelfWarehousingInfo(id, orgId, checker, tx)
+	info, _ := service.GetSelfWarehouseInfoByWarehouseInfo(id, patient_id, orgId, tx)
 	if len(info) > 0 {
 		for _, item := range info {
-			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			medical, _ := service.GetSelfBaseDrugMedical(item.DrugId, tx)
 
 			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+
 				//新增库存
 				service.AddSelfDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
 
 			}
 			if item.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+
 				//新增库存
 				service.AddSelfDrugWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
 
@@ -5058,7 +5056,7 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 			var sum_count int64
 			var sum_in_count int64
 			for _, it := range list {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+				baseDrug, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
 				if it.MaxUnit == baseDrug.MaxUnit {
 					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
 					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
@@ -5068,7 +5066,7 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 			}
 
 			flow := &models.XtSelfDrugFlow{
-				WarehousingId:           0,
+				WarehousingId:           id,
 				DrugId:                  item.DrugId,
 				Number:                  item.Number,
 				BatchNumber:             item.BatchNumber,
@@ -5084,8 +5082,8 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 				IsEdit:                  0,
 				CancelStockId:           0,
 				CancelOrderNumber:       "",
-				Manufacturer:            0,
-				Dealer:                  0,
+				Manufacturer:            item.Manufacturer,
+				Dealer:                  item.Dealer,
 				Creator:                 Creator,
 				UpdateCreator:           Creator,
 				Status:                  1,
@@ -5106,10 +5104,11 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 			service.CreateSelfDrugFlow(flow, tx)
 
 			drugInfolist, _ := service.GetSelfDrugSumCountByStorehouseId(item.PatientId, item.OrgId, item.DrugId, tx)
+
 			var total_count int64 // 入库总数量
 			var over_count int64  //剩余库存
 			for _, it := range drugInfolist {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+				baseDrug, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
 				if it.MaxUnit == baseDrug.MaxUnit {
 					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
 					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
@@ -5120,8 +5119,9 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 				over_count += it.StockMaxNumber + it.StockMinNumber
 			}
 			//查询该仓库是否有默认数据
-			_, errcode := service.GetSelfDrugStockCount(item.PatientId, item.DrugId, item.OrgId, tx)
-			if errcode == gorm.ErrRecordNotFound {
+			selfDrugStock, _ := service.GetSelfDrugStockCount(item.PatientId, item.DrugId, item.OrgId, tx)
+
+			if selfDrugStock.ID == 0 {
 				drugStock := models.XtSelfDrugStockCount{
 					UserOrgId:      item.OrgId,
 					PatientId:      item.PatientId,
@@ -5137,7 +5137,8 @@ func (c *SelfDrugApiController) TocheckSelfWarehouseingInfo() {
 				}
 				service.CreateSelfDrugStockSum(drugStock, tx)
 
-			} else if errcode == nil {
+			}
+			if selfDrugStock.ID > 0 {
 				service.UpdateSelfDrugStockSum(item.PatientId, item.DrugId, item.OrgId, total_count, over_count, tx)
 			}
 
@@ -5665,7 +5666,513 @@ func (c *SelfDrugApiController) ModifySelfDrugWarehouseOut() {
 
 func (c *SelfDrugApiController) GetSelfDrugQuery() {
 
+	keyword := c.GetString("keyword")
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+	var goodIds []int64
+	org_id := c.GetAdminUserInfo().CurrentOrgId
+	drugList, _ := service.GetDrugNameByword(org_id, keyword)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
+	for _, it := range drugList {
+		goodIds = append(goodIds, it.ID)
+	}
+	list, total, _ := service.GetSelfDrugQuery(orgId, goodIds, limit, page)
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, org_id)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugTypeList":     drugTypeList,
+	})
+	return
+}
 
-	service.GetSelfDrugQuery(orgId)
+func (c *SelfDrugApiController) CheckSelfDrugOutQuery() {
+
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	warehousingOutInfoList, _ := service.GetSelfDrugWarehouseOutListByIdOne(warehouse_out_id, orgId, tx)
+	drugWarehouseOut, _ := service.GetSelfDrugWarehouseOutByLastId(warehouse_out_id, tx)
+
+	for _, it := range warehousingOutInfoList {
+		var total_count int64
+		var out_count int64
+		//查询剩余库存
+		stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+		drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+
+		for _, item := range stockInfo {
+			if item.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+				item.StockMaxNumber = item.StockMaxNumber * drup.MinNumber
+			}
+
+			total_count += item.StockMaxNumber + item.StockMinNumber
+		}
+
+		//出库数量累加
+		if it.CountUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			out_count = it.Count * drup.MinNumber
+		}
+
+		if it.CountUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+			out_count = it.Count
+		}
+
+		if it.CountUnit == drup.MinUnit && drup.MaxUnit == drup.MinUnit {
+			out_count = it.Count
+		}
+
+		if out_count > total_count {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"warehousingOutInfoList": warehousingOutInfoList,
+				"drug_name":              drup.DrugName,
+				"dose":                   drup.Dose,
+				"dose_unit":              drup.DoseUnit,
+				"min_number":             drup.MinNumber,
+				"min_unit":               drup.MinUnit,
+				"max_unit":               drup.MaxUnit,
+				"msg":                    2,
+			})
+			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)
+
+		//查询剩余库存
+		stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+		service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+	}
+
+	out := models.XtSelfDrugWarehouseOut{
+		IsCheck: 1,
+	}
+	//更新审核状态
+	service.UpdateSelfCheckDrugOut(out, warehouse_out_id, tx)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"warehousingOutInfoList": warehousingOutInfoList,
+		"drug_name":              "",
+		"dose":                   "",
+		"dose_unit":              "",
+		"min_number":             "",
+		"min_unit":               "",
+		"max_unit":               "",
+		"msg":                    1,
+	})
+}
+
+func (c *SelfDrugApiController) ReturnCheckSelfOutDrugQuery() {
+
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
+
+	out := models.XtSelfDrugWarehouseOut{
+		IsCheck: 2,
+	}
+	service.UpdateSelfCheckDrugOut(out, warehouse_out_id, tx)
+
+	outInfo := models.XtSelfDrugWarehouseOutInfo{
+		IsCheck: 2,
+	}
+	service.UpdateSelfCheckDrugOutInfoList(outInfo, warehouse_out_id, tx)
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetSelfDrugWarehouseOutListById(warehouse_out_id, orgId, tx)
+
+	//调用出库逻辑
+	for _, item := range list {
+		medical, _ := service.GetSelfBaseDrugMedical(item.DrugId, tx)
+		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			service.UpdateSelfDrugMaxNumber(item.Count, item.WarehouseInfoId, tx)
+			drugInfoList, _ := service.FindSelfDrugWarehouseInfoList(item.DrugId, item.OrgId, tx)
+			var drug_max_number int64
+			var drug_min_number int64
+			for _, item := range drugInfoList {
+				drug_max_number += item.StockMaxNumber
+				drug_min_number += item.StockMinNumber
+			}
+		}
+		if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+			service.UpdateSelfDrugMaxNumber(item.Count, item.WarehouseInfoId, tx)
+
+			service.DeleteSelfDrugOutFlow(item.ID, item.OrgId, tx)
+		}
+		if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+
+			service.UpdateSelfDrugMinNumber(item.Count, item.WarehouseInfoId, tx)
+
+			service.DeleteSelfDrugOutFlow(item.ID, item.OrgId, tx)
+		}
+
+		//出库数量累加
+		var out_count int64
+		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			out_count = item.Count * medical.MinNumber
+		}
+
+		if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			out_count = item.Count
+		}
+
+		if item.CountUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			out_count = item.Count
+		}
+		//增加出库数量
+		service.ReduceSelfDrugCount(item.DrugId, item.OrgId, item.PatientId, out_count, tx)
+
+		//查询该药品剩余库存
+		infolist, _ := service.FindSelfDrugWarehouseInfoFlushCountByStorehouse(item.DrugId, item.OrgId, item.PatientId, tx)
+		var over_count int64
+		for _, its := range infolist {
+			baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+
+			if its.MaxUnit == baseDrug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+			}
+			over_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		service.UpdateSelfDrugStockCount(item.DrugId, item.OrgId, item.PatientId, over_count, tx)
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"out": out,
+	})
+}
+
+func (c *SelfDrugApiController) ReturnSelfCheckWarehouse() {
+
+	db := service.XTWriteDB()
+	tx := db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	warehousing_id, _ := c.GetInt64("warehousing_id")
+	patient_id, _ := c.GetInt64("patient_id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetSelfWarehousingInfoByList(warehousing_id, orgId, tx)
+	for _, item := range list {
+		//查询该药品是否有出库数据
+		outInfo, _ := service.GetSelfDrugWarehouseOutByWarehouseInfoId(item.ID, item.DrugId, item.OrgId, tx)
+		if len(outInfo) > 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCheckGoodParamWrong)
+			return
+		}
+
+	}
+	for _, item := range list {
+		//删除流水
+		service.UpdateSelfWarehousingInfoFlow(item.ID, orgId, tx)
+		medical, _ := service.GetSelfBaseDrugMedical(item.DrugId, tx)
+		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			//新增库存
+			service.AddSelfDrugReturnWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
+		}
+		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+			//新增库存
+			service.AddSelfDrugReturnWarehouseStockMaxNumber(item.WarehousingCount, item.ID, tx)
+		}
+		if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			//新增库存
+			service.AddSelfDrugReturnWarehouseStockMinNumber(item.WarehousingCount, item.ID, tx)
+		}
+
+		var total_count int64
+		if item.MaxUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+			total_count = item.WarehousingCount * medical.MinNumber
+		}
+		if item.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+			total_count = item.WarehousingCount
+		}
+		if item.MaxUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+			total_count = item.WarehousingCount * medical.MinNumber
+		}
+		drugInfolist, _ := service.GetSelfDrugSumCountByStorehouseId(patient_id, item.OrgId, item.DrugId, tx)
+		var over_count int64 //剩余库存
+		for _, it := range drugInfolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
+			}
+		}
+		for _, it := range drugInfolist {
+			over_count += it.StockMaxNumber*medical.MinNumber + it.StockMinNumber
+		}
+		//扣减库存
+		service.ReduceSelfDrugStockCount(patient_id, item.DrugId, item.OrgId, total_count, over_count, tx)
+
+	}
+	//更新审核
+	err := service.ReturnSelfCheckWarehouseingInfo(warehousing_id, orgId, tx)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "反审核成功!",
+		})
+		return
+	}
+}
+
+func (c *SelfDrugApiController) GetSelfDrugFlow() {
+
+	drug_id, _ := c.GetInt64("drug_id")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	list, total, _ := service.GetSelfDrugFlow(drug_id, startTime, endTime, orgId, page, limit)
+	drug, _ := service.GetSelfBasedrugById(drug_id, orgId)
+	patients, _ := service.GetAllpatient(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"drug":     drug,
+		"patients": patients,
+	})
+}
+
+func (c *SelfDrugApiController) GetSelfDrugBatchNumberList() {
+
+	drug_id, _ := c.GetInt64("drug_id")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, total, _ := service.GetSelfDrugBatchNumberList(drug_id, startTime, endTime, orgId, page, limit)
+	drug, _ := service.GetSelfBasedrugById(drug_id, orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+		"drug":  drug,
+	})
+}
+
+func (c *SelfDrugApiController) GetAllSelfDrugWarehouse() {
+
+	keyword := c.GetString("keyword")
+
+	start_time := c.GetString("start_time")
+
+	end_time := c.GetString("end_time")
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	check_type, _ := c.GetInt64("check_type")
+
+	limit, _ := c.GetInt64("limit")
+
+	page, _ := c.GetInt64("page")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	appId := c.GetAdminUserInfo().CurrentAppId
+
+	list, total, _ := service.GetAllSelfDrugWarehouse(keyword, startTime, endTime, check_type, orgId, page, limit, patient_id)
+
+	doctorList, _ := service.GetAllDoctorList(orgId, appId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"total":      total,
+		"doctorList": doctorList,
+	})
+}
+
+func (c *SelfDrugApiController) DeleteSelfWarehouse() {
+
+	id, _ := c.GetInt64("id")
+
+	service.DeleteSelfWarehouse(id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"ok": "msg",
+	})
+}
+
+func (c *SelfDrugApiController) GetAllSelfDrugWarehouseOut() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	keyword := c.GetString("keyword")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	appId := c.GetAdminUserInfo().CurrentAppId
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	patient_id, _ := c.GetInt64("patient_id")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, total, _ := service.GetAllSelfDrugWarehouseOut(startTime, endTime, orgId, page, limit, patient_id, keyword)
+	doctorList, _ := service.GetAllDoctorList(orgId, appId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"total":      total,
+		"doctorList": doctorList,
+	})
+
+}
+
+func (c *SelfDrugApiController) DeleteSelfWarehouseOutList() {
+
+	id, _ := c.GetInt64("id")
+
+	service.DeleteSelfWarehouseOutList(id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"ok": "msg",
+	})
 }

controllers/stock_in_api_controller.go

@@ -4429,7 +4429,11 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		min_price, _ := strconv.ParseFloat(min_prices, 64)
 		drug.MinPrice = min_price
 		dose := goodNameM["dose"].(string)
-		//dose, _ := strconv.ParseFloat(doses, 64)
+
+		is_self_drug := int64(goodNameM["is_self_drug"].(float64))
+
+		drug.IsSelfDrug = is_self_drug
+
 		if len(dose) < 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
@@ -4541,6 +4545,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				PrescribingNumber:           item.PrescribingNumber,
 				PrescribingNumberUnit:       item.PrescribingNumberUnit,
 				FirstLetter:                 item.FirstLetter,
+				IsSelfDrug:                  item.IsSelfDrug,
 			}
 
 			//查询同种药品同种规格是否存在

models/drug.go

@@ -89,6 +89,7 @@ type BaseDrugLib struct {
 	IsProject          int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
 	DrugDosageFormName string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
 	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 (BaseDrugLib) TableName() string {
@@ -367,6 +368,7 @@ type XtSelfDrugWarehouseInfo struct {
 	IsSys                     int64            `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	RecordDate                int64            `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	BaseDrugLib               BaseDrugLibSeven `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	AdviceId                  int64            `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 }
 
 func (XtSelfDrugWarehouseInfo) TableName() string {
@@ -401,60 +403,61 @@ func (XtSelfDrugWarehouse) TableName() string {
 }
 
 type XtSelfDrugFlow struct {
-	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId                    int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number                    string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber               string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Count                     int64   `gorm:"column:count" json:"count" form:"count"`
-	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId                 int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SystemTime                int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType            int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys                     int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	WarehouseOutId            int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber   string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	IsEdit                    int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
-	CancelStockId             int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber         string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
-	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	UpdateCreator             int64   `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
-	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime                     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId       int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	WarehouseOutDetailId      int64   `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
-	CancelOutDetailId         int64   `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
-	ExpireDate                int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
-	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	MaxUnit                   string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                   string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	StockMaxNumber            int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber            int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	LastStockMaxNumber        int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
-	LastStockMinNumber        int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
-	AdviceId                  int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	SupplyCancelOutId         int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
-	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	AdminUserId               int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice                 float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount                string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId                int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
-	IsRead                    int64   `gorm:"column:is_read" json:"is_read" form:"is_read"`
-	OverCount                 int64   `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	RetailPrice               float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	OrderId                   int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
-	FlushOverCount            int64   `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
-	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
-	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
+	ID                        int64       `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64       `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string      `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64       `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64       `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64       `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64       `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string      `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64       `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string      `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64       `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string      `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64       `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64       `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64       `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64     `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64       `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64       `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64       `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64       `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string      `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64       `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64       `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64       `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64       `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	AdviceId                  int64       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64       `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64       `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice                 float64     `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string      `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64       `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsRead                    int64       `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount                 int64       `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	IsCheck                   int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RetailPrice               float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	OrderId                   int64       `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	FlushOverCount            int64       `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
+	Remark                    string      `gorm:"column:remark" json:"remark" form:"remark"`
+	OperateTime               int64       `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
+	BaseDrugLib               BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 }
 
 func (XtSelfDrugFlow) TableName() string {
@@ -462,19 +465,20 @@ func (XtSelfDrugFlow) TableName() string {
 }
 
 type XtSelfDrugStockCount struct {
-	ID             int64 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SumInCount     int64 `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
-	SumOutCount    int64 `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
-	SumCancelCount int64 `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
-	DrugId         int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Ctime          int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime          int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status         int64 `gorm:"column:status" json:"status" form:"status"`
-	FlushCount     int64 `gorm:"column:flush_count" json:"flush_count" form:"flush_count"`
-	SumActOutCount int64 `gorm:"column:sum_act_out_count" json:"sum_act_out_count" form:"sum_act_out_count"`
-	SumOldCount    int64 `gorm:"column:sum_old_count" json:"sum_old_count" form:"sum_old_count"`
+	ID             int64       `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SumInCount     int64       `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	SumOutCount    int64       `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
+	SumCancelCount int64       `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
+	DrugId         int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Ctime          int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status         int64       `gorm:"column:status" json:"status" form:"status"`
+	FlushCount     int64       `gorm:"column:flush_count" json:"flush_count" form:"flush_count"`
+	SumActOutCount int64       `gorm:"column:sum_act_out_count" json:"sum_act_out_count" form:"sum_act_out_count"`
+	SumOldCount    int64       `gorm:"column:sum_old_count" json:"sum_old_count" form:"sum_old_count"`
+	BaseDrugLib    BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 }
 
 func (XtSelfDrugStockCount) TableName() string {

service/mobile_dialysis_service.go

@@ -2672,6 +2672,41 @@ func GetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64) (*mode
 	return &record, nil
 }
 
+func GetLastMonitorRecordTwenty(orgID int64, patientID int64, beforeDate int64) (models.MonitoringRecord, error) {
+	var record models.MonitoringRecord
+	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ? and ultrafiltration_volume_one!=''", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
+
+	return record, nil
+}
+
+func GetLastMonitorRecordTwentyOne(orgID int64, patientID int64, beforeDate int64) (models.MonitoringRecord, error) {
+	var record models.MonitoringRecord
+	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ? and monitor_systolic_blood_pressure_one!=''", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
+
+	return record, nil
+}
+
+func GetLastMonitorRecordTwentyTwo(orgID int64, patientID int64, beforeDate int64) (models.MonitoringRecord, error) {
+	var record models.MonitoringRecord
+	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ? and monitor_diastolic_blood_pressure_one!=''", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
+
+	return record, nil
+}
+
+func GetLastMonitorRecordTwentyThree(orgID int64, patientID int64, beforeDate int64) (models.MonitoringRecord, error) {
+	var record models.MonitoringRecord
+	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ? and pulse_frequency_one!=''", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
+
+	return record, nil
+}
+
+func GetLastMonitorRecordTwentyFour(orgID int64, patientID int64, beforeDate int64) (models.MonitoringRecord, error) {
+	var record models.MonitoringRecord
+	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ? and displacement_quantity_one!=''", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
+
+	return record, nil
+}
+
 // 获取 maxDate 之前一次的透后评估记录
 func GetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxDate int64) (*models.AssessmentAfterDislysis, error) {
 	var record models.AssessmentAfterDislysis

service/new_stock_service.go

@@ -655,14 +655,14 @@ func GetSelfDrugStockCount(patient_id int64, drug_id int64, org_id int64, tx *go
 	drugStockCount := models.XtSelfDrugStockCount{}
 	var err error
 	err = tx.Where("patient_id = ? and drug_id = ? and user_org_id  = ? and status = 1", patient_id, drug_id, org_id).Find(&drugStockCount).Error
-	if err == gorm.ErrRecordNotFound {
-		tx.Rollback()
-		return nil, err
-	}
-	if err != nil {
-		tx.Rollback()
-		return nil, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return nil, err
+		}
+
 	}
+
 	return &drugStockCount, nil
 }
 

service/self_drug_service.go

@@ -3587,6 +3587,20 @@ func AddSelfDrugWarehouse(warehouse *models.XtSelfDrugWarehouse, tx *gorm.DB) er
 	return err
 }
 
+func GetSelfDrugWarehouseByWaresingId(patient_id int64, record_time int64, org_id int64, tx *gorm.DB) (models.XtSelfDrugWarehouse, error) {
+
+	warehouse := models.XtSelfDrugWarehouse{}
+	err := tx.Where("patient_id = ? and warehousing_time = ? and org_id = ? and is_sys=1 and status=1", patient_id, record_time, org_id).Find(&warehouse).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return warehouse, err
+		}
+	}
+	return warehouse, err
+}
+
 func UpdateSelfDrugWarehouse(warehouse *models.XtSelfDrugWarehouse, tx *gorm.DB) error {
 
 	err := tx.Save(&warehouse).Error
@@ -3630,7 +3644,7 @@ func GetSelfDrugWarehouseInfoByID(id int64) (models.XtSelfDrugWarehouseInfo, err
 
 	selfDrugWarehouseInfo := models.XtSelfDrugWarehouseInfo{}
 
-	err := XTReadDB().Where("id = ? and status=1", id).Preload("BaseDrugLib", "status=1").Find(&selfDrugWarehouseInfo).Error
+	err := XTReadDB().Where("warehousing_id = ? and status=1", id).Preload("BaseDrugLib", "status=1").Find(&selfDrugWarehouseInfo).Error
 
 	return selfDrugWarehouseInfo, err
 }
@@ -3658,9 +3672,16 @@ func DeleteSelfDrugWarehouse(id int64, tx *gorm.DB) error {
 	return err
 }
 
-func GetSelfWarehouseInfoByWarehouseInfo(id int64, patient_id int64, org_id int64) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+func GetSelfWarehouseInfoByWarehouseInfo(id int64, patient_id int64, org_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("warehousing_id =? and patient_id =? and status=1 and org_id =?", id, patient_id, org_id).Find(&info).Error
 
-	err = XTReadDB().Where("warehousing_id =? and patient_id =? and status=1 and org_id =?", id, patient_id, org_id).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
 	return info, err
 }
 
@@ -3671,7 +3692,7 @@ func AddSelfDrugWarehouseStockMaxNumber(count int64, id int64, tx *gorm.DB) erro
 		tx.Rollback()
 		return err
 	}
-	err = tx.Model(&models.XtSelfDrugWarehouse{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	err = tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -3682,12 +3703,16 @@ func AddSelfDrugWarehouseStockMaxNumber(count int64, id int64, tx *gorm.DB) erro
 
 func AddSelfDrugWarehouseStockMinNumber(count int64, id int64, tx *gorm.DB) error {
 
-	err := XTWriteDB().Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
 	}
-	err = XTWriteDB().Model(&models.XtSelfDrugWarehouse{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
 
 	return err
 }
@@ -3699,7 +3724,7 @@ func GetDrugSumCountByPatient(patient_id int64, org_id int64, drug_id int64, tx
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()
-			return
+			return info, err
 		}
 	}
 
@@ -3719,7 +3744,6 @@ func CreateSelfDrugFlow(flow *models.XtSelfDrugFlow, tx *gorm.DB) error {
 func GetSelfDrugSumCountByStorehouseId(patient_id int64, orgid int64, drug_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
 
 	err = tx.Where("patient_id = ? and org_id = ? and status = 1  and drug_id =? and is_check = 1", patient_id, orgid, drug_id).Find(&info).Error
-
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()
@@ -3791,14 +3815,604 @@ func DeleteSelfWarehouseOut(id int64) (models.XtSelfDrugWarehouseOutInfo, error)
 func GetSelfDrugWarehouseOutById(id int64) (models.XtSelfDrugWarehouseOutInfo, error) {
 
 	outInfo := models.XtSelfDrugWarehouseOutInfo{}
-	err = XTReadDB().Where("id = ? and status =1", id).Preload("BaseDrugLib", "status=1").Find(&outInfo).Error
+	err = XTReadDB().Where("warehouse_out_id = ? and status =1", id).Preload("BaseDrugLib", "status=1").Find(&outInfo).Error
 
 	return outInfo, err
 }
 
-func GetSelfDrugQuery(user_org_id int64) (drug []*models.XtSelfDrugStockCount, err error) {
+func GetSelfDrugQuery(user_org_id int64, ids []int64, limit int64, page int64) (drug []*models.XtSelfDrugStockCount, total int64, err error) {
+
+	db := XTReadDB().Model(&drug).Where("status=1")
+	offset := (page - 1) * limit
+	if len(ids) > 0 {
+		db = db.Where("drug_id in(?)", ids)
+	}
 
-	err = XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&drug).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Where("user_org_id = ? and status=1", user_org_id).Preload("BaseDrugLib", "org_id = ? and status =1", user_org_id).Find(&drug).Error
 
+	return drug, total, err
+}
+
+func GetSelfDrugWarehouseOutListByIdOne(warehouse_out_id int64, orgId int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseOutInfo, err error) {
+
+	err = tx.Where("warehouse_out_id = ? and org_id  =? and status = 1", warehouse_out_id, orgId).Preload("BaseDrugLib", "status=1").Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+	}
+	return info, err
+}
+
+func GetSelfDrugWarehouseOutByLastId(id int64, tx *gorm.DB) (models.XtSelfDrugWarehouseOut, error) {
+	out := models.XtSelfDrugWarehouseOut{}
+	err := tx.Where("id = ? and status = 1", id).Find(&out).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return out, err
+		}
+	}
+	return out, err
+}
+
+func GetSelfDrugAllStockInfo(patient_id int64, orgid int64, drugid int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("patient_id  = ? and org_id = ? and status = 1 and drug_id = ? and is_check = 1", patient_id, orgid, drugid).Find(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
+func FindSelfBaseDrugLibRecord(org_id int64, id int64, tx *gorm.DB) (lib models.BaseDrugLib, err error) {
+	err = tx.Model(&models.BaseDrugLib{}).Where("id = ? AND org_id = ?  AND status = 1", id, org_id).First(&lib).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return lib, err
+		}
+	}
+	return lib, err
+}
+
+func GetSelfBaseDrugMedical(id int64, tx *gorm.DB) (models.XtBaseDrug, error) {
+	drug := models.XtBaseDrug{}
+	err := tx.Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return drug, err
+		}
+	}
 	return drug, err
 }
+
+func AddSelfDrugCount(drug_id int64, org_id int64, patient_id int64, out_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugStockCount{}).Where("patient_id = ? and status = 1 and user_org_id = ? and drug_id = ?", patient_id, org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count + ?", out_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	err = tx.Model(&models.XtSelfDrugStockCount{}).Where("patient_id = ? and status = 1 and user_org_id = ? and drug_id = ?", patient_id, org_id, drug_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count + ?", out_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateSelfCheckDrugOut(out models.XtSelfDrugWarehouseOut, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": out.IsCheck}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugWarehouseOutInfo{}).Where("warehouse_out_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func FindSelfLastDrugWarehousingInfoByID(drug_id int64, patient_id int64, tx *gorm.DB) (info models.XtSelfDrugWarehouseInfo, err error) {
+	err = tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and patient_id = ? and is_check = 1", drug_id, patient_id).Order("ctime").First(&info).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
+func ChangeSelfMaxNumber(id int64, count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+
+}
+
+func UpdateSelfMinNumber(id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).Update(map[string]interface{}{"stock_min_number": count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ChangeSelfMaxNumberOne(id int64, count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).Updates(map[string]interface{}{"stock_max_number": count, "stock_min_number": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+
+}
+
+func UpDateSelfDrugWarehouseInfoByStock(info *models.XtSelfDrugWarehouseInfo, tx *gorm.DB) (err error) {
+
+	err = tx.Save(&info).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func FindSelfDrugWarehouseInfoFlushCount(drug_id int64, orgid int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("drug_id = ? and org_id = ? and status = 1 and is_check = 1", drug_id, orgid).Find(&info).Error
+
+	if err != nil {
+		tx.Rollback()
+		return info, err
+	}
+	return info, err
+}
+
+func GetSelfLastWarehouseOutInfoById(drugid int64, tx *gorm.DB) (models.XtSelfDrugWarehouseOutInfo, error) {
+
+	flow := models.XtSelfDrugWarehouseOutInfo{}
+	err := tx.Where("drug_id = ? and status = 1", drugid).Last(&flow).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
+	}
+	return flow, err
+}
+
+func UpdateSelfDrugWarehouseOutInfo(id int64, warehouse_info_id int64, org_id int64, over_count int64, drug_price float64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtSelfDrugWarehouseOutInfo{}).Where("id = ? and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count, "price": drug_price, "retail_price": drug_price}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateSelfCheckDrugOutInfoList(info models.XtSelfDrugWarehouseOutInfo, warehouse_out_id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseOutInfo{}).Where("warehouse_out_id = ?  and status = 1", warehouse_out_id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateSelfDrugMaxNumber(count int64, id int64, tx *gorm.DB) error {
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateSelfDrugMinNumber(count int64, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ModifySelfReduceDrugInformation(id int64, count int64, orgid int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func DeleteSelfDrugOutFlow(id int64, orgid int64, tx *gorm.DB) error {
+
+	err := tx.Model(models.XtSelfDrugFlow{}).Where("warehouse_out_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ReduceSelfDrugCount(drug_id int64, org_id int64, patient_id int64, out_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugStockCount{}).Where("patient_id = ? and status = 1 and user_org_id = ? and drug_id = ?", patient_id, org_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count - ?", out_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugStockCount{}).Where("patient_id = ? and status = 1 and user_org_id = ? and drug_id = ?", patient_id, org_id, drug_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count - ?", out_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateSelfDrugStockCount(drug_id int64, org_id int64, patient_id int64, flush_count int64, tx *gorm.DB) error {
+
+	drug := models.XtSelfDrugStockCount{}
+
+	err := tx.Model(&drug).Where("drug_id = ? and user_org_id = ? and patient_id = ? and status = 1", drug_id, org_id, patient_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func FindSelfDrugWarehouseInfoFlushCountByStorehouse(drug_id int64, orgid int64, patient_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("drug_id = ? and org_id = ? and status = 1 and is_check = 1 and patient_id =?", drug_id, orgid, patient_id).Find(&info).Error
+
+	if err != nil {
+		tx.Rollback()
+		return info, err
+	}
+
+	return info, err
+}
+
+func GetSelfWarehousingInfoByList(id int64, orgid int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("warehousing_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+
+	if err != nil {
+		tx.Rollback()
+		return info, err
+	}
+	return info, err
+}
+
+func GetSelfDrugWarehouseOutByWarehouseInfoId(warehouse_info_id int64, drug_id int64, orgid int64, tx *gorm.DB) (outInfo []*models.XtSelfDrugWarehouseOutInfo, err error) {
+
+	err = tx.Where("warehouse_info_id = ? and drug_id = ? and org_id = ? and is_check = 1 and status = 1", warehouse_info_id, drug_id, orgid).Find(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func UpdateSelfWarehousingInfoFlow(id int64, orgid int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugFlow{}).Where("warehousing_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func AddSelfDrugReturnWarehouseStockMaxNumber(count int64, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func AddSelfDrugReturnWarehouseStockMinNumber(count int64, id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ReduceSelfDrugStockCount(patient_id int64, drug_id int64, user_org_id int64, waresing_count int64, over_count int64, tx *gorm.DB) error {
+
+	err = tx.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_in_count", gorm.Expr("sum_in_count - ?", waresing_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugStockCount{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and status = 1", user_org_id, patient_id, drug_id).Update(map[string]interface{}{"flush_count": over_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ReturnSelfCheckWarehouseingInfo(id int64, orgid int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.XtSelfDrugWarehouseInfo{}).Where("warehousing_id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func CheckSelfWarehousingInfo(id int64, orgid int64, checker int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtSelfDrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1, "checker": checker}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetSelfDrugFlow(drug_id int64, start_time int64, end_time int64, user_org_id int64, page int64, limit int64) (flow []*models.XtSelfDrugFlow, total int64, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id =?", drug_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("etime <=?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+
+	offset := (page - 1) * limit
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("BaseDrugLib", "status=1 and org_id = ?", user_org_id).Order("id desc").Find(&flow).Error
+
+	return flow, total, err
+}
+
+func GetSelfBasedrugById(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 GetSelfDrugBatchNumberList(drug_id int64, start_time int64, end_time int64, user_org_id int64, page int64, limit int64) (flow []*models.XtSelfDrugFlow, total int64, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type =1")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id =?", drug_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("etime <=?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+
+	offset := (page - 1) * limit
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&flow).Error
+
+	return flow, total, err
+}
+
+func GetAllSelfDrugWarehouse(keyword string, start_time int64, end_time int64, check_type int64, orgId int64, page int64, limit int64, patient_id int64) (warehouse []*models.XtSelfDrugWarehouse, total int64, err error) {
+
+	db := XTReadDB().Model(&warehouse).Where("status=1")
+
+	likeKey := "%" + keyword + "%"
+
+	if len(keyword) > 0 {
+		db = db.Where("warehousing_order like ?", likeKey)
+	}
+
+	if start_time > 0 {
+		db = db.Where("operation_time>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("operation_time<=?", end_time)
+	}
+
+	if check_type > 0 {
+		db = db.Where("is_check = ?", check_type)
+	}
+	if orgId > 0 {
+		db = db.Where("org_id = ?", orgId)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id=?", patient_id)
+	}
+
+	offset := (page - 1) * limit
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("operation_time desc").Find(&warehouse).Error
+
+	return warehouse, total, err
+}
+
+func DeleteSelfWarehouse(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSelfDrugWarehouse{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	err = XTWriteDB().Model(&models.XtSelfDrugWarehouseInfo{}).Where("warehousing_id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
+func GetAllSelfDrugWarehouseOut(start_time int64, end_time int64, org_id int64, page int64, limit int64, patient_id int64, keyword string) (out []*models.XtSelfDrugWarehouseOut, total int64, err error) {
+
+	db := XTReadDB().Model(&out).Where("status=1")
+	offset := (page - 1) * limit
+
+	likeKey := "%" + keyword + "%"
+
+	if len(keyword) > 0 {
+		db = db.Where("warehouse_out_order_number like ?", likeKey)
+	}
+	if start_time > 0 {
+		db = db.Where("operation_time>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("operation_time<=?", end_time)
+	}
+
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("operation_time desc").Find(&out).Error
+
+	return out, total, err
+}
+
+func DeleteSelfWarehouseOutList(id int64) (models.XtSelfDrugWarehouseOut, error) {
+
+	warehouseOut := models.XtSelfDrugWarehouseOut{}
+
+	err := XTWriteDB().Model(&warehouseOut).Where("id = ? an status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	err = XTWriteDB().Model(&models.XtSelfDrugWarehouseOutInfo{}).Where("warehouse_out_id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return warehouseOut, err
+}
+
+func FindSelfDrugWarehouseInfoList(drugid int64, orgid int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("drug_id = ? and org_id = ? and status =1 and is_check =1  and (stock_max_number>0 or stock_min_number>0)", drugid, orgid).Find(&info).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
+	}
+	return info, err
+}
+
+func GetSelfDrugWarehouseInfoByInfo(advice_id int64, patient_id int64, advice_date int64, user_org_id int64, drug_id int64, tx *gorm.DB) (info []*models.XtSelfDrugWarehouseInfo, err error) {
+
+	err = tx.Where("advice_id = ? and patient_id = ? and record_date = ? and org_id = ? and status=1 and drug_id = ?", advice_id, patient_id, advice_date, user_org_id, drug_id).Find(&info).Error
+
+	return info, err
+}
+
+func CreateSelfDrugWarehouseInfo(info *models.XtSelfDrugWarehouseInfo, tx *gorm.DB) error {
+
+	err := tx.Create(&info).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func GetLastSelfDrugWarehouseInfoById(org_id int64, tx *gorm.DB) (models.XtSelfDrugWarehouseInfo, error) {
+
+	info := models.XtSelfDrugWarehouseInfo{}
+
+	err := tx.Where("org_id = ? and status =1", org_id).Last(&info).Error
+
+	return info, err
+}
+
+func GetSelfDrugWarehouseOutDrugFlow(patient_id int64, drug_id int64, user_org_id int64, advice_id int64, tx *gorm.DB) (flow []*models.XtSelfDrugFlow, err error) {
+
+	err = tx.Where("patient_id = ? and drug_id = ? and user_org_id =? and status=1 and consumable_type =20 and advice_id =?", patient_id, drug_id, user_org_id, advice_id).Find(&flow).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+	}
+	return flow, err
+}
+
+func GetSelfDrugLastWarehouseOutTwety(orgid int64, record_date int64, tx *gorm.DB) (models.XtSelfDrugWarehouseOut, error) {
+	out := models.XtSelfDrugWarehouseOut{}
+	err := tx.Where("org_id = ? and status = 1 and warehouse_out_time = ?", orgid, record_date).Find(&out).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return out, err
+		}
+
+	}
+	return out, err
+}

service/stock_service.go

@@ -1577,6 +1577,22 @@ func AddSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut) error {
 
 }
 
+func GetSigleDrugWarehouseOutByPatientId(warehousing_time int64, patient_id int64, tx *gorm.DB) (models.XtSelfDrugWarehouse, error) {
+
+	selfDrugWarehouse := models.XtSelfDrugWarehouse{}
+
+	err := tx.Where("warehousing_time = ? and patient_id = ? and is_sys =1 and status=1", warehousing_time, patient_id).Find(&selfDrugWarehouse).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return selfDrugWarehouse, err
+		}
+	}
+
+	return selfDrugWarehouse, err
+}
+
 func AddSelfSigleDrugWarehouseOut(warehouseOut *models.XtSelfDrugWarehouseOut, tx *gorm.DB) error {
 
 	err := tx.Create(&warehouseOut).Error
@@ -9385,3 +9401,13 @@ func UpdateSelfDrugOutConfig(config models.XtSelfDrugOutConfig) error {
 
 	return err
 }
+
+func CreateSelfDrugFlowOne(flow models.XtSelfDrugFlow, tx *gorm.DB) error {
+
+	err := tx.Create(&flow).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/warhouse_service.go

@@ -9734,3 +9734,304 @@ func NewMobileHisGoodAutoCancelInfo(orgID int64, creater int64, project *models.
 	}
 	return err
 }
+
+// 药品手动出库 递归方式
+func AutoSelfDrugDeliverInfoFourtyOne(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:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
+			WarehousingDetailId:     warehouse.ID,
+			OverCount:               over_count,
+			RetailPrice:             drug_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
+			OperateTime:             time.Now().Unix(),
+		}
+		if warehouse.RetailPrice == 0 {
+			drugflow.Price = advice.Price
+		}
+
+		CreateSelfDrugFlowOne(drugflow, tx)
+
+		//更新出库id
+		UpdateSelfDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, 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
+		}
+		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:    drugWareInfo.ID,
+			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            advice.StorehouseId,
+			AdminUserId:             advice.AdminUserId,
+			LastPrice:               warehouse.Price,
+			StockCount:              advice.StockCount,
+			OverCount:               over_count,
+			RetailPrice:             drug_price, //手动出库出库价格
+			WarehousingId:           warehouse.ID,
+			WarehousingDetailId:     warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
+			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
+			OperateTime:             time.Now().Unix(),
+		}
+
+		CreateSelfDrugFlowOne(drugflow, tx)
+		//更新出库id
+		UpdateSelfDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+		// 出库完成后，要将该批次库存清零
+
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		advice.CountUnit = drup.MinUnit
+
+		AutoSelfDrugDeliverInfoFourtyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, unit, tx)
+	}
+
+	return
+}