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

conf/app.conf

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

controllers/dialysis_record_api_controller.go

@@ -80,7 +80,13 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	patients, _ := service.GetAllPcPatientListByListEight(orgID)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
+	if orgID == 9671 || orgID == 9675 || orgID == 10164 || orgID == 9679 {
+		redis.Set(key, scheduals_json_str, time.Second*60)
+	}
+	fmt.Println("len2o2o2o2o2", len(scheduals_json_str))
+
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+
 		scheduals, err := service.GetDialysisSchedualsOne(orgID, date.Unix())
 
 		if err != nil {
@@ -101,7 +107,17 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 
 				advices, _ := service.GetAllPcAdvicestByList(orgID, date.Unix())
 
+				inforMation, _ := service.GetTodayInforMation(orgID, date.Unix())
+
 				for key, item := range scheduals {
+
+					for _, infor := range inforMation {
+
+						if item.PatientId == infor.PatientId && item.BedId == infor.BedNumber {
+							scheduals[key].NewDeviceInformation = infor
+							break
+						}
+					}
 					// 获取患者信息
 					for _, patient := range patients {
 						if item.PatientId == patient.ID {

controllers/his_api_controller.go

@@ -1703,7 +1703,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										//查找该耗材的出库记录
 										goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSevenEight(project_id, patient_id, recordDateTime)
-
+										fmt.Println("goodWarehouseInfo---------------------------------------------", goodWarehouseInfo)
 										if len(goodWarehouseInfo) == 0 {
 											//查询耗材库存
 											list, _ := service.GetGoodWarehouseInfoSeven(project_id)
@@ -2287,7 +2287,6 @@ func (c *HisApiController) CreateHisPrescription() {
 			for _, item := range hisgoodlist {
 				//查询耗材最后一次出库记录
 				wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(item.ProjectId, patient_id, recordDateTime, item.ID)
-				fmt.Println("hh23h232323o23o23o2o32o23o2o3o2o23o32o23o2o323o23o23o23o23o23o")
 				//查询默认出库仓库库存
 				storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 				if len(wareOut) > 0 {
@@ -2297,8 +2296,11 @@ func (c *HisApiController) CreateHisPrescription() {
 						service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
 						//删除出库记录
 						service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
+						fmt.Println("it23------------------------------------------------", it.GoodId)
+						fmt.Println("it.Count------------------------------------------------", it.Count)
 						//出库数量减少
-						service.UpdateSumCount(it.OrgId, storeConfig.StorehouseOutInfo, it.ProjectId, it.Count)
+						service.UpdateSumCount(it.OrgId, storeConfig.StorehouseOutInfo, it.GoodId, it.Count)
+						service.UpdateActSumCount(it.OrgId, storeConfig.StorehouseOutInfo, it.GoodId, it.Count)
 					}
 				}
 
@@ -2374,6 +2376,23 @@ func (c *HisApiController) CreateHisPrescription() {
 					service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
 				}
 
+				if goodinfo.IsUser == 1 && goodinfo.IsWarehouse == 1 {
+					service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
+
+					//查询剩余库存
+					goodList, _ := service.GetAllGoodSumCount(item.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo)
+					var sum_count int64
+					for _, item := range goodList {
+						sum_count += item.StockCount
+					}
+
+					//更新剩余库存
+					service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.CurrentOrgId, sum_count)
+
+					//耗材
+					service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
+				}
+
 			}
 		}
 	}
@@ -2945,75 +2964,6 @@ func (c *HisApiController) DeletePrescription() {
 
 							//更新基础库库存
 							service.UpdateGoodInfoSumCountSix(item.ProjectId, flush_count, c.GetAdminUserInfo().CurrentOrgId)
-							//查询今日该耗材退库数量
-							//cancelInfoOne, _ := service.GetCancelStockInfoByPatientId(info.PatientId, item.ProjectId, info.SysRecordTime)
-							//var cancel_Count int64
-							//for _, items := range cancelInfoOne {
-							//	cancel_Count += items.Count
-							//}
-							//
-							//cha_count = total_count - cancel_Count
-							//
-							//if total_count > cancel_Count {
-							//
-							//	out, err := service.FindStockOutByIsSys(c.GetAdminUserInfo().CurrentOrgId, 1, info.SysRecordTime)
-							//	if err == gorm.ErrRecordNotFound {
-							//		//没有记录，则创建出库单
-							//		timeStr := time.Now().Format("2006-01-02")
-							//		timeArr := strings.Split(timeStr, "-")
-							//		total, _ := service.FindAllWarehouseOut(c.GetAdminUserInfo().CurrentOrgId)
-							//		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 = "CKD" + strconv.FormatInt(number, 10)
-							//		warehouseOut := models.WarehouseOut{
-							//			WarehouseOutOrderNumber: warehousing_out_order,
-							//			OperationTime:           time.Now().Unix(),
-							//			OrgId:                   c.GetAdminUserInfo().CurrentOrgId,
-							//			Creater:                 creater,
-							//			Ctime:                   time.Now().Unix(),
-							//			Status:                  1,
-							//			WarehouseOutTime:        info.SysRecordTime,
-							//			Dealer:                  0,
-							//			Manufacturer:            0,
-							//			Type:                    1,
-							//			IsSys:                   1,
-							//			StorehouseId:            houseConfig.StorehouseOutInfo,
-							//			IsCheck:                 1,
-							//		}
-							//		err := service.AddSigleWarehouseOut(&warehouseOut)
-							//		if err != nil {
-							//			utils.TraceLog("创建出库单失败 err = %v", err)
-							//			return
-							//		}
-							//		prepare := &models.DialysisBeforePrepare{
-							//			UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-							//			PatientId:    info.PatientId,
-							//			RecordDate:   info.SysRecordTime,
-							//			GoodId:       item.ProjectId,
-							//			GoodTypeId:   info.GoodTypeId,
-							//			Count:        cha_count,
-							//			StorehouseId: houseConfig.StorehouseOutInfo,
-							//		}
-							//		//出库
-							//		service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
-							//	} else if err == nil {
-							//
-							//		prepare := &models.DialysisBeforePrepare{
-							//			UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-							//			PatientId:    info.PatientId,
-							//			RecordDate:   info.SysRecordTime,
-							//			GoodId:       item.ProjectId,
-							//			GoodTypeId:   info.GoodTypeId,
-							//			Count:        cha_count,
-							//			StorehouseId: houseConfig.StorehouseOutInfo,
-							//		}
-							//		//出库
-							//		service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
-							//	}
-							//
-							//}
 
 						}
 
@@ -3074,9 +3024,6 @@ func (c *HisApiController) DeletePrescription() {
 					fmt.Println("历史出库数据", info.Count)
 					fmt.Println("出库数量", total_count)
 					if info.ID > 0 {
-
-						//回退库存
-						service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, item.ProjectId)
 						cancelStockInfo := models.CancelStockInfo{
 							GoodId:          item.ProjectId,
 							CancelStockId:   cancel.ID,
@@ -3107,121 +3054,106 @@ func (c *HisApiController) DeletePrescription() {
 
 						cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
 
-						flow := models.VmStockFlow{
-							WarehousingId:           info.WarehouseInfotId,
-							GoodId:                  item.ProjectId,
-							Number:                  info.Number,
-							LicenseNumber:           info.LicenseNumber,
-							Count:                   prescribingNumber,
-							UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-							PatientId:               item.PatientId,
-							SystemTime:              info.SysRecordTime,
-							ConsumableType:          7,
-							IsSys:                   0,
-							WarehousingOrder:        "",
-							WarehouseOutId:          info.WarehouseOutId,
-							WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-							IsEdit:                  0,
-							CancelStockId:           cancel.ID,
-							CancelOrderNumber:       cancel.OrderNumber,
-							Manufacturer:            manufacturer.ID,
-							Dealer:                  0,
-							Creator:                 c.GetAdminUserInfo().CurrentOrgId,
-							UpdateCreator:           0,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   0,
-							Price:                   info.Price,
-							WarehousingDetailId:     info.WarehouseInfotId,
-							WarehouseOutDetailId:    info.ID,
-							CancelOutDetailId:       cancelInfo.ID,
-							ProductDate:             info.ProductDate,
-							ExpireDate:              info.ExpiryDate,
-							StorehouseId:            houseConfig.StorehouseOutInfo,
-							OverCount:               flush_count,
+						//查询出库数量
+						list, _ := service.GetWarehouseOutInfoByProjectIdList(item.ID, c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, item.PatientId, info.SysRecordTime)
+
+						//出库数据 大于 退库数量
+						if len(list) > 0 {
+							for _, it := range list {
+								//回退库存
+								service.UpDateWarehouseInfoByStockDelete(it.WarehouseInfotId, it.Count, it.PatientId, it.SysRecordTime, it.ProjectId)
+								goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
+								var flush_count_one int64
+								for _, it := range goodList {
+									flush_count_one += it.StockCount
+								}
+								//查询该批次是否有退库数据
+								flow, _ := service.GetWarehouseStockFlow(it.WarehouseInfotId, it.GoodId, c.GetAdminUserInfo().CurrentOrgId, it.PatientId, it.SysRecordTime)
+								creater := c.GetAdminUserInfo().AdminUser.Id
+								if flow.ID == 0 {
+
+									flow := models.VmStockFlow{
+										WarehousingId:           it.WarehouseInfotId,
+										GoodId:                  it.GoodId,
+										Number:                  it.Number,
+										LicenseNumber:           it.LicenseNumber,
+										Count:                   it.Count,
+										UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+										PatientId:               it.PatientId,
+										SystemTime:              it.SysRecordTime,
+										ConsumableType:          7,
+										IsSys:                   0,
+										WarehousingOrder:        "",
+										WarehouseOutId:          it.WarehouseOutId,
+										WarehouseOutOrderNumber: it.WarehouseOutOrderNumber,
+										IsEdit:                  0,
+										CancelStockId:           cancel.ID,
+										CancelOrderNumber:       cancel.OrderNumber,
+										Manufacturer:            manufacturer.ID,
+										Dealer:                  0,
+										Creator:                 creater,
+										UpdateCreator:           0,
+										Status:                  1,
+										Ctime:                   time.Now().Unix(),
+										Mtime:                   0,
+										Price:                   it.Price,
+										WarehousingDetailId:     it.WarehouseInfotId,
+										WarehouseOutDetailId:    it.ID,
+										CancelOutDetailId:       cancelInfo.ID,
+										ProductDate:             it.ProductDate,
+										ExpireDate:              it.ExpiryDate,
+										StorehouseId:            houseConfig.StorehouseOutInfo,
+										OverCount:               flush_count_one,
+									}
+									service.CreateStockFlowOne(flow)
+								}
+								if flow.ID > 0 {
+									service.AddCountFlowOne(it.WarehouseInfotId, it.GoodId, c.GetAdminUserInfo().CurrentOrgId, it.PatientId, it.Count, it.SysRecordTime, flush_count_one)
+								}
+							}
+
 						}
-						service.CreateStockFlowOne(flow)
+
+						//flow := models.VmStockFlow{
+						//	WarehousingId:           info.WarehouseInfotId,
+						//	GoodId:                  item.ProjectId,
+						//	Number:                  info.Number,
+						//	LicenseNumber:           info.LicenseNumber,
+						//	Count:                   prescribingNumber,
+						//	UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+						//	PatientId:               item.PatientId,
+						//	SystemTime:              info.SysRecordTime,
+						//	ConsumableType:          7,
+						//	IsSys:                   0,
+						//	WarehousingOrder:        "",
+						//	WarehouseOutId:          info.WarehouseOutId,
+						//	WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+						//	IsEdit:                  0,
+						//	CancelStockId:           cancel.ID,
+						//	CancelOrderNumber:       cancel.OrderNumber,
+						//	Manufacturer:            manufacturer.ID,
+						//	Dealer:                  0,
+						//	Creator:                 c.GetAdminUserInfo().CurrentOrgId,
+						//	UpdateCreator:           0,
+						//	Status:                  1,
+						//	Ctime:                   time.Now().Unix(),
+						//	Mtime:                   0,
+						//	Price:                   info.Price,
+						//	WarehousingDetailId:     info.WarehouseInfotId,
+						//	WarehouseOutDetailId:    info.ID,
+						//	CancelOutDetailId:       cancelInfo.ID,
+						//	ProductDate:             info.ProductDate,
+						//	ExpireDate:              info.ExpiryDate,
+						//	StorehouseId:            houseConfig.StorehouseOutInfo,
+						//	OverCount:               flush_count,
+						//}
+						//service.CreateStockFlowOne(flow)
 
 						//退库数量增加
 						service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
 						//出库数量减少
 						service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, total_count)
 
-						//if info.Count < total_count {
-						//	//回退库存
-						//	service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, item.ProjectId)
-						//	cancelStockInfo := models.CancelStockInfo{
-						//		GoodId:          item.ProjectId,
-						//		CancelStockId:   cancel.ID,
-						//		GoodTypeId:      good.GoodTypeId,
-						//		Count:           info.Count,
-						//		Price:           info.Price,
-						//		Total:           0,
-						//		ProductDate:     info.ProductDate,
-						//		ExpiryDate:      info.ExpiryDate,
-						//		Ctime:           time.Now().Unix(),
-						//		Status:          1,
-						//		OrgId:           c.GetAdminUserInfo().CurrentOrgId,
-						//		OrderNumber:     cancel.OrderNumber,
-						//		Type:            0,
-						//		Dealer:          deaerler.DealerName,
-						//		Manufacturer:    manufacturer.ManufacturerName,
-						//		Number:          info.Number,
-						//		RegisterAccount: "",
-						//		Remark:          "",
-						//		WarehouseInfoId: info.WarehouseInfotId,
-						//		PatientId:       info.PatientId,
-						//		RecordDate:      info.SysRecordTime,
-						//		StorehouseId:    houseConfig.StorehouseOutInfo,
-						//		IsCheck:         1,
-						//	}
-						//
-						//	service.CreateCancelStockInfoOne(&cancelStockInfo)
-						//
-						//	cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
-						//
-						//	flow := models.VmStockFlow{
-						//		WarehousingId:           info.WarehouseInfotId,
-						//		GoodId:                  item.ProjectId,
-						//		Number:                  info.Number,
-						//		LicenseNumber:           info.LicenseNumber,
-						//		Count:                   info.Count,
-						//		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-						//		PatientId:               item.PatientId,
-						//		SystemTime:              info.SysRecordTime,
-						//		ConsumableType:          7,
-						//		IsSys:                   0,
-						//		WarehousingOrder:        "",
-						//		WarehouseOutId:          info.WarehouseOutId,
-						//		WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-						//		IsEdit:                  0,
-						//		CancelStockId:           cancel.ID,
-						//		CancelOrderNumber:       cancel.OrderNumber,
-						//		Manufacturer:            manufacturer.ID,
-						//		Dealer:                  0,
-						//		Creator:                 c.GetAdminUserInfo().CurrentOrgId,
-						//		UpdateCreator:           0,
-						//		Status:                  1,
-						//		Ctime:                   time.Now().Unix(),
-						//		Mtime:                   0,
-						//		Price:                   info.Price,
-						//		WarehousingDetailId:     info.WarehouseInfotId,
-						//		WarehouseOutDetailId:    info.ID,
-						//		CancelOutDetailId:       cancelInfo.ID,
-						//		ProductDate:             info.ProductDate,
-						//		ExpireDate:              info.ExpiryDate,
-						//		StorehouseId:            houseConfig.StorehouseOutInfo,
-						//		OverCount:               flush_count,
-						//	}
-						//	service.CreateStockFlowOne(flow)
-						//
-						//	//退库数量增加
-						//	service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, info.Count)
-						//	//出库数量减少
-						//	service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, info.Count)
-						//
-						//}
-
 						//查询已出库数量
 						dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
 
@@ -3278,6 +3210,7 @@ func (c *HisApiController) DeletePrescription() {
 		}
 
 	} else {
+
 		if drugOutConfig.IsOpen == 1 {
 			if len(advices) > 0 {
 				for _, item := range advices {
@@ -3285,6 +3218,13 @@ func (c *HisApiController) DeletePrescription() {
 					service.DrugAutoAddCancelInfo(item, creater)
 				}
 			}
+		} else {
+			if len(advices) > 0 {
+				for _, item := range advices {
+					creater := c.GetAdminUserInfo().AdminUser.Id
+					service.DrugAutoAddCancelInfo(item, creater)
+				}
+			}
 		}
 	}
 
@@ -3474,6 +3414,7 @@ func (c *HisApiController) DeleteProject() {
 			}
 
 			if project.Type == 3 && project.IsOut == 1 {
+
 				houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 				f_count, _ := strconv.ParseFloat(project.Count, 64)
@@ -3506,7 +3447,7 @@ func (c *HisApiController) DeleteProject() {
 				cancel, _ := service.GetLastCancelStockById(adminInfo.CurrentOrgId)
 				floatPrescrip := strconv.FormatFloat(f_count, 'f', -1, 32)
 				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
-				//获取出库数据
+				//查询是否有出库
 				info, _ := service.GetLastWarehoseByGoodId(project.ProjectId, project.PatientId, project.RecordDate)
 
 				manufacturer, _ := service.GetManufactureById(info.Manufacturer)
@@ -3584,12 +3525,15 @@ func (c *HisApiController) DeleteProject() {
 						service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, info.Count)
 					}
 
+					//查询剩余库存
 					goodList, _ := service.GetSumGoodList(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId)
 					var over_count int64
 					for _, it := range goodList {
 						over_count += it.StockCount
 					}
+					//出库数据 大于 退库数量
 					if info.Count >= prescribingNumber {
+
 						flow := models.VmStockFlow{
 							WarehousingId:           info.WarehouseInfotId,
 							GoodId:                  project.ProjectId,
@@ -3626,6 +3570,7 @@ func (c *HisApiController) DeleteProject() {
 						service.CreateStockFlowOne(flow)
 					}
 
+					//出库数据小于退库数据
 					if info.Count < prescribingNumber {
 						flow := models.VmStockFlow{
 							WarehousingId:           info.WarehouseInfotId,
@@ -3679,84 +3624,6 @@ func (c *HisApiController) DeleteProject() {
 					//更新剩余库存
 					service.UpdateSumGood(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, over_count)
 
-					//查询今日该患者开了多少耗材
-					//projectList, _ := service.GetHisPrepscritionByPatientId(info.PatientId, project.ProjectId, info.SysRecordTime)
-					//
-					//var total_count int64
-					//var cha_count int64
-					//for _, item := range projectList {
-					//	count, _ := strconv.ParseInt(item.Count, 10, 64)
-					//	total_count += count
-					//}
-					//
-					////查询今日该耗材退库数量
-					//cancelInfoOne, _ := service.GetCancelStockInfoByPatientId(info.PatientId, project.ProjectId, info.SysRecordTime)
-					//var cancel_count int64
-					//for _, items := range cancelInfoOne {
-					//	cancel_count += items.Count
-					//}
-					//
-					//cha_count = total_count - cancel_count
-					//
-					//if total_count > cancel_count {
-					//
-					//	out, err := service.FindStockOutByIsSys(adminInfo.CurrentOrgId, 1, info.SysRecordTime)
-					//	if err == gorm.ErrRecordNotFound {
-					//		//没有记录，则创建出库单
-					//		timeStr := time.Now().Format("2006-01-02")
-					//		timeArr := strings.Split(timeStr, "-")
-					//		total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
-					//		total = total + 1
-					//		warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-					//		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-					//		number = number + total
-					//		warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-					//		warehouseOut := models.WarehouseOut{
-					//			WarehouseOutOrderNumber: warehousing_out_order,
-					//			OperationTime:           time.Now().Unix(),
-					//			OrgId:                   adminInfo.CurrentOrgId,
-					//			Creater:                 creater,
-					//			Ctime:                   time.Now().Unix(),
-					//			Status:                  1,
-					//			WarehouseOutTime:        info.SysRecordTime,
-					//			Dealer:                  0,
-					//			Manufacturer:            0,
-					//			Type:                    1,
-					//			IsSys:                   1,
-					//			StorehouseId:            houseConfig.StorehouseOutInfo,
-					//		}
-					//		err := service.AddSigleWarehouseOut(&warehouseOut)
-					//		if err != nil {
-					//			utils.TraceLog("创建出库单失败 err = %v", err)
-					//			return
-					//		}
-					//		prepare := &models.DialysisBeforePrepare{
-					//			UserOrgId:    adminInfo.CurrentOrgId,
-					//			PatientId:    info.PatientId,
-					//			RecordDate:   info.SysRecordTime,
-					//			GoodId:       project.ProjectId,
-					//			GoodTypeId:   info.GoodTypeId,
-					//			Count:        cha_count,
-					//			StorehouseId: houseConfig.StorehouseOutInfo,
-					//		}
-					//		//出库
-					//		service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
-					//	} else if err == nil {
-					//		prepare := &models.DialysisBeforePrepare{
-					//			UserOrgId:    adminInfo.CurrentOrgId,
-					//			PatientId:    info.PatientId,
-					//			RecordDate:   info.SysRecordTime,
-					//			GoodId:       project.ProjectId,
-					//			GoodTypeId:   info.GoodTypeId,
-					//			Count:        cha_count,
-					//			StorehouseId: houseConfig.StorehouseOutInfo,
-					//		}
-					//		//出库
-					//		service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
-					//	}
-					//
-					//}
-
 					stockList, _ := service.GetStockCountByGoodId(project.ProjectId, houseConfig.StorehouseOutInfo, project.UserOrgId)
 					var total_count_one int64
 					for _, it := range stockList {
@@ -3798,11 +3665,13 @@ func (c *HisApiController) DeleteProject() {
 		}
 	}
 
+	//保存处方出库
 	if goodOutConfig.IsOpen == 1 {
 
 		if project.Type == 3 {
 			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
+
 			f_count, _ := strconv.ParseFloat(project.Count, 64)
 
 			operation_time := time.Now().Unix()
@@ -3868,19 +3737,18 @@ func (c *HisApiController) DeleteProject() {
 					}
 
 					service.CreateCancelStockInfoOne(&cancelStockInfo)
-					//回退库存
-					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, prescribingNumber, info.PatientId, info.SysRecordTime, project.ProjectId)
+
 					//退库数量增加
-					service.UpdateSumAddCancelCount(adminInfo.CurrentOrgId, project.ProjectId, houseConfig.StorehouseOutInfo, prescribingNumber)
+					//service.UpdateSumAddCancelCount(adminInfo.CurrentOrgId, project.ProjectId, houseConfig.StorehouseOutInfo, prescribingNumber)
 					//出库数量减少
-					service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, prescribingNumber)
+					//service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, prescribingNumber)
 				}
 				if info.Count < prescribingNumber {
 					cancelStockInfo := models.CancelStockInfo{
 						GoodId:          project.ProjectId,
 						CancelStockId:   cancel.ID,
 						GoodTypeId:      good.GoodTypeId,
-						Count:           info.Count,
+						Count:           prescribingNumber,
 						Price:           info.Price,
 						Total:           0,
 						ProductDate:     info.ProductDate,
@@ -3904,11 +3772,8 @@ func (c *HisApiController) DeleteProject() {
 
 					service.CreateCancelStockInfoOne(&cancelStockInfo)
 					//回退库存
-					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, project.ProjectId)
-					//退库数量增加
-					service.UpdateSumAddCancelCount(adminInfo.CurrentOrgId, project.ProjectId, houseConfig.StorehouseOutInfo, info.Count)
-					//出库数量减少
-					service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, info.Count)
+					//service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, project.ProjectId)
+
 				}
 
 				goodList, _ := service.GetSumGoodList(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId)
@@ -3916,78 +3781,68 @@ func (c *HisApiController) DeleteProject() {
 				for _, it := range goodList {
 					over_count += it.StockCount
 				}
-				if info.Count >= prescribingNumber {
-					flow := models.VmStockFlow{
-						WarehousingId:           info.WarehouseInfotId,
-						GoodId:                  project.ProjectId,
-						Number:                  info.Number,
-						LicenseNumber:           info.LicenseNumber,
-						Count:                   prescribingNumber,
-						UserOrgId:               adminInfo.CurrentOrgId,
-						PatientId:               project.PatientId,
-						SystemTime:              info.SysRecordTime,
-						ConsumableType:          7,
-						IsSys:                   0,
-						WarehousingOrder:        "",
-						WarehouseOutId:          info.WarehouseOutId,
-						WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-						IsEdit:                  0,
-						CancelStockId:           cancel.ID,
-						CancelOrderNumber:       cancel.OrderNumber,
-						Manufacturer:            manufacturer.ID,
-						Dealer:                  0,
-						Creator:                 adminInfo.AdminUser.Id,
-						UpdateCreator:           0,
-						Status:                  1,
-						Ctime:                   time.Now().Unix(),
-						Mtime:                   0,
-						Price:                   info.Price,
-						WarehousingDetailId:     info.WarehouseInfotId,
-						WarehouseOutDetailId:    info.ID,
-						CancelOutDetailId:       cancelInfo.ID,
-						ProductDate:             info.ProductDate,
-						ExpireDate:              info.ExpiryDate,
-						StorehouseId:            houseConfig.StorehouseOutInfo,
-						OverCount:               over_count,
-					}
-					service.CreateStockFlowOne(flow)
-				}
 
-				if info.Count < prescribingNumber {
-					flow := models.VmStockFlow{
-						WarehousingId:           info.WarehouseInfotId,
-						GoodId:                  project.ProjectId,
-						Number:                  info.Number,
-						LicenseNumber:           info.LicenseNumber,
-						Count:                   info.Count,
-						UserOrgId:               adminInfo.CurrentOrgId,
-						PatientId:               project.PatientId,
-						SystemTime:              info.SysRecordTime,
-						ConsumableType:          7,
-						IsSys:                   0,
-						WarehousingOrder:        "",
-						WarehouseOutId:          info.WarehouseOutId,
-						WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-						IsEdit:                  0,
-						CancelStockId:           cancel.ID,
-						CancelOrderNumber:       cancel.OrderNumber,
-						Manufacturer:            manufacturer.ID,
-						Dealer:                  0,
-						Creator:                 adminInfo.AdminUser.Id,
-						UpdateCreator:           0,
-						Status:                  1,
-						Ctime:                   time.Now().Unix(),
-						Mtime:                   0,
-						Price:                   info.Price,
-						WarehousingDetailId:     info.WarehouseInfotId,
-						WarehouseOutDetailId:    info.ID,
-						CancelOutDetailId:       cancelInfo.ID,
-						ProductDate:             info.ProductDate,
-						ExpireDate:              info.ExpiryDate,
-						StorehouseId:            houseConfig.StorehouseOutInfo,
-						OverCount:               over_count,
+				//查询出库数量
+				list, _ := service.GetWarehouseOutInfoByProjectIdList(id, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, project.PatientId, info.SysRecordTime)
+
+				//出库数据 大于 退库数量
+				if len(list) > 0 {
+					for _, it := range list {
+						//回退库存
+						service.UpDateWarehouseInfoByStockDelete(it.WarehouseInfotId, it.Count, it.PatientId, it.SysRecordTime, it.ProjectId)
+						//退库数量增加
+						service.UpdateSumAddCancelCount(adminInfo.CurrentOrgId, project.ProjectId, houseConfig.StorehouseOutInfo, it.Count)
+						//出库数量减少
+						service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, it.Count)
+						goodList, _ := service.GetSumGoodList(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId)
+						var over_count_one int64
+						for _, it := range goodList {
+							over_count_one += it.StockCount
+						}
+						//查询该批次是否有退库数据
+						flow, _ := service.GetWarehouseStockFlow(it.WarehouseInfotId, it.GoodId, adminInfo.CurrentOrgId, it.PatientId, it.SysRecordTime)
+
+						if flow.ID == 0 {
+							flow := models.VmStockFlow{
+								WarehousingId:           it.WarehouseInfotId,
+								GoodId:                  it.GoodId,
+								Number:                  it.Number,
+								LicenseNumber:           it.LicenseNumber,
+								Count:                   it.Count,
+								UserOrgId:               adminInfo.CurrentOrgId,
+								PatientId:               it.PatientId,
+								SystemTime:              it.SysRecordTime,
+								ConsumableType:          7,
+								IsSys:                   0,
+								WarehousingOrder:        "",
+								WarehouseOutId:          it.WarehouseOutId,
+								WarehouseOutOrderNumber: it.WarehouseOutOrderNumber,
+								IsEdit:                  0,
+								CancelStockId:           cancel.ID,
+								CancelOrderNumber:       cancel.OrderNumber,
+								Manufacturer:            manufacturer.ID,
+								Dealer:                  0,
+								Creator:                 adminInfo.AdminUser.Id,
+								UpdateCreator:           0,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   0,
+								Price:                   it.Price,
+								WarehousingDetailId:     it.WarehouseInfotId,
+								WarehouseOutDetailId:    it.ID,
+								CancelOutDetailId:       cancelInfo.ID,
+								ProductDate:             it.ProductDate,
+								ExpireDate:              it.ExpiryDate,
+								StorehouseId:            houseConfig.StorehouseOutInfo,
+								OverCount:               over_count_one,
+							}
+							service.CreateStockFlowOne(flow)
+						}
+						if flow.ID > 0 {
+							service.AddCountFlowOne(it.WarehouseInfotId, it.GoodId, adminInfo.CurrentOrgId, it.PatientId, it.Count, it.SysRecordTime, over_count_one)
+						}
 					}
-					service.CreateStockFlowOne(flow)
+
 				}
 
 				//查询已出库数量
@@ -6301,6 +6156,7 @@ func (c *HisApiController) GetUploadInfo() {
 						service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 						service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 					}
+
 				}
 				orgId := c.GetAdminUserInfo().CurrentOrgId
 
@@ -6374,6 +6230,20 @@ func (c *HisApiController) GetUploadInfo() {
 							service.UpdateGoodSumCountSeven(sum_count, item.GoodId, adminUser.CurrentOrgId)
 						}
 
+						if goodInfo.IsUser == 1 && goodInfo.IsWarehouse == 1 {
+							service.ConsumableSettleDelivery(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, &dialyPrepareOne, &lastOut, adminUser.AdminUser.Id, order.ID)
+							//查询剩余库存
+							goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
+							var sum_count int64
+							for _, item := range goodList {
+								sum_count += item.StockCount
+							}
+							service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.CurrentOrgId, sum_count)
+
+							//耗材
+							service.UpdateGoodSumCountSeven(sum_count, item.GoodId, adminUser.CurrentOrgId)
+						}
+
 					}
 				}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3333,6 +3333,13 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		ScheduleRemark:         schedule_remark,
 	}
 
+	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
+
+		if tempDialysisRecord.BedID != bedID {
+			service.UpdateDeviceInformation(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
+		}
+	}
+
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
 	order, _ := service.GetLastPatientOrder(record_id)
 	service.UpdateMobilePatient(adminUserInfo.Org.Id, order.PatientId, schedule_remark)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -4182,7 +4182,7 @@ func (c *PatientApiController) ExecProject() {
 				loc, _ := time.LoadLocation("Local")
 				execuTime, _ := time.ParseInLocation(timeLayout3, scheduleDateStart, loc)
 				//查询该耗材是否已经出库
-				auto, _ := service.GetAutoStockOutById(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
+				auto, _ := service.GetAutoWarehouseOutList(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
 				if auto.ID == 0 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStockExced)
 					return
@@ -4203,7 +4203,7 @@ func (c *PatientApiController) ExecProject() {
 				loc, _ := time.LoadLocation("Local")
 				execuTime, _ := time.ParseInLocation(timeLayout3, scheduleDateStart, loc)
 				//查询该耗材是否已经出库
-				auto, _ := service.GetAutoStockOutById(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
+				auto, _ := service.GetAutoWarehouseOutList(project.ProjectId, execuTime.Unix(), adminInfo.Org.Id, project.PatientId)
 				if auto.ID == 0 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStockExced)
 					return

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -127,7 +127,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

controllers/stock_in_api_controller.go

@@ -7428,13 +7428,14 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	Creator := this.GetAdminUserInfo().AdminUser.Id
 	//查询默认仓库
 	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
 	//更改审核状态
 	err := service.UpdateCheckWarehouseInfo(warehousing_info_id)
 	if err == nil {
 		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
 
 		for _, item := range list {
-			service.UpdateWarehouseInfoByIdList(item.WarehousingCount, item.ID)
+			service.UpdateWarehouseInfoByIdListThree(item.WarehousingCount, item.ID)
 
 			//查询该耗材剩余库存库
 			stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)

models/dialysis.go

@@ -1419,3 +1419,43 @@ type HisDoctorAdviceFourty struct {
 func (HisDoctorAdviceFourty) TableName() string {
 	return "his_doctor_advice_info"
 }
+
+type NewDialysisOrder struct {
+	ID                 int64  `gorm:"column:id" json:"id"`
+	DialysisDate       int64  `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id"`
+	Stage              int64  `gorm:"column:stage" json:"stage"`
+	BedID              int64  `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse         int64  `gorm:"column:start_nurse" json:"start_nurse"`
+	FinishNurse        int64  `gorm:"column:finish_nurse" json:"finish_nurse"`
+	Status             int64  `gorm:"column:status" json:"status"`
+	DialysisDialyszers string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	BloodAccessId      int64  `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
+	NucleinDate        int64  `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
+	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	OrderRemark        string `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
+	DialysisTotal      int64  `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
+}
+
+func (NewDialysisOrder) TableName() string {
+	return "xt_dialysis_order"
+}
+
+type NewAssessmentAfterDislysis struct {
+	ID                     int64   `gorm:"column:id" json:"id"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	DialysisOrderId        int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	ActualUltrafiltration  float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration"`
+	WeightLoss             float64 `gorm:"column:weight_loss" json:"weight_loss"`
+	Status                 int64   `gorm:"column:status" json:"status"`
+}
+
+func (NewAssessmentAfterDislysis) TableName() string {
+	return "xt_assessment_after_dislysis"
+}

models/good_models.go

@@ -277,7 +277,7 @@ type GoodInformationThirty struct {
 	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
 	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	Number                      string  `gorm:"column:number" json:"number" form:"number"`
-	IsWarehouse                 string  `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	IsWarehouse                 int64   `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
 	BatchRetaiPrice             float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
 	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`

models/patient_models.go

@@ -1657,3 +1657,75 @@ type PatientsThirty struct {
 func (PatientsThirty) TableName() string {
 	return "xt_patients"
 }
+
+type XtNewPatients 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"`
+	DialysisNo         string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber    string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source             int64  `gorm:"column:source" json:"source" form:"source"`
+	Lapseto            int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Name               string `gorm:"column:name" json:"name" form:"name"`
+	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtNewPatients) TableName() string {
+
+	return "xt_patients"
+}
+
+type XtNewAssessmentBeforeDislysis 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"`
+	AssessmentDate        int64   `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+	DryWeight             float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	WeightBefore          float64 `gorm:"column:weight_before" json:"weight_before" form:"weight_before"`
+	UltrafiltrationAmount float64 `gorm:"column:ultrafiltration_amount" json:"ultrafiltration_amount" form:"ultrafiltration_amount"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtNewAssessmentBeforeDislysis) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+type NewDialysisSolution struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	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"`
+	Type                   int64   `gorm:"column:type" json:"type" form:"type"`
+	Anticoagulant          int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji    float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantWeichi    float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	ModeName               string  `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
+	ModeId                 int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Glucose                float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	Kalium                 float64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	Sodium                 float64 `gorm:"column:sodium" json:"sodium" form:"sodium"`
+	Calcium                float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Remark                 string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ultrafiltration        float64 `gorm:"column:ultrafiltration" json:"ultrafiltration"`
+	DialysisDurationHour   int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
+	DialysisDurationMinute int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
+	TargetUltrafiltration  float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
+	DialysisDialyszers     string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation     string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	MaxUltrafiltrationRate float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	SolutionStatus         int64   `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
+	DialysisRemark         string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	BloodAccess            int64   `gorm:"column:blood_access" json:"blood_access"`
+}
+
+func (NewDialysisSolution) TableName() string {
+	return "xt_dialysis_solution"
+}

models/schedule_models.go

@@ -547,3 +547,35 @@ type VmBloodScheduleOne struct {
 func (VmBloodScheduleOne) TableName() string {
 	return "xt_schedule"
 }
+
+type VmNewSchedulesRemind 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"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+
+	DeviceZone                 DeviceZone                    `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber               DeviceNumber                  `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	DialysisOrder              NewDialysisOrder              `json:"order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	XtPatients                 XtNewPatients                 `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	DoctorAdvice               []*DoctorAdvice               `json:"doctoradvice" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisPrescription       DialysisPrescription          `json:"prescription" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo        `json:"hisdoctoradviceinfo" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisSolution           NewDialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
+	XtAssessmentBeforeDislysis XtNewAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	LastAfterWeight            NewAssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	XtDialysisOrderSix         XtDialysisOrderSix            `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+}
+
+func (VmNewSchedulesRemind) TableName() string {
+	return "xt_schedule"
+}

models/stock_models.go

@@ -285,6 +285,7 @@ type WarehouseOutInfoNight struct {
 	SysRecordTime           int64                 `gorm:"column:sys_record_time" json:"sys_record_time"`
 	PatientId               int64                 `gorm:"column:patient_id" json:"patient_id"`
 	ProjectId               int64                 `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	WarehouseOutId          int64                 `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
 	WarehouseInfotId        int64                 `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
 	IsSys                   int64                 `gorm:"column:is_sys" json:"is_sys"`
 	Status                  int64                 `gorm:"column:status" json:"status"`
@@ -1301,6 +1302,7 @@ type PatientWarehouseInfo struct {
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 }
 
 func (PatientWarehouseInfo) TableName() string {

service/dialysis_service.go

@@ -2038,3 +2038,9 @@ func GetLastOrder(user_org_id int64, patient_id int64, dialysis_date int64) (mod
 
 	return twenty, err
 }
+
+func GetTodayInforMation(orgid int64, record_date int64) (list []*NewDeviceInformation, err error) {
+
+	err = UserReadDB().Where("user_org_id = ? and date = ? and status = 1", orgid, record_date).Find(&list).Error
+	return list, err
+}

service/mobile_dialysis_service.go

@@ -111,6 +111,7 @@ type MDialysisScheduleVM struct {
 	HisAdvices               []*VMHisDoctorAdviceInfo          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"his_doctor_advice"`
 	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
+	NewDeviceInformation     *NewDeviceInformation             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"device_information"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -355,6 +356,24 @@ func (VMAssessmentAfterDislysis) TableName() string {
 	return "xt_assessment_after_dislysis"
 }
 
+type NewDeviceInformation struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	Date       int64  `gorm:"column:date" json:"date" form:"date"`
+	Class      int64  `gorm:"column:class" json:"class" form:"class"`
+	Zone       int64  `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber  int64  `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	Bed        string `gorm:"column:bed" json:"bed" form:"bed"`
+	Stime      int64  `gorm:"column:stime" json:"stime" form:"stime"`
+}
+
+func (NewDeviceInformation) TableName() string {
+	return "xt_device_information"
+}
+
 // 获取透析记录
 func MobileGetDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder
@@ -5222,3 +5241,10 @@ func UpdateDialysisOrder(patient_id int64, dialysis_date int64, user_org_id int6
 
 	return order, err
 }
+
+func UpdateDeviceInformation(patientid int64, dialysis_date int64) error {
+
+	information := models.DeviceInformation{}
+	err := UserWriteDB().Model(&information).Where("patient_id = ? and date = ? and status = 1", patientid, dialysis_date).Update(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/new_stock_service.go

@@ -145,6 +145,18 @@ func UpdateSumCount(user_org_id int64, storehouse_id int64, good_id int64, count
 	return err
 }
 
+func UpdateActSumCount(user_org_id int64, storehouse_id int64, good_id int64, count int64) error {
+	ut := XTWriteDB().Begin()
+
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count - ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
 func GetSendGoodInformation(org_id int64) (info []*models.WarehousingInfo, err error) {
 
 	err = XTReadDB().Where("org_id = ? and is_check = 1 and status = 1", org_id).Find(&info).Error
@@ -514,3 +526,25 @@ func ReduceDrugStockCountSeven(storehouse_id int64, drug_id int64, user_org_id i
 	db.Commit()
 	return err
 }
+
+func GetWarehouseOutInfoByProjectIdList(project_id int64, org_id int64, storehouse_id int64, good_id int64, patient_id int64, sys_record_time int64) (info []*models.WarehouseOutInfoNight, err error) {
+
+	err = XTReadDB().Where("project_id = ? and org_id = ? and storehouse_id = ? and good_id = ? and patient_id = ? and sys_record_time = ?", project_id, org_id, storehouse_id, good_id, patient_id, sys_record_time).Find(&info).Error
+	return info, err
+}
+
+func GetWarehouseStockFlow(warehouse_info_id int64, good_id int64, user_org_id int64, patient_id int64, system_time int64) (models.VmStockFlow, error) {
+
+	stockFlow := models.VmStockFlow{}
+	err := XTReadDB().Where("warehousing_detail_id = ? and good_id = ? and user_org_id = ? and patient_id = ? AND consumable_type = 7 and system_time = ?", warehouse_info_id, good_id, user_org_id, patient_id, system_time).Find(&stockFlow).Error
+	return stockFlow, err
+}
+
+func AddCountFlowOne(warehouse_info_id int64, good_id int64, user_org_id int64, patient_id int64, count int64, system_time int64, over_count int64) error {
+
+	stockFlow := models.VmStockFlow{}
+	err := XTWriteDB().Model(&stockFlow).Where("warehousing_detail_id = ? and good_id = ? and user_org_id = ? and patient_id = ? AND consumable_type = 7 and system_time = ?", warehouse_info_id, good_id, user_org_id, patient_id, system_time).UpdateColumn("count", gorm.Expr("count + ?", count)).Error
+
+	err = XTWriteDB().Model(&stockFlow).Where("warehousing_detail_id = ? and good_id = ? and user_org_id = ? and patient_id = ? AND consumable_type = 7 and system_time = ?").Update(map[string]interface{}{"over_count": over_count}).Error
+	return err
+}

service/new_warehouse_service.go

@@ -2129,19 +2129,20 @@ func UpdateHisPrescriptionProjectStatus(project_id int64, record_time int64, use
 	return project, err
 }
 
-// 药品自动出库 递归方式
-func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, prescribingCount float64) (err error) {
+// 药品自动出库 递归方式  deliver_number_one已经转成最小数量
+func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, deliver_number_one int64) (err error) {
 
+	fmt.Println("deliver_number_one -----------------------------------------", deliver_number_one)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
-	var deliver_number_one int64 = 0
+	//var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
-	prescribingCount_temp := strconv.FormatFloat(math.Abs(prescribingCount), 'f', 0, 64)
-	prescribe_count, _ := strconv.ParseInt(prescribingCount_temp, 10, 64)
+	//prescribingCount_temp := strconv.FormatFloat(math.Abs(prescribingCount), 'f', 0, 64)
+	//prescribe_count, _ := strconv.ParseInt(prescribingCount_temp, 10, 64)
 
 	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
@@ -2152,13 +2153,13 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 	}
 
-	if advice.PrescribingNumberUnit == drup.MaxUnit {
-		deliver_number_one = prescribe_count * drup.MinNumber
-
-	} else {
-		deliver_number_one = prescribe_count
-
-	}
+	//if advice.PrescribingNumberUnit == drup.MaxUnit {
+	//	deliver_number_one = prescribe_count * drup.MinNumber
+	//
+	//} else {
+	//	deliver_number_one = prescribe_count
+	//
+	//}
 
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
@@ -2427,7 +2428,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_number_one", deliver_number)
+		fmt.Println("deliver_number_one", deliver_number_one)
 		fmt.Println("out_count", out_count)
 		fmt.Println("cancel_count", cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
@@ -2509,6 +2510,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		}
 
+		fmt.Println("出库数据", deliver_number_one)
+		fmt.Println("马文强out_count233232232ooqw", out_count)
+		fmt.Println("马cancel_count33232232ooqw", cancel_count)
 		//如果本次出库数据小于历史出库数据 新增1条退库流水
 		if deliver_number_one < (out_count - cancel_count) {
 
@@ -2953,7 +2957,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		advice.PrescribingNumberUnit = drup.MinUnit
 		fmt.Println("剩余库存9999999233232", overPlusNumber)
 
-		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, prescribingCount)
+		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, deliver_number_one)
 	}
 
 	return

service/stock_service.go

@@ -5080,6 +5080,12 @@ func GetStockFlowIsBatchNumberSix(patient_id int64, record_time int64, good_id i
 	return flow, nil
 }
 
+func GetStockFlowIsBatchNumberSixty(patient_id int64, record_time int64, good_id int64, project_id int64) (flow []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and good_id = ? and status = 1 and project_id = ?", patient_id, record_time, good_id, project_id).Find(&flow).Error
+	return flow, nil
+}
+
 func GetStockFlowIsBatchNumberTwo(patient_id int64, record_time int64, good_id int64) (flow []*models.WarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and good_id = ? and status = 1 ", patient_id, record_time, good_id).Find(&flow).Error
@@ -5098,6 +5104,12 @@ func GetStockFlowIsBatchNumberFour(patient_id int64, record_time int64, good_id
 	return flow, nil
 }
 
+func GetStockFlowIsBatchNumberFourty(patient_id int64, record_time int64, good_id int64, project_id int64) (flow []*models.VmStockFlow, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and system_time = ? and good_id = ? and status = 1 and consumable_type =7 and project_id = ?", patient_id, record_time, good_id, project_id).Find(&flow).Error
+	return flow, nil
+}
+
 func GetWarehouseOutInfoIsExist(id int64) (*models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
@@ -5223,10 +5235,10 @@ func UpdatedWarehouseOutInfo(info *models.WarehouseOutInfo, good_id int64, patie
 	return err
 }
 
-func UpdatedWarehouseOutInfoTwo(info *models.WarehouseOutInfo, good_id int64, patient_id int64, record_time int64) error {
+func UpdatedWarehouseOutInfoSix(info *models.WarehouseOutInfo, good_id int64, patient_id int64, record_time int64, project_id int64, warehouse_info_id int64) error {
 
 	outInfo := models.WarehouseOutInfo{}
-	err := XTWriteDB().Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", good_id, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": info.WarehouseOutId, "WarehouseOutOrderNumber": info.WarehouseOutOrderNumber, "sys_record_time": info.SysRecordTime, "good_type_id": info.GoodTypeId, "patient_id": info.PatientId, "consumable_type": info.ConsumableType, "count": info.Count, "price": info.Price, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "license_number": info.LicenseNumber}).Error
+	err := XTWriteDB().Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1 and project_id = ? and warehouse_info_id =? ", good_id, patient_id, record_time, project_id, warehouse_info_id).Updates(map[string]interface{}{"warehouse_out_id": info.WarehouseOutId, "WarehouseOutOrderNumber": info.WarehouseOutOrderNumber, "sys_record_time": info.SysRecordTime, "good_type_id": info.GoodTypeId, "patient_id": info.PatientId, "consumable_type": info.ConsumableType, "count": info.Count, "price": info.Price, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "license_number": info.LicenseNumber, "over_count": info.OverCount}).Error
 	return err
 }
 
@@ -6930,6 +6942,13 @@ func GetAutoStockOutById(good_id, record_date int64, orgid int64, patient_id int
 	return detail, err
 }
 
+func GetAutoWarehouseOutList(good_id, record_date int64, orgid int64, patient_id int64) (models.WarehouseOutInfoNight, error) {
+
+	detail := models.WarehouseOutInfoNight{}
+	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and status = 1 and patient_id = ?", good_id, record_date, orgid, patient_id).Find(&detail).Error
+	return detail, err
+}
+
 func GetAdviceConfig(orgid int64) (*models.XtAdviceSetting, error) {
 
 	setting := models.XtAdviceSetting{}
@@ -7351,6 +7370,23 @@ func UpdateWarehouseInfoByIdList(count int64, id int64) error {
 	return err
 }
 
+func UpdateWarehouseInfoByIdListThree(count int64, id int64) error {
+
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"stock_count": count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return err
+}
+
 func ReturnCheckWarehouseInfo(id int64) error {
 
 	tx := XTWriteDB().Begin()
@@ -8367,11 +8403,17 @@ func GetWarehouseOutInfoIsExistThree(good_id int64, patient_id int64, record_tim
 	return info, err
 }
 
-func GetWarehouseOutInfoIsExistSix(good_id int64, patient_id int64, record_time int64, project_id int64) (*models.WarehouseOutInfo, error) {
+func GetWarehouseOutInfoIsExistTen(good_id int64, patient_id int64, record_time int64, project_id int64, warehouse_info_id int64) (models.WarehouseOutInfo, error) {
+	info := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ? and warehouse_info_id = ?", good_id, record_time, patient_id, project_id, warehouse_info_id).Find(&info).Error
+	return info, err
+}
+
+func GetNewWarehouseOutInfoIsExistSix(good_id int64, patient_id int64, record_time int64, project_id int64, warehouse_info_id int64) (*models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
 	var err error
-	err = XTReadDB().Model(&info).Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ?", good_id, record_time, patient_id, project_id).Find(&info).Error
+	err = XTReadDB().Model(&info).Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ? and warehouse_info_id = ?", good_id, record_time, patient_id, project_id, warehouse_info_id).Find(&info).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}

service/warhouse_service.go

@@ -9878,6 +9878,24 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 	stock_number = warehouse.StockCount
 
+	maxNumber = goods.Count
+
+	if warehouse.StockCount < maxNumber {
+		return errors.New("库存数量不足")
+	}
+
+	warehouse.StockCount = warehouse.StockCount - maxNumber
+	warehouse.Mtime = time.Now().Unix()
+
+	//扣减库存
+	errThree := UpDateWarehouseInfoByStock(&warehouse)
+
+	//查询剩余库存
+	goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
+	var sum_count int64
+	for _, item := range goodList {
+		sum_count += item.StockCount
+	}
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -9905,6 +9923,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			StorehouseId:            goods.StorehouseId,
 			SecondWarehouseInfoId:   goods.SecondWarehouseInfoId,
 			IsCheck:                 1,
+			OverCount:               sum_count,
 		}
 
 		warehouseOutInfo.Count = goods.Count
@@ -9947,23 +9966,12 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouse.StorehouseId,
 			SecondWarehouseInfoId:   goods.SecondWarehouseInfoId,
+			OverCount:               sum_count,
 		}
 
 		//创建出库流水
 		CreateStockFlowOne(stockFlow)
 
-		maxNumber = goods.Count
-
-		if warehouse.StockCount < maxNumber {
-			return errors.New("库存数量不足")
-		}
-
-		warehouse.StockCount = warehouse.StockCount - maxNumber
-		warehouse.Mtime = time.Now().Unix()
-
-		//扣减库存
-		errThree := UpDateWarehouseInfoByStock(&warehouse)
-
 		//入库
 		warehouseInfo := &models.WarehousingInfo{
 			WarehousingOrder:      warehouseInfo.WarehousingOrder,
@@ -10037,6 +10045,24 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 	} else {
 
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+
+		if errThree != nil {
+			return errThree
+		}
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		goods.Count = deliver_number - stock_number
+
+		//查询剩余库存
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: goods.WarehouseOutOrderNumber,
@@ -10062,6 +10088,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			StorehouseId:            warehouse.StorehouseId,
 			SecondWarehouseInfoId:   goods.SecondWarehouseInfoId,
 			IsCheck:                 1,
+			OverCount:               sum_count,
 		}
 		warehouseOutInfo.Count = warehouse.StockCount
 
@@ -10112,6 +10139,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            goods.StorehouseId,
 			SecondWarehouseInfoId:   goods.SecondWarehouseInfoId,
+			OverCount:               sum_count,
 		}
 
 		//创建出库明细
@@ -10183,17 +10211,6 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 		//创建出库流水
 		CreateStockFlowOne(stockInfoFlow)
-		// 出库完成后，要将该批次库存清零
-		warehouse.StockCount = 0
-		warehouse.Mtime = time.Now().Unix()
-
-		errThree := UpDateWarehouseInfoByStock(&warehouse)
-
-		if errThree != nil {
-			return errThree
-		}
-		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
-		goods.Count = deliver_number - stock_number
 
 		ConsumablesDeliveryTwelve(orgID, record_time, goods, warehouseOut, count, creator, warehouseInfo)
 
@@ -10210,7 +10227,6 @@ func AddWarehosingInfo(info *models.WarehousingInfo) error {
 // 药品出库 递归方式
 func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo, drugWarehouse *models.DrugWarehouseInfo) (err error) {
 
-	fmt.Println("尽力2333223333233323322332")
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -10250,6 +10266,62 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 	fmt.Println("stock23233233232", stock_number)
 	fmt.Println("deliver_number", deliver_number)
+
+	// 出库完成后，要减去对应批次的库存数量
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
+	var maxNumber int64 = 0
+	var minNumber int64 = 0
+	if advice.CountUnit == drup.MinUnit {
+		maxNumber = prescribingNumber / drup.MinNumber
+		minNumber = prescribingNumber % drup.MinNumber
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+	} else {
+		maxNumber = prescribingNumber
+	}
+
+	//fmt.Println("warehouse.StockMaxNumber",warehouse.StockMaxNumber)
+	//fmt.Println("maxNumber9899923323232wo",maxNumber)
+	if warehouse.StockMaxNumber < maxNumber {
+
+		return errors.New("库存数量不足")
+	}
+
+	warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+	warehouse.Mtime = time.Now().Unix()
+
+	if warehouse.StockMinNumber < minNumber {
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+		warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+	} else {
+		warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+	}
+
+	if warehouse.StockMaxNumber == 1 && warehouse.StockMinNumber == 1 && drup.MaxUnit == drup.MinUnit {
+		warehouse.StockMinNumber = 0
+	}
+
+	if warehouse.StockMaxNumber < 0 {
+		return errors.New("库存数量不足")
+	}
+
+	errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+
+	if errThree != nil {
+		return errThree
+	}
+
+	//查询剩余库存
+	stockInfo, _ := GetDrugAllStockInfo(advice.StorehouseId, orgID, advice.DrugId)
+	var sum_count int64
+	for _, its := range stockInfo {
+		if its.MaxUnit == drup.MaxUnit {
+			its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+		}
+		sum_count += its.StockMaxNumber + its.StockMinNumber
+	}
+
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -10280,6 +10352,7 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			StorehouseId:            advice.StorehouseId,
 			SecondWarehouseInfoId:   advice.SecondWarehouseInfoId,
 			IsCheck:                 1,
+			OverCount:               sum_count,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
@@ -10317,54 +10390,10 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			StorehouseId:            advice.StorehouseId,
 			SecondWarehouseInfoId:   advice.SecondWarehouseInfoId,
 			WarehousingDetailId:     warehouse.ID,
+			OverCount:               sum_count,
 		}
 
 		CreateDrugFlowOne(drugflow)
-		// 出库完成后，要减去对应批次的库存数量
-		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
-		var maxNumber int64 = 0
-		var minNumber int64 = 0
-		if advice.CountUnit == drup.MinUnit {
-			maxNumber = prescribingNumber / drup.MinNumber
-			minNumber = prescribingNumber % drup.MinNumber
-			if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
-				minNumber = maxNumber
-			}
-		} else {
-			maxNumber = prescribingNumber
-		}
-
-		//fmt.Println("warehouse.StockMaxNumber",warehouse.StockMaxNumber)
-		//fmt.Println("maxNumber9899923323232wo",maxNumber)
-		if warehouse.StockMaxNumber < maxNumber {
-
-			return errors.New("库存数量不足")
-		}
-
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-		warehouse.Mtime = time.Now().Unix()
-
-		if warehouse.StockMinNumber < minNumber {
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-		} else {
-			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-		}
-
-		if warehouse.StockMaxNumber == 1 && warehouse.StockMinNumber == 1 && drup.MaxUnit == drup.MinUnit {
-			warehouse.StockMinNumber = 0
-		}
-
-		fmt.Println("warehouse.StockMaxNumber323232323233232332", warehouse.StockMaxNumber)
-		if warehouse.StockMaxNumber < 0 {
-			return errors.New("库存数量不足")
-		}
-
-		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-
-		if errThree != nil {
-			return errThree
-		}
 
 		//入库
 		drugInfo := models.DrugWarehouseInfo{
@@ -10439,6 +10468,31 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 		return nil
 	} else {
+
+		warehouse.StockMaxNumber = 0
+		warehouse.StockMinNumber = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
+		}
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		advice.CountUnit = drup.MinUnit
+
+		//查询剩余库存
+		stockInfo, _ := GetDrugAllStockInfo(advice.StorehouseId, orgID, advice.DrugId)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: advice.WarehouseOutOrderNumber,
@@ -10467,6 +10521,7 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			StorehouseId:            advice.StorehouseId,
 			SecondWarehouseInfoId:   advice.SecondWarehouseInfoId,
 			IsCheck:                 1,
+			OverCount:               sum_count,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -10503,6 +10558,7 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			StorehouseId:            advice.StorehouseId,
 			SecondWarehouseInfoId:   advice.SecondWarehouseInfoId,
 			WarehousingDetailId:     warehouse.ID,
+			OverCount:               sum_count,
 		}
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
@@ -10574,24 +10630,11 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			StockMinNumber:          stock_number,
 			StorehouseId:            drugWarehouse.StorehouseId,
 			SecondWarehouseInfoId:   drugWarehouse.SecondWarehouseInfoId,
+			OverCount:               sum_count,
 		}
 
 		CreateDrugFlowOne(flow)
 
-		warehouse.StockMaxNumber = 0
-		warehouse.StockMinNumber = 0
-		warehouse.Mtime = time.Now().Unix()
-
-		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		if errThree != nil {
-			return errThree
-		}
-
-		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
-		prescribingNumber_two_temp := deliver_number - stock_number
-
-		advice.CountUnit = drup.MinUnit
-
 		AutoDrugDeliverInfoTwelve(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, drugWarehouse)
 	}
 
@@ -12219,7 +12262,20 @@ func HisSettleDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctor
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
+			var prescribingNumberOne int64
+			prescribingCount_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+			prescribe_count, _ := strconv.ParseInt(prescribingCount_temp, 10, 64)
+			if advice.PrescribingNumberUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+				prescribingNumberOne = prescribe_count * drup.MinNumber
+			}
+			if advice.PrescribingNumberUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+				prescribingNumberOne = prescribe_count
+			}
+			if advice.PrescribingNumberUnit == drup.MinUnit && drup.MaxUnit == drup.MinUnit {
+				prescribingNumberOne = prescribe_count
+			}
+
+			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumberOne)
 
 		} else {
 			return errors.New("药品信息不存在")
@@ -12395,6 +12451,7 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 			OverCount:               sum_count,
 			RegisterNumber:          warehouse.RegisterNumber,
 			OrderId:                 order_id,
+			ProjectId:               goods.ProjectId,
 		}
 		//创建出库流水
 		errflow := CreateStockFlowOne(stockFlow)
@@ -12577,6 +12634,7 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 			OverCount:               sum_count,
 			RegisterNumber:          warehouse.RegisterNumber,
 			OrderId:                 order_id,
+			ProjectId:               goods.ProjectId,
 		}
 		//创建出库流水
 		errflow := CreateStockFlowOne(stockFlow)
@@ -12723,28 +12781,19 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 			sum_count += item.StockCount
 		}
 
-		warehouseOutInfo := &models.WarehouseOutInfo{
-			WarehouseInfotId: warehouse.ID,
-		}
-		//添加入库单详情ID
-		errOne := UpdatedSigleWarehouseOutInfo(goods.ID, warehouseOutInfo)
-		if errOne != nil {
-			goodErrcode := models.XtGoodErrcode{
-				UserOrgId:      goods.UserOrgId,
-				Errcode:        "添加入库单详情ID",
-				GoodId:         goods.GoodId,
-				Status:         1,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Count:          0,
-				StockCount:     0,
-				Creater:        creator,
-				BatchNumberId:  warehouse.ID,
-				WarehouseOutId: 0,
-			}
-			CreateGoodErrcode(goodErrcode)
-			return errOne
+		flowGood, _ := GetStockFlowIsBatchNumberSixty(patient_id, record_time, goods.GoodId, goods.ProjectId)
+
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
 		}
+
+		//查询退库数据
+		//flowGoodTwo, _ := GetStockFlowIsBatchNumberFourty(patient_id, record_time, goods.GoodId, goods.ProjectId)
+		//for _, item := range flowGoodTwo {
+		//  out_count_one += item.Count
+		//}
 		OutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
@@ -12773,17 +12822,15 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 			OverCount:               sum_count,
 			RegisterNumber:          warehouse.RegisterNumber,
 		}
-		fmt.Println("goods.count2323232233232233232322332322332", goods.Count)
-		OutInfo.Count = count
+		OutInfo.Count = count - out_count + out_count_one
 
-		_, errcodes := GetWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		_, errcodes := GetNewWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(OutInfo)
 			if errOne != nil {
 				return errOne
 			}
 		} else if errcodes == nil {
-
 			outInfoOne, _ := GetWarehouseOutInfoIsExistThree(goods.GoodId, patient_id, record_time, goods.ProjectId)
 			if count != outInfoOne.Count {
 				UpdatedWarehouseOutInfo(OutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId)
@@ -12792,20 +12839,6 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		}
 
 		lastOut, _ := FindWarehouseOutInfoByPatientIdTwo(patient_id, record_time, goods.GoodId, orgID, goods.ProjectId)
-		//查询已经出库的数据
-		flowGood, _ := GetStockFlowIsBatchNumberSix(patient_id, record_time, goods.GoodId, goods.ProjectId)
-		fmt.Println("flowgood23323223323222323wo", flowGood)
-		var out_count int64
-		var out_count_one int64
-		for _, item := range flowGood {
-			out_count += item.Count
-		}
-
-		//查询退库数据
-		flowGoodTwo, _ := GetStockFlowIsBatchNumberFour(patient_id, record_time, goods.GoodId, goods.ProjectId)
-		for _, item := range flowGoodTwo {
-			out_count_one += item.Count
-		}
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		fmt.Println("out_count23323233232wo", out_count)
@@ -13108,7 +13141,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		}
 		OutInfo.Count = stock_number
 
-		_, errcodes := GetWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		_, errcodes := GetNewWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(OutInfo)
 			if errOne != nil {
@@ -13116,25 +13149,27 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 			}
 		} else if errcodes == nil {
 
-			outInfoOne, _ := GetWarehouseOutInfoIsExistThree(goods.GoodId, patient_id, record_time, goods.ProjectId)
+			outInfoOne, _ := GetWarehouseOutInfoIsExistTen(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID)
 			if count != outInfoOne.Count {
-				UpdatedWarehouseOutInfo(OutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId)
+				UpdatedWarehouseOutInfoSix(OutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID)
 			}
 
 		}
 
 		lastOut, _ := FindWarehouseOutInfoByPatientIdTwo(patient_id, record_time, goods.GoodId, orgID, goods.ProjectId)
 		//查询该该批次已经出库的数据
-		flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		//flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		//查询已经出库的数据
+		flowGood, _ := GetStockFlowIsBatchNumberSixty(patient_id, record_time, goods.GoodId, goods.ProjectId)
 		var out_count int64
 		var out_count_one int64
 		for _, item := range flowGood {
 			out_count += item.Count
 		}
-		flowGoodTwo, _ := GetStockFlowIsBatchNumberSix(patient_id, record_time, goods.GoodId, goods.ProjectId)
-		for _, item := range flowGoodTwo {
-			out_count_one += item.Count
-		}
+		//flowGoodTwo, _ := GetStockFlowIsBatchNumberSix(patient_id, record_time, goods.GoodId, goods.ProjectId)
+		//for _, item := range flowGoodTwo {
+		//	out_count_one += item.Count
+		//}
 		fmt.Println("出库数量", stock_number)
 		fmt.Println("历史出库数据", out_count-out_count_one)
 		//如果出库数量 大于 历史出库数据 新增1条流水