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

conf/app.conf

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

controllers/device_api_controller.go

@@ -877,7 +877,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 	number.ZoneID = zoneID
 	number.GroupID = groupID
 	number.Sort = sort
-	byName, _ := service.GetDeviceNumberByName(num, adminInfo.CurrentOrgId)
+	byName, _ := service.GetDeviceNumberByName(num, zoneID, adminInfo.CurrentOrgId)
 	if byName.ID > 0 && byName.ID != id {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/drug_stock_api_contorller.go

@@ -209,6 +209,13 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				dealer := int64(items["dealer"].(float64))
 
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+
 				warehouseInfo := &models.DrugWarehouseInfo{
 					WarehousingOrder: warehousing.WarehousingOrder,
 					WarehousingId:    warehousing.ID,
@@ -231,6 +238,13 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					BatchNumber:      batch_number,
 					MaxUnit:          max_unit,
 					MinUnit:          min_unit,
+					RetailPrice:      retail_price,
+				}
+
+				if max_unit == min_unit {
+					warehouseInfo.StockMaxNumber = 0
+					warehouseInfo.StockMinNumber = warehousing_count
+					warehouseInfo.MaxUnit = min_unit
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -257,6 +271,9 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					IsSys:            0,
 				}
 
+				if max_unit == min_unit {
+					drugflow.MaxUnit = min_unit
+				}
 				drugFlow = append(drugFlow, drugflow)
 
 			}
@@ -338,7 +355,6 @@ func (c *StockDrugApiController) GetDrugWarehouseList() {
 	}
 
 	adminUserInfo := c.GetAdminUserInfo()
-	fmt.Println("hhh2h3h23h2h32h3h2h32h32h3h2h3", keywords)
 	//按药品名称搜索
 	var ids []int64
 	var idArray []int64
@@ -487,6 +503,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 				retail_price_total := float64(warehousing_count) * last_price
 
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+
 				var productDates int64
 				var expiryDates int64
 
@@ -561,13 +579,18 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						Type:             types,
 						Manufacturer:     manufacturer,
 						Dealer:           dealer,
-						RetailPrice:      last_price,
+						RetailPrice:      retail_price,
 						RetailTotalPrice: retail_price_total,
 						BatchNumber:      batch_number,
 						MaxUnit:          max_unit,
 						MinUnit:          min_unit,
 						StockMaxNumber:   warehousing_count,
 					}
+					if max_unit == min_unit {
+						warehouseInfo.StockMaxNumber = 0
+						warehouseInfo.StockMinNumber = warehousing_count
+						warehouseInfo.MaxUnit = min_unit
+					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
 				} else {
@@ -590,35 +613,46 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						Type:             types,
 						Manufacturer:     manufacturer,
 						Dealer:           dealer,
-						RetailPrice:      last_price,
+						RetailPrice:      retail_price,
 						RetailTotalPrice: retail_price_total,
 						MaxUnit:          max_unit,
 						MinUnit:          min_unit,
 						BatchNumber:      batch_number,
 					}
+					if max_unit == min_unit {
+						warehouseInfo.StockMaxNumber = 0
+						warehouseInfo.StockMinNumber = warehousing_count
+						warehouseInfo.MaxUnit = min_unit
+					}
+
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
 					drugflow := &models.DrugFlow{
-						WarehousingOrder: warehousing.WarehousingOrder,
-						WarehousingId:    id,
-						DrugId:           drug_id,
-						Number:           number,
-						ProductDate:      productDates,
-						ExpireDate:       expiryDates,
-						Count:            warehousing_count,
-						Price:            last_price,
-						Status:           1,
-						Ctime:            ctime,
-						UserOrgId:        adminUserInfo.CurrentOrgId,
-						Manufacturer:     manufacturer,
-						Dealer:           dealer,
-						BatchNumber:      batch_number,
-						MaxUnit:          max_unit,
-						MinUnit:          min_unit,
-						ConsumableType:   1,
-						IsEdit:           1,
-						Creator:          adminUserInfo.AdminUser.Id,
-						IsSys:            0,
+						WarehousingOrder:    warehousing.WarehousingOrder,
+						WarehousingId:       warehouse.ID,
+						DrugId:              drug_id,
+						Number:              number,
+						ProductDate:         productDates,
+						ExpireDate:          expiryDates,
+						Count:               warehousing_count,
+						Price:               last_price,
+						Status:              1,
+						Ctime:               ctime,
+						UserOrgId:           adminUserInfo.CurrentOrgId,
+						Manufacturer:        manufacturer,
+						Dealer:              dealer,
+						BatchNumber:         batch_number,
+						MaxUnit:             max_unit,
+						MinUnit:             min_unit,
+						ConsumableType:      1,
+						IsEdit:              1,
+						Creator:             adminUserInfo.AdminUser.Id,
+						IsSys:               0,
+						WarehousingDetailId: id,
+					}
+
+					if max_unit == min_unit {
+						drugflow.MaxUnit = min_unit
 					}
 
 					drugFlow = append(drugFlow, drugflow)
@@ -658,6 +692,9 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 					IsSys:               0,
 					WarehousingDetailId: info.ID,
 				}
+				if info.MaxUnit == info.MinUnit {
+					flows.MaxUnit = info.MinUnit
+				}
 				_, existerrcodes := service.GetDrugFlowIsExist(info.ID, info.DrugId)
 
 				if existerrcodes == gorm.ErrRecordNotFound {
@@ -682,7 +719,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			//历史入库总数
 			total = orderInfo.StockMaxNumber * info.MinNumber
 
-			//当前入库总数
 			allTotal = item.WarehousingCount * info.MinNumber
 
 			//如果历史的入库总数 大于当前入库总数 则需要扣减
@@ -719,20 +755,27 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			//比较大小(加)
 			// 如果当前的入库数量 大于 历史入库数量
 			if item.WarehousingCount > warehouseInfo.WarehousingCount {
+				fmt.Println("大于333333333333333333333333")
 				total = item.WarehousingCount - warehouseInfo.WarehousingCount
 				item.StockMaxNumber = warehouseInfo.StockMaxNumber + total
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
 						flow := models.DrugFlow{
-							Count:        item.StockMaxNumber,
+							Count:        it.Count,
 							Manufacturer: it.Manufacturer,
 							Dealer:       it.Dealer,
 							Number:       it.Number,
 							BatchNumber:  it.BatchNumber,
 							Price:        it.Price,
+							MaxUnit:      info.MaxUnit,
+							ExpireDate:   it.ExpireDate,
 						}
-						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
+						if info.MaxUnit == info.MinUnit {
+							flow.MaxUnit = info.MinUnit
+						}
+
+						parseDateErr := service.UpdateDrugFlowNight(flow, it.DrugId, it.WarehousingDetailId)
 						fmt.Println(parseDateErr)
 
 					}
@@ -747,11 +790,19 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
-						fmt.Println(it)
 						flow := models.DrugFlow{
-							Count: item.StockMaxNumber,
+							Count:       it.Count,
+							MaxUnit:     it.MaxUnit,
+							MinUnit:     it.MinUnit,
+							Number:      it.Number,
+							BatchNumber: it.BatchNumber,
+							Price:       it.Price,
+							ExpireDate:  it.ExpireDate,
+						}
+						if info.MaxUnit == info.MinUnit {
+							flow.MaxUnit = info.MinUnit
 						}
-						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
+						parseDateErr := service.UpdateDrugFlowNight(flow, it.DrugId, it.WarehousingDetailId)
 						fmt.Println(parseDateErr)
 					}
 				}
@@ -770,6 +821,27 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 					Manufacturer: item.Manufacturer,
 					Remark:       item.Remark,
 					BatchNumber:  item.BatchNumber,
+					MaxUnit:      item.MaxUnit,
+					MinUnit:      item.MinUnit,
+					RetailPrice:  item.RetailPrice,
+				}
+				if len(drugFlow) > 0 {
+					for _, it := range drugFlow {
+						flow := models.DrugFlow{
+							Count:       it.Count,
+							MaxUnit:     it.MaxUnit,
+							MinUnit:     it.MinUnit,
+							Number:      it.Number,
+							BatchNumber: it.BatchNumber,
+							Price:       it.Price,
+							ExpireDate:  it.ExpireDate,
+						}
+						if info.MaxUnit == info.MinUnit {
+							flow.MaxUnit = info.MinUnit
+						}
+						parseDateErr := service.UpdateDrugFlowNight(flow, it.DrugId, it.WarehousingDetailId)
+						fmt.Println(parseDateErr)
+					}
 				}
 				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, warehouseinfo)
 			}
@@ -2408,7 +2480,6 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
 		var total_count int64
 		total_count = infoWareInfo.WarehousingCount * medical.MinNumber
-		fmt.Println("当前批次总库存", total_count)
 
 		//查询该批次的出库数量
 		outInfo, _ := service.GetDrugWarehouseOutInfo(item.BatchNumberId, item.DrugId)
@@ -2448,7 +2519,9 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			})
 			return
 		}
-
+		fmt.Println("当前退库数", total_count)
+		fmt.Println("当前批次总库存", total_count)
+		fmt.Println("总出库数", out_number)
 		//判断退库数量是否大于总入库数量
 		if total_number > total_count {
 			service.UpdateDrugCancel(item.CancelStockId)
@@ -2614,6 +2687,18 @@ func (this *StockDrugApiController) DeleteDrugCancelStock() {
 	}
 
 	idArray := strings.Split(ids, ",")
+	//获取入库数据
+	list, _ := service.GetDrugWareInfoByCancelId(idArray)
+	for _, item := range list {
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+		if item.MaxUnit == medical.MaxUnit {
+			//回退库存
+			service.ModifyDrugWarehouseByInfoId(item.CancelStockId, item.Count)
+		}
+		if item.MaxUnit == medical.MinUnit {
+			service.ModifyDrugWarehouseByStockMin(item.CancelStockId, item.Count)
+		}
+	}
 	err := service.DeleteDrugCancelStock(idArray)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
@@ -2625,7 +2710,7 @@ func (this *StockDrugApiController) DeleteDrugCancelStock() {
 }
 func (this *StockDrugApiController) DeleteDrugCancelStockInfo() {
 	id, _ := this.GetInt64("id", 0)
-	fmt.Println(id)
+
 	if id == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

controllers/his_api_controller.go

@@ -803,8 +803,6 @@ func (c *HisApiController) CreateHisPrescription() {
 										number_count = prescribingNumberInt
 									}
 
-									fmt.Println("以前出库数量23323232322332323223233223232332", device_number)
-									fmt.Println("现在出库数量", number_count)
 									//如果修改的数量大于之前修改的数量
 									if (number_count - device_number) > 0 {
 										//如果修改的差数量 大于库存数量
@@ -818,8 +816,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										// 查询该药品最后一次出库记录
 										druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
-										fmt.Println("以前出库数量23323232322332323223233223232332", device_number)
-										fmt.Println("现在出库数量", number_count)
+
 										//回退库存
 										if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
@@ -830,14 +827,14 @@ func (c *HisApiController) CreateHisPrescription() {
 											var stock_min_number int64
 
 											if number_count >= drug.MinNumber {
-												fmt.Println("尽力啊了吗332323322332233232332233223232323")
+
 												stock_max_number = device_number / drug.MinNumber
 												service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
 												stock_min_number = device_number % drug.MinNumber
 												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
 
 											} else {
-												fmt.Println("99999999999999999999")
+
 												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
 											}
 										}
@@ -905,6 +902,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									//for _, it := range goodWarehouseInfo {
 									//	total_count += it.Count
 									//}
+
 									if len(goodWarehouseInfo) == 0 {
 										//查询耗材库存
 										list, _ := service.GetGoodWarehouseInfoSeven(project_id)
@@ -918,18 +916,27 @@ func (c *HisApiController) CreateHisPrescription() {
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return
 										}
+										//查找今日该患者已经出库的所有耗材
+										goodList, _ := service.GetAllAutoRecordByPatient(patient_id, recordDateTime)
+
+										for _, item := range goodList {
+											//回退库存
+											service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
+										}
+										//删除记录
+										service.DeleteAutoWarehouse(patient_id, recordDateTime)
 									}
 									if len(goodWarehouseInfo) > 0 {
 										//查询该患者耗材的历史数据
 										ordProject, _ := service.GetHisProjectPrescriptionByPatientIdOne(id)
+
 										count, _ := strconv.ParseInt(ordProject.Count, 10, 64)
-										fmt.Println("parsetotal33223232323232323", parsetotal)
-										fmt.Println("count2332322332232332", count)
+
 										//数量发生改变
 										if parsetotal != count {
 											//查找今日该患者已经出库的所有耗材
 											goodList, _ := service.GetAllAutoRecordByPatient(patient_id, recordDateTime)
-											fmt.Println("goodList3323223232323232323", goodList)
+
 											for _, item := range goodList {
 												//回退库存
 												service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
@@ -2355,6 +2362,10 @@ func (c *HisApiController) DeleteProject() {
 	service.CreateHisLabelRecord(&label)
 
 	if stockConfig.IsOpen == 1 {
+		if project.Type == 2 {
+			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
+			fmt.Println(err)
+		}
 		if project.Type == 3 {
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -309,13 +309,11 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 func (this *StaffScheduleApiController) DeleteSchedule() {
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
-	err := service.DeleteSchedule(id)
+
 	org_id := this.GetMobileAdminUserInfo().Org.Id
-	schedule, _ := service.GetSchedule(org_id, id)
-	if schedule == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeScheduleNotExist)
-		return
-	}
+	err := service.DeleteSchedule(id)
+	schedule, _ := service.GetScheduleNight(org_id, id)
+
 	redis := service.RedisClient()
 
 	//处方
@@ -339,9 +337,10 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 
 	keySeven := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":dialysis_orders_list_all"
 	redis.Set(keySeven, "", time.Second)
-	fmt.Println(err)
+
 	defer redis.Close()
 	fmt.Println(err)
+
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
@@ -706,3 +705,19 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 	return
 
 }
+
+func (c *StaffScheduleApiController) GetSolutionSchedule() {
+
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+	scheduleDate := c.GetString("start_time")
+	zoneid, _ := c.GetInt64("zoneid")
+	classtype, _ := c.GetInt64("classtype")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", scheduleDate+" 00:00:00", loc)
+	fmt.Println("时间错2332233323223", theTime.Unix())
+	schedule, _ := service.GetSolutionScheduleBySchedule(orgId, zoneid, classtype, theTime.Unix())
+	c.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -25,4 +25,5 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/updateschedule", &StaffScheduleApiController{}, "Get:UpdateBloodSchedule")
 	beego.Router("m/api/schedule/patients", &StaffScheduleApiController{}, "Get:GetSchedulePatient")
 	beego.Router("/m/api/schedule/create", &StaffScheduleApiController{}, "Post:CreateMobileSchedulePatient")
+	beego.Router("m/api/schedule/getsolutionschedule", &StaffScheduleApiController{}, "Get:GetSolutionSchedule")
 }

controllers/patient_dataconfig_api_controller.go

@@ -86,7 +86,7 @@ func (this *PatientDataConfigAPIController) CreateCourse() {
 	patientID, _ := this.GetInt64("patient_id")
 	fmt.Println(patientID)
 	content := this.GetString("content")
-	fmt.Println("content22222222222222222222", content)
+
 	record_time_str := this.GetString("record_time")
 	title := this.GetString("title")
 

controllers/print_data_api_controller.go

@@ -39,10 +39,15 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 	for _, item := range schedules {
 		list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-		if this.GetAdminUserInfo().CurrentOrgId != 10101 {
+		if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
 			item.Count = list.Count
 		}
+		if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+			listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
+			item.Patient.TotalDialysis = listOne.Count
+			item.Count = listOne.Count
+		}
 	}
 	if getScheduleErr != nil {
 		this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
@@ -124,17 +129,7 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 	adminUserInfo := this.GetAdminUserInfo()
 	patient_id, _ := this.GetInt64("patient_id")
 
-	//timeLayout := "2006-01-02 15:04:05"
 	record, err := service.GetPatientCoursesRecords(adminUserInfo.CurrentOrgId, ids_arr)
-	//dataTimeStr := time.Unix(record.RecordTime, 0).Format(timeLayout) //设置时间戳 使用模板格式化为日期字符串
-	//tempTime := strings.Split(dataTimeStr, " ")
-	//
-	//recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", tempTime[0])
-	//if parseDateErr != nil {
-	//	this.ErrorLog("日期(%v)解析错误：%v", tempTime[0], parseDateErr)
-	//	//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	//return
-	//}
 
 	//patient, _ := service.FindPatientWithDeviceById(adminUserInfo.CurrentOrgId, patient_id)
 	patient, _ := service.GetPatientDetail(adminUserInfo.CurrentOrgId, patient_id)

controllers/schedule_api_controller.go

@@ -2569,8 +2569,7 @@ func (this *ScheduleApiController) GetPatientScheduleCount() {
 	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
 	weekStartPoint := theStarTime.Unix()
 	weekEndPoint := theEndTime.Unix()
-	fmt.Println("startTime222222222222222", weekStartPoint)
-	fmt.Println("endtime33333333333333", weekEndPoint)
+
 	list, err := service.GetPatientScheduleCount(orgId, weekStartPoint, weekEndPoint, ids)
 	_, total, _ := service.GetTotalBedNumber(orgId, ids)
 	if err != nil {
@@ -2946,7 +2945,7 @@ func (c *ScheduleApiController) GetSolutionSchedule() {
 
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	solution, _ := service.GetSolutionSchedule(orgId)
-	fmt.Println("solution33232323223233233323232332323232", solution)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"solution": solution,
 	})

controllers/stock_in_api_controller.go

@@ -303,14 +303,32 @@ func (c *StockManagerApiController) CreateWarehouse() {
 		}
 	}
 
-	//入库单创建成功
-	errs := service.CreateWarehousingInfo(warehousingInfo)
-	for _, its := range stockFlow {
-		warehousinginfo, _ := service.GetLastWarehousingInfo(its.GoodId)
-		its.WarehousingDetailId = warehousinginfo.ID
+	for _, item := range warehousingInfo {
+		service.CreatedWarehouseingDetail(item)
+		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
+		flow := models.VmStockFlow{
+			WarehousingOrder:    item.WarehousingOrder,
+			WarehousingId:       item.WarehousingId,
+			GoodId:              item.GoodId,
+			Number:              item.Number,
+			ProductDate:         item.ProductDate,
+			ExpireDate:          item.ExpiryDate,
+			Count:               item.StockCount,
+			Price:               item.Price,
+			Status:              1,
+			Ctime:               ctime,
+			UserOrgId:           item.OrgId,
+			Manufacturer:        item.Manufacturer,
+			Dealer:              item.Dealer,
+			LicenseNumber:       item.LicenseNumber,
+			IsEdit:              1,
+			Creator:             adminUserInfo.AdminUser.Id,
+			SystemTime:          operation_time,
+			ConsumableType:      1,
+			WarehousingDetailId: warehousinginfo.ID,
+		}
+		service.CreateStockFlowOne(flow)
 	}
-	//创建入库单流水
-	service.CreateStockFlow(stockFlow)
 
 	info, _ := service.FindLastWarehousingInfo(warehousing.WarehousingOrder)
 
@@ -328,12 +346,6 @@ func (c *StockManagerApiController) CreateWarehouse() {
 		fmt.Println(parseDateErr)
 	}
 
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-		return
-	}
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":               "入库成功",
 		"warehousing_order": warehousing_order,
@@ -695,17 +707,18 @@ func (c *StockManagerApiController) EditWarehouse() {
 
 				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
 
-				flowStock := models.VmStockFlow{
-					Count:         item.WarehousingCount,
-					Number:        item.Number,
-					ProductDate:   item.ProductDate,
-					ExpireDate:    item.ExpiryDate,
-					Price:         item.Price,
-					Manufacturer:  item.Manufacturer,
-					Dealer:        item.Dealer,
-					LicenseNumber: info.LicenseNumber,
-				}
-				service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flowStock)
+				//flowStock := models.VmStockFlow{
+				//	Count:         item.WarehousingCount,
+				//	Number:        item.Number,
+				//	ProductDate:   item.ProductDate,
+				//	ExpireDate:    item.ExpiryDate,
+				//	Price:         item.Price,
+				//	Manufacturer:  item.Manufacturer,
+				//	Dealer:        item.Dealer,
+				//	LicenseNumber: info.LicenseNumber,
+				//}
+				//fmt.Println("大于233232322323233232232323233232233223")
+				//service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flowStock)
 				//改变库存
 				good, _ := service.GetLastInfoMationById(info.GoodId)
 				warhouseCount := strconv.FormatInt(total, 10)
@@ -758,9 +771,16 @@ func (c *StockManagerApiController) EditWarehouse() {
 	if len(stockFlow) > 0 {
 		for _, item := range stockFlow {
 			flow := models.VmStockFlow{
-				Count: item.Count,
-			}
-			parseDateErr := service.UpdateStockFlow(flow, item.GoodId, item.WarehousingId)
+				Count:         item.Count,
+				Number:        item.Number,
+				ProductDate:   item.ProductDate,
+				ExpireDate:    item.ExpireDate,
+				Price:         item.Price,
+				Manufacturer:  item.Manufacturer,
+				Dealer:        item.Dealer,
+				LicenseNumber: item.LicenseNumber,
+			}
+			parseDateErr := service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flow)
 			fmt.Println(parseDateErr)
 		}
 	}
@@ -2034,7 +2054,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	}
 
 	var cancelStockInfos []*models.CancelStockInfo
-	var stockFLow []*models.VmStockFlow
+	//var stockFLow []*models.VmStockFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisStockIn) > 0 {
@@ -2131,48 +2151,48 @@ func (c *StockManagerApiController) CreateCancelStock() {
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
-				list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
-
-				var manufacturer_id int64
-
-				for _, items := range list {
-					if manufacturer == items.ManufacturerName {
-						manufacturer_id = items.ID
-					}
-				}
-
-				flow := &models.VmStockFlow{
-					WarehousingId:           0,
-					GoodId:                  good_id,
-					Number:                  number,
-					LicenseNumber:           "",
-					Count:                   count,
-					UserOrgId:               adminUserInfo.CurrentOrgId,
-					PatientId:               0,
-					SystemTime:              time.Now().Unix(),
-					ConsumableType:          4,
-					IsSys:                   0,
-					WarehousingOrder:        "",
-					WarehouseOutId:          0,
-					WarehouseOutOrderNumber: "",
-					IsEdit:                  0,
-					CancelStockId:           cancelStock.ID,
-					CancelOrderNumber:       cancelStock.OrderNumber,
-					Manufacturer:            manufacturer_id,
-					Dealer:                  0,
-					Creator:                 adminUserInfo.AdminUser.Id,
-					UpdateCreator:           0,
-					Status:                  1,
-					Ctime:                   time.Now().Unix(),
-					Mtime:                   0,
-					Price:                   price,
-					WarehousingDetailId:     0,
-					WarehouseOutDetailId:    0,
-					CancelOutDetailId:       0,
-					ProductDate:             productDates,
-					ExpireDate:              expiryDates,
-				}
-				stockFLow = append(stockFLow, flow)
+				//list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+				//
+				//var manufacturer_id int64
+
+				//for _, items := range list {
+				//	if manufacturer == items.ManufacturerName {
+				//		manufacturer_id = items.ID
+				//	}
+				//}
+
+				//flow := &models.VmStockFlow{
+				//	WarehousingId:           0,
+				//	GoodId:                  good_id,
+				//	Number:                  number,
+				//	LicenseNumber:           "",
+				//	Count:                   count,
+				//	UserOrgId:               adminUserInfo.CurrentOrgId,
+				//	PatientId:               0,
+				//	SystemTime:              time.Now().Unix(),
+				//	ConsumableType:          4,
+				//	IsSys:                   0,
+				//	WarehousingOrder:        "",
+				//	WarehouseOutId:          0,
+				//	WarehouseOutOrderNumber: "",
+				//	IsEdit:                  0,
+				//	CancelStockId:           cancelStock.ID,
+				//	CancelOrderNumber:       cancelStock.OrderNumber,
+				//	Manufacturer:            manufacturer_id,
+				//	Dealer:                  0,
+				//	Creator:                 adminUserInfo.AdminUser.Id,
+				//	UpdateCreator:           0,
+				//	Status:                  1,
+				//	Ctime:                   time.Now().Unix(),
+				//	Mtime:                   0,
+				//	Price:                   price,
+				//	WarehousingDetailId:     0,
+				//	WarehouseOutDetailId:    0,
+				//	CancelOutDetailId:       0,
+				//	ProductDate:             productDates,
+				//	ExpireDate:              expiryDates,
+				//}
+				//stockFLow = append(stockFLow, flow)
 			}
 		}
 	}
@@ -2208,17 +2228,50 @@ func (c *StockManagerApiController) CreateCancelStock() {
 
 			item.CancelStockId = listcancel.ID
 			errs := service.CreateCancelStockInfoOne(item)
+			list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 
-			if len(stockFLow) > 0 {
-
-				for _, items := range stockFLow {
-					cancelStockInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
-					items.CancelStockId = listcancel.ID
-					items.CancelOutDetailId = cancelStockInfo.ID
+			var manufacturer_id int64
 
+			for _, items := range list {
+				if item.Manufacturer == items.ManufacturerName {
+					manufacturer_id = items.ID
 				}
-				service.CreateStockFlow(stockFLow)
 			}
+			flow := models.VmStockFlow{
+				WarehousingId:           0,
+				GoodId:                  item.GoodId,
+				Number:                  item.Number,
+				LicenseNumber:           "",
+				Count:                   item.Count,
+				UserOrgId:               adminUserInfo.CurrentOrgId,
+				PatientId:               0,
+				SystemTime:              time.Now().Unix(),
+				ConsumableType:          4,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            manufacturer_id,
+				Dealer:                  0,
+				Creator:                 adminUserInfo.AdminUser.Id,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   item.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ProductDate:             item.ProductDate,
+				ExpireDate:              item.ExpiryDate,
+			}
+			cancelStockInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
+			flow.CancelStockId = cancelStockInfo.CancelStockId
+			flow.CancelOutDetailId = cancelStockInfo.ID
+			service.CreateStockFlowOne(flow)
 			if errs != nil {
 				utils.ErrorLog(errs.Error())
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
@@ -2315,7 +2368,21 @@ func (this *StockManagerApiController) DeleteCancelStock() {
 	}
 
 	idArray := strings.Split(ids, ",")
+	//获取
+	list, _ := service.GetCancelWarehosueInfo(idArray)
+	for _, item := range list {
+		info, _ := service.GetCancelStockById(item.WarehouseInfoId)
+		warehousingInfo := models.WarehousingInfo{
+			StockCount: info.Count,
+		}
+		//扣减库存
+		service.ModefyWarehouseInfoNight(warehousingInfo, info.WarehouseInfoId)
+		//删除流水
+		service.UpdatedStockFlowByCancelId(info.ID, info.GoodId)
+	}
+	//获取
 	err := service.DeleteCancelStock(idArray)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -2332,8 +2399,19 @@ func (this *StockManagerApiController) DeleteCancelStockInfo() {
 		return
 	}
 
+	//改变库存
+	info, _ := service.GetCancelStockById(id)
+
+	warehousingInfo := models.WarehousingInfo{
+		StockCount: info.Count,
+	}
+	//扣减库存
+	service.ModefyWarehouseInfoNight(warehousingInfo, info.WarehouseInfoId)
+	//删除详情
 	err := service.UpDateCancleStockStatus(id)
-	service.UpdatedStockFlowByCancelId(id)
+	//删除流水
+	err = service.UpdatedStockFlowByCancelId(id, info.GoodId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -2637,7 +2715,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 		if len(stockFlow) > 0 {
 			for _, itemcancel := range stockFlow {
-				fmt.Println("hhh233232323323233223323232我的时间")
 				//查询是否存在
 				stockInfo, errcode := service.IsExsitStockFlow(itemcancel.GoodId, itemcancel.CancelOrderNumber)
 				if errcode == gorm.ErrRecordNotFound {
@@ -2668,8 +2745,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 			for _, it := range list {
 				all_total += it.Count
 			}
-			fmt.Println("最后一次出库233223323233223", info.Count)
-			fmt.Println("当前出库23323223232323323", item.Count)
 
 			//比较退库库数量和最后一次退库库数据大小
 			//退库(加)
@@ -2709,6 +2784,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 			}
 			if item.Count == info.Count {
 				errs = service.UpDateCancelStockInfo(item)
+
 			}
 		}
 	}
@@ -2727,6 +2803,8 @@ func (c *StockManagerApiController) EditCancelStock() {
 					Price:         itemcancel.Price,
 					LicenseNumber: itemcancel.LicenseNumber,
 					Number:        itemcancel.Number,
+					ExpireDate:    itemcancel.ExpireDate,
+					ProductDate:   itemcancel.ProductDate,
 				}
 				service.UpdateStockFlowThree(stockInfo.ID, flow)
 			}

models/patient_models.go

@@ -1505,3 +1505,64 @@ type XtHospitalSummary struct {
 func (XtHospitalSummary) TableName() string {
 	return "xt_hospital_summary"
 }
+
+type VmDialysisSolution struct {
+	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"`
+	DialysisDialyszers         string                `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string                `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialyzerPerfusionApparatus string                `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	ModeName                   string                `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
+	ModeId                     int64                 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Anticoagulant              int64                 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	DialysisSolution           VmDialysisSolutionOne `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"solution"`
+}
+
+func (VmDialysisSolution) TableName() string {
+	return "xt_dialysis_solution"
+}
+
+type VmDialysisSolutionOne struct {
+	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"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	ModeName                   string `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+}
+
+func (VmDialysisSolutionOne) TableName() string {
+	return "xt_dialysis_solution"
+}
+
+type VmDialysisPrescription struct {
+	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"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	ModeName                   string `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Anticoagulant              int64  `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+}
+
+func (VmDialysisPrescription) TableName() string {
+	return "xt_dialysis_prescription"
+}
+
+type XtScheduleList struct {
+	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"`
+	DialysisSolution VmDialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
+}
+
+func (XtScheduleList) TableName() string {
+	return "xt_schedule"
+}

models/self_drug_models.go

@@ -405,6 +405,7 @@ type XtDrugWarehouseInfo struct {
 	StockMaxNumber    int64      `gorm:"column:stock_max_number" json:"stock_max_number"`
 	StockMinNumber    int64      `gorm:"column:stock_min_number" json:"stock_min_number"`
 	BatchNumber       string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MinUnit           string     `gorm:"column:min_unit" json:"max_unit" form:"min_unit"`
 	MaxUnit           string     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	WarehousingInfoId int64      `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	XtBaseDrug        XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `

service/device_service.go

@@ -480,9 +480,9 @@ func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64,
 	return &numberModel, nil
 }
 
-func GetDeviceNumberByName(num string, orgid int64) (number models.DeviceNumber, err error) {
+func GetDeviceNumberByName(num string, zoneId int64, orgid int64) (number models.DeviceNumber, err error) {
 
-	err = XTReadDB().Model(&number).Where("number = ? and org_id = ? and status =1", num, orgid).First(&number).Error
+	err = XTReadDB().Model(&number).Where("number = ? and zone_id = ? and org_id = ? and status =1", num, zoneId, orgid).First(&number).Error
 	return number, err
 }
 

service/manage_center_service.go

@@ -222,7 +222,7 @@ func GetBaseDrugLibList(org_id int64, keyword string, page int64, limit int64, i
 	}
 
 	if is_use != 0 {
-		if is_use == 1 {
+		if is_use == 2 {
 			db = db.Where("find_in_set('停用',drug_status) = 0")
 
 		} else {
@@ -230,14 +230,18 @@ func GetBaseDrugLibList(org_id int64, keyword string, page int64, limit int64, i
 		}
 	}
 
-	if is_charge != 0 {
-		//db = db.Where("drug_name Like ?", keyword)
-		if is_charge == 1 {
-			db = db.Where("find_in_set('收费',drug_status) > 0")
+	if is_charge == 1 {
+		//if is_charge == 1 {
+		//	db = db.Where("find_in_set('收费',drug_status) > 0")
+		//
+		//} else {
+		//	db = db.Where("find_in_set('收费',drug_status) = 0")
+		//}
+		db = db.Where("is_record = ?", is_charge)
+	}
 
-		} else {
-			db = db.Where("find_in_set('收费',drug_status) = 0")
-		}
+	if is_charge == 2 {
+		db = db.Where("is_record= 0 || is_record = 2")
 	}
 
 	if is_inject != 0 {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -50,7 +50,7 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? AND status = 1", orgID).Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date desc").
+		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date asc").
 		Find(&schedules).
 		Error
 	if err != nil {
@@ -63,10 +63,10 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 			item.Patient.TotalDialysis = dialysis_count
 
 		}
-		if orgID == 10101 {
-			dialysis_count, _ := GetDialysisOrderCountOne(orgID, item.PatientID, item.ScheduleDate)
-			item.Patient.TotalDialysis = dialysis_count
-		}
+		//if orgID == 10101 {
+		//	dialysis_count, _ := GetDialysisOrderCountOne(orgID, item.PatientID, item.ScheduleDate)
+		//	item.Patient.TotalDialysis = dialysis_count
+		//}
 	}
 	return schedules, nil
 }
@@ -119,7 +119,7 @@ func GetAllName(orgId int64, appid int64) (list []AdminUserListTwo, err error) {
 
 func GetPatientCoursesRecords(orgID int64, id []string) (records []*models.PatientDiseaseCourse, err error) {
 	db := p_service.XTReadDB()
-	err = db.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and id in(?) and status = 1", orgID, id).Find(&records).Error
+	err = db.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and id in(?) and status = 1", orgID, id).Order("record_time asc").Find(&records).Error
 	return
 }
 
@@ -211,9 +211,20 @@ func GetDialysisOrderCountSeven(patient_id int64, recordDate int64) (models.VmDi
 	return order, err
 }
 
-func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
-	err = p_service.XTReadDB().Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
-	return
+//func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+//	err = p_service.XTReadDB().Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+//	return
+//}
+
+//func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+//	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date >=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+//	return
+//}
+
+func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1640966400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	return order, err
 }
 
 func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {

service/schedule_service.go

@@ -242,6 +242,16 @@ func GetSchedule(orgID, id int64) (*models.Schedule, error) {
 	return &schedule, nil
 }
 
+func GetScheduleNight(orgID, id int64) (*models.Schedule, error) {
+	var schedule models.Schedule
+	var err error
+	err = readDb.Model(&models.Schedule{}).Where("id = ? and user_org_id=?", id, orgID).First(&schedule).Error
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
 func UpdateSchedule(m *models.Schedule) error {
 	utx := XTWriteDB().Begin()
 	err := utx.Save(&m).Error
@@ -1101,8 +1111,33 @@ func GetPatientScheduleTempalate(orgid int64) (models.PatientScheduleTemplateMod
 	return mode, err
 }
 
-func GetSolutionSchedule(orgid int64) (solution []*models.DialysisSolution, err error) {
+func GetSolutionSchedule(orgid int64) (solution []*models.VmDialysisSolution, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time desc").Find(&solution).Error
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time desc").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1", orgid).Order("id asc")
+	}).Find(&solution).Error
 	return solution, err
 }
+
+func GetSolutionScheduleBySchedule(orgid int64, zonid int64, classtype int64, schedule_date int64) (schedule []*models.XtScheduleList, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("user_org_id =?", orgid)
+	}
+	if zonid > 0 {
+		db = db.Where("partition_id = ?", zonid)
+	}
+	if classtype > 0 {
+		db = db.Where("schedule_type = ?", classtype)
+	}
+	if schedule_date > 0 {
+		db = db.Where("schedule_date = ?", schedule_date)
+	}
+	err = db.Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1", orgid).Group("patient_id,mode_id").Order("created_time asc").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgid).Order("id asc")
+		})
+	}).Find(&schedule).Error
+	return schedule, err
+}

service/self_drug_service.go

@@ -136,6 +136,18 @@ func GetBaseDrugMedical(id int64) (models.XtBaseDrug, error) {
 	return drug, err
 }
 
+func ModifyDrugWarehouseByInfoId(id int64, stock_max_number int64) error {
+	info := models.DrugWarehouseInfo{}
+	err := XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", stock_max_number)).Error
+	return err
+}
+
+func ModifyDrugWarehouseByStockMin(id int64, stock_min_number int64) error {
+	info := models.DrugWarehouseInfo{}
+	err := XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", stock_min_number)).Error
+	return err
+}
+
 func GetSelfMedicalByDrugName(drugname string, drug_spec string, patientid int64) (*models.XtSelfMedical, error) {
 	medical := models.XtSelfMedical{}
 	err := XTReadDB().Model(&medical).Where("drug_name = ? and drug_spec = ? and patient_id = ? and status = 1", drugname, drug_spec, patientid).Find(&medical).Error

service/stock_service.go

@@ -268,7 +268,7 @@ func FindGoodInfoList(orgId int64, page int64, limit int64, keyword string, is_u
 		likeKey := "%" + keyword + "%"
 		db = db.Where("good_code LIKE ? OR good_name LIKE ?", likeKey, likeKey)
 		if is_use > 0 {
-			if is_use == 1 {
+			if is_use == 2 {
 				db = db.Where("find_in_set('停用',good_status) = 0")
 			} else {
 				db = db.Where("find_in_set('停用',good_status) > 0")
@@ -296,7 +296,7 @@ func FindGoodInfoList(orgId int64, page int64, limit int64, keyword string, is_u
 		}
 	} else {
 		if is_use > 0 {
-			if is_use == 1 {
+			if is_use == 2 {
 				db = db.Where("find_in_set('停用',good_status) = 0")
 			} else {
 				db = db.Where("find_in_set('停用',good_status) > 0")
@@ -454,11 +454,11 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 	if len(warehousingInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehousingInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Number)
@@ -482,6 +482,7 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 				insertData = append(insertData, info.MaxUnit)
 				insertData = append(insertData, info.MinUnit)
 				insertData = append(insertData, info.BatchNumber)
+				insertData = append(insertData, info.StockMinNumber)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -658,12 +659,6 @@ func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id in
 	return flow, err
 }
 
-func UpdateDrugFlowTen(patientid int64, warehouse_out_number string, drug_id int64) (models.DrugFlow, error) {
-	flow := models.DrugFlow{}
-	err := XTWriteDB().Model(&flow).Where("patient_id =? and warehouse_out_order_number = ? and drug_id = ? and status = 1", patientid, warehouse_out_number, drug_id).Updates(map[string]interface{}{"status": 0}).Error
-	return flow, err
-}
-
 func CreateDrugFlowTwo(flow *models.DrugFlow) error {
 
 	err := XTWriteDB().Create(&flow).Error
@@ -682,6 +677,12 @@ func GetLastWarehousingInfo(goodid int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
+func CreatedWarehouseingDetail(info *models.WarehousingInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
 func FindFirstWarehousingInfoByStock(good_id int64, good_type_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", good_id, good_type_id).Order("ctime").First(&info).Error
 	return info, err
@@ -861,6 +862,8 @@ type VMDrugWarehouseInfo struct {
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
@@ -2065,7 +2068,7 @@ func UpDateDrugWarehousingInfo(info *models.DrugWarehouseInfo) (err error) {
 }
 
 func UpDateDrugWarehousingInfoTwo(id int64, info *models.DrugWarehouseInfo) (err error) {
-	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber}).Error
+	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit, "min_unit": info.MinUnit, "retail_price": info.RetailPrice}).Error
 	return err
 }
 
@@ -2076,13 +2079,6 @@ func GetDrugWarehouseOrderOne(id int64, drug_id int64) (models.DrugWarehouseInfo
 	return info, err
 }
 
-func GetDrugWarehouseOrder(id int64) (models.DrugWarehouseInfo, error) {
-
-	info := models.DrugWarehouseInfo{}
-	err = XTReadDB().Model(&info).Where("id = ?", id).Find(&info).Error
-	return info, err
-}
-
 func EditWarehousing(warehouse models.Warehousing) {
 	err = readDb.Model(&models.Warehousing{}).Where("warehousing_order = ? AND status = 1", warehouse.WarehousingOrder).Update(map[string]interface{}{"mtime": time.Now().Unix(), "warehousing_time": warehouse.WarehousingTime, "modifier": warehouse.Modifier, "dealer": warehouse.Dealer, "manufacturer": warehouse.Manufacturer}).Error
 
@@ -2410,6 +2406,12 @@ func FindAllDrugCancelList(orgId int64, page int64, limit int64, startTime int64
 	return
 }
 
+func GetCancelWarehosueInfo(ids []string) (info []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Where("id IN(?) and status = 1", ids).Find(&info).Error
+	return info, err
+}
+
 func DeleteCancelStock(ids []string) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.CancelStock{}).Where("id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
@@ -2431,6 +2433,11 @@ func DeleteCancelStock(ids []string) (err error) {
 	return
 }
 
+func GetDrugWareInfoByCancelId(ids []string) (info []*models.DrugCancelStockInfo, err error) {
+	err = XTReadDB().Where("cancel_stock_id IN(?) and status = 1", ids).Find(&info).Error
+	return info, err
+}
+
 func DeleteDrugCancelStock(ids []string) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.DrugCancelStock{}).Where("id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
@@ -2457,9 +2464,21 @@ func UpDateCancleStockStatus(id int64) (err error) {
 	return
 }
 
-func UpdatedStockFlowByCancelId(id int64) (err error) {
+func GetCancelStockById(id int64) (models.CancelStockInfo, error) {
+	info := models.CancelStockInfo{}
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func ModefyWarehouseInfoNight(info models.WarehousingInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", info.StockCount)).Error
+	return err
+}
+
+func UpdatedStockFlowByCancelId(id int64, good_id int64) (err error) {
 
-	err = XTWriteDB().Model(&models.CancelStockInfo{}).Where("cancel_out_detail_id = ? and status = 0", id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("cancel_out_detail_id = ? and status = 1 and good_id = ?", id, good_id).Updates(map[string]interface{}{"status": 0}).Error
 	return
 }
 
@@ -4940,14 +4959,14 @@ func UpdateStockFlow(flow models.VmStockFlow, goodid int64, warehousing_id int64
 func UpdateDrugFlow(flow models.DrugFlow, drugid int64, warehousing_id int64) error {
 
 	drugFlow := models.DrugFlow{}
-	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count}).Error
+	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit, "min_unit": flow.MinUnit, "price": flow.Price, "expire_date": flow.ExpireDate}).Error
 	return err
 }
 
 func UpdateDrugFlowNight(flow models.DrugFlow, drugid int64, warehousing_id int64) error {
 
 	drugFlow := models.DrugFlow{}
-	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "number": flow.Number, "batch_number": flow.BatchNumber, "price": flow.Price}).Error
+	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_detail_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "max_unit": flow.MaxUnit, "min_unit": flow.MinUnit, "price": flow.Price, "expire_date": flow.ExpireDate}).Error
 	return err
 }
 
@@ -5543,7 +5562,7 @@ func UpdateStockFlowTwo(id int64, flow models.VmStockFlow) error {
 
 func UpdateStockFlowThree(id int64, flow models.VmStockFlow) error {
 
-	err := XTWriteDB().Model(&flow).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Count, "dealer": flow.Dealer, "number": flow.Number, "license_number": flow.LicenseNumber, "price": flow.Price}).Error
+	err := XTWriteDB().Model(&flow).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Count, "dealer": flow.Dealer, "number": flow.Number, "license_number": flow.LicenseNumber, "price": flow.Price, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate}).Error
 	return err
 }