耗材参数

controllers/base_api_controller.go

@@ -2,8 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
-
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -69,36 +67,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -315,35 +313,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 3877
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3877
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/drug_stock_api_contorller.go

@@ -1660,6 +1660,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	fmt.Println("cancelStockDate232323223233223", cancelStockDate.Unix())
 
 	adminUserInfo := c.GetAdminUserInfo()
 	operation_time := time.Now().Unix()
@@ -1685,6 +1686,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		Type:         types,
 	}
 	service.AddSigleDrugCancelStock(&cancelStock)
+	fmt.Println("hh232323232323232323232323232322332", parseDateErr)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -1868,7 +1870,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			//创建退库详情
 			errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
 			//创建库存明细
-			service.CreateDrugFlow(drugFlow)
+			errs = service.CreateDrugFlow(drugFlow)
 
 			var total int64
 			//退库到当前批次,获取当前退库批次的库存
@@ -1908,6 +1910,15 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 					"msg": "1",
 				})
 			}
+			if errs != nil {
+				utils.ErrorLog(errs.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+			})
 		}
 	}
 }
@@ -1916,8 +1927,8 @@ func (c *StockDrugApiController) GetDrugCancelStockInfoList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	cancelStockInfoList, _ := service.FindDrugCancelStockInfoById(id, adminUserInfo.CurrentOrgId)
-	info, _ := service.FindCancelStockById(id, adminUserInfo.CurrentOrgId)
 
+	info, _ := service.FindCancelDrugById(id, adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": cancelStockInfoList,
 		"info": info,
@@ -2047,7 +2058,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 	var cancelStockInfos []*models.DrugCancelStockInfo
 	var upDateCancelStockInfos []*models.DrugCancelStockInfo
-
+	var drugFlow []*models.DrugFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisCancelStock, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisCancelStock) > 0 {
@@ -2134,6 +2145,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 				}
 
+				batch_number_id := int64(items["batch_number_id"].(float64))
 				if id == 0 {
 					cancelStockInfo := &models.DrugCancelStockInfo{
 						DrugId:           drug_id,
@@ -2157,6 +2169,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 						Remark:           remark,
 						ProductDate:      productDates,
 						ExpiryDate:       expiryDates,
+						BatchNumberId:    batch_number_id,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
@@ -2184,20 +2197,159 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 						Remark:           remark,
 						ProductDate:      productDates,
 						ExpiryDate:       expiryDates,
+						BatchNumberId:    batch_number_id,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 				}
+
+				flow := &models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  drug_id,
+					Number:                  "",
+					BatchNumber:             batch_number,
+					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:            0,
+					Dealer:                  0,
+					Creator:                 adminUserInfo.AdminUser.Id,
+					UpdateCreator:           adminUserInfo.AdminUser.Id,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              expiryDates,
+					ProductDate:             productDates,
+					MaxUnit:                 max_unit,
+					MinUnit:                 "",
+				}
+				drugFlow = append(drugFlow, flow)
 			}
 		}
 	}
 	var errs error
 	if len(cancelStockInfos) > 0 {
 		errs = service.CreateDrugCancelStockInfo(cancelStockInfos)
+
+		//扣减库存逻辑
+		for _, item := range cancelStockInfos {
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//查询当前药品退库的批次号的总入库数
+			infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
+			fmt.Println("hhh2h3h2hh3233", item.MaxUnit, medical.MaxUnit)
+			var total_count int64
+			if item.MaxUnit == medical.MaxUnit {
+				total_count = infoWareInfo.WarehousingCount
+			}
+			//转化为最小库存
+			if item.MaxUnit == medical.MinUnit {
+				total_count = infoWareInfo.WarehousingCount * medical.MinNumber
+			}
+			//判断退库数量是否大于总入库数量
+			if item.Count > total_count {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "2",
+				})
+				return
+			}
+			//正常退库
+			if item.Count <= infoWareInfo.WarehousingCount {
+				//创建退库详情
+				errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
+				//创建库存明细
+				errs = service.CreateDrugFlow(drugFlow)
+
+				var total int64
+				//退库到当前批次,获取当前退库批次的库存
+				info, _ := service.GetDrugWarehouseInfoById(item.BatchNumberId)
+
+				if info.MaxUnit == item.MaxUnit {
+					total = item.Count + info.StockMaxNumber
+
+					warehouseInfo := models.XtDrugWarehouseInfo{
+						StockMaxNumber: total,
+					}
+					errs = service.UpdateDrugWarehouseInfo(&warehouseInfo, item.BatchNumberId)
+					if errs != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "1",
+					})
+				}
+				if medical.MinUnit == item.MaxUnit {
+					total = item.Count + info.StockMinNumber
+					warehouseInfo := models.XtDrugWarehouseInfo{
+						StockMinNumber: total,
+					}
+
+					errs = service.UpdateDrugWarehouseInfoOne(&warehouseInfo, item.BatchNumberId)
+					if errs != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "1",
+					})
+				}
+				if errs != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
+					return
+				}
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
+			}
+		}
+	}
+	if len(drugFlow) > 0 {
+		parseDateErr := service.CreateDrugFlow(drugFlow)
+		fmt.Println(parseDateErr)
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
+		var total int64
 		for _, item := range upDateCancelStockInfos {
 			errs = service.UpDateDrugCancelStockInfo(item)
+			//查询该批次最后一条退库记录
+			info, _ := service.GetLastCancelStockInfo(id)
+			//查询该药品的信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
+			if item.MaxUnit == medical.MaxUnit {
+				item.Count = item.Count * medical.MinNumber
+				//更新库存
+				total = item.Count - info.Count
+				fmt.Println("total232323232323232232323", total)
+				service.UpdatedDrugInfo(item.BatchNumberId, total)
+				break
+			}
+
+			if item.MaxUnit == medical.MinUnit {
+				item.Count = item.Count
+				total = item.Count - info.Count
+				service.UpdatedDrugInfoOne(item.BatchNumberId, total)
+				break
+			}
 		}
 	}
 
@@ -2208,7 +2360,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "编辑成功",
+		"msg": "1",
 	})
 
 }

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3332,7 +3332,16 @@ func (c *DialysisAPIController) CreateConsumables() {
 		//查询是否有库存
 		for _, item := range dialysisBefor {
 			warehouse, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId)
-			fmt.Println("库存数量00000000000000000000", warehouse.StockCount)
+			fmt.Println("库存数量00000000000000000000", warehouse.StockCount, err)
+			if err == gorm.ErrRecordNotFound {
+				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"message":            "1",
+					"good_name":          goodObj.GoodName,
+					"specification_name": goodObj.SpecificationName,
+				})
+				return
+			}
 			if err != nil {
 				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 				c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/patient_api_controller.go

@@ -608,7 +608,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
-
+		fmt.Println("2323232323232323232开关", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
@@ -620,21 +620,40 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				if isHasWay {
+					var total int64
+					var prescribing_number_total int64
 					for _, item := range advices {
 						if item.Way == 1 {
 							//查询该药品是否有库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							fmt.Println("list23232323232232323232323232", list)
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							//判断单位是否相等
+							if medical.MaxUnit == item.PrescribingNumberUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								//转化为最小单位
+								total = list.Count * medical.MinNumber
+								prescribing_number_total = count * medical.MinNumber
+							}
+							if medical.MinUnit == item.PrescribingNumberUnit {
+								total = list.Count
+								prescribing_number_total = list.Count
+							}
+
+							fmt.Println("数量一", prescribing_number_total)
+							fmt.Println("数量二", total)
+
 							if list.Count == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "1",
+									"msg":    "3",
 									"advice": advice,
 									"ids":    ids,
 								})
 								return
 							}
-							if count > list.Count {
+							if prescribing_number_total > total {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "2",
 									"advice": advice,
@@ -642,11 +661,21 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								})
 								return
 							}
-							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							if prescribing_number_total <= total {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
+
 						}
 					}
 				}
 			} else {
+
 				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 				isHasWay := false //用来判断是否包含来自药品库的医嘱
 
@@ -655,25 +684,43 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						isHasWay = true
 					}
 				}
+				fmt.Println("hh2h32323232323232323", isHasWay)
 				if isHasWay {
+					var total int64
+					var prescribing_number_total int64
 					for _, item := range advices {
+						fmt.Println("hhh23h2h3h232323", item.Way)
 						if item.Way == 1 {
 							//查询该药品是否有库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-							//获取该药品的信息
-							//medical, _ := service.GetBaseDrugMedical(item.DrugId)
-							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							//判断单位是否相等
+							if medical.MaxUnit == item.PrescribingNumberUnit {
+								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+								//转化为最小单位
+								total = list.Count * medical.MinNumber
+								prescribing_number_total = count * medical.MinNumber
+							}
+							if medical.MinUnit == item.PrescribingNumberUnit {
+								total = list.Count
+								prescribing_number_total = list.Count
+							}
+
+							fmt.Println("数量一", prescribing_number_total)
+							fmt.Println("数量二", total)
 
 							if list.Count == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "1",
+									"msg":    "3",
 									"advice": advice,
 									"ids":    ids,
 								})
 								return
 							}
-							if count > list.Count {
+							if prescribing_number_total > total {
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "2",
 									"advice": advice,
@@ -681,7 +728,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								})
 								return
 							}
-							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+							if prescribing_number_total <= total {
+								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
 						}
 					}
 				}
@@ -784,7 +839,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":    "ok",
+			"msg":    "1",
 			"advice": advice,
 			"ids":    ids,
 		})

controllers/patient_api_controller.go

@@ -714,7 +714,14 @@ func (c *PatientApiController) EditLapseto() {
 	//		return
 	//	}
 	//}
+
 	err = service.EditPatientLapseto(&patient, &lapseto)
+
+	if lapseto.LapsetoType == 3 {
+		service.UpdateScheduleByDeathTime(id, lapsetoTimeUnix.Unix())
+		service.UpdateScheduleItemByPatientId(id)
+	}
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEditLapsetoFail)
 		return

controllers/print_data_api_controller.go

@@ -16,6 +16,7 @@ func PrintDataAPIControllerRegistRouters() {
 	beego.Router("/api/print/stock", &PrintDataAPIController{}, "get:StockRecordPrintData")
 	beego.Router("/api/print/course", &PrintDataAPIController{}, "get:CourseRecordPrintData")
 	beego.Router("/api/print/getlastafterweight", &PrintDataAPIController{}, "get:GetLastAfterWeight")
+	beego.Router("/api/stock/getgooddetailprintlist", &PrintDataAPIController{}, "get:GetGoodDetailPrintList")
 }
 
 type PrintDataAPIController struct {
@@ -159,3 +160,48 @@ func (this *PrintDataAPIController) GetLastAfterWeight() {
 		"weight": weight,
 	})
 }
+
+func (this *PrintDataAPIController) GetGoodDetailPrintList() {
+
+	types, _ := this.GetInt("type", 0)
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	adminUserInfo := this.GetAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+
+	//入库详情
+	if types == 1 {
+		list, err := service.GetWarehouseInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+
+}

controllers/schedule_api_controller.go

@@ -2087,7 +2087,7 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 			item.ScheduleDate = copy_startime + 432000
 		}
 		//礼拜天
-		if item.ScheduleWeek == 0 {
+		if item.ScheduleWeek == 7 {
 			item.ScheduleDate = copy_endtime
 		}
 		schedule := models.XtSchedule{

controllers/stock_in_api_controller.go

@@ -1773,7 +1773,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	}
 
 	var cancelStockInfos []*models.CancelStockInfo
-
+	var stockFLow []*models.VmStockFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisStockIn) > 0 {
@@ -1867,21 +1867,57 @@ func (c *StockManagerApiController) CreateCancelStock() {
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
+				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:            0,
+					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)
 			}
 		}
 	}
 	errs := service.CreateCancelStockInfo(cancelStockInfos)
 
+	if len(stockFLow) > 0 {
+		service.CreateStockFlow(stockFLow)
+	}
+
 	for _, item := range cancelStockInfos {
 
-		//查找该耗材是否有出库记录
-		_, errcode := service.GetWarehoureOutOrderInfo(item.GoodId, item.OrgId)
-		if errcode == gorm.ErrRecordNotFound {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "1",
-			})
-			return
-		}
+		////查找该耗材是否有出库记录
+		//_, errcode := service.GetWarehoureOutOrderInfo(item.GoodId, item.OrgId)
+		//if errcode == gorm.ErrRecordNotFound {
+		//	c.ServeSuccessJSON(map[string]interface{}{
+		//		"msg": "1",
+		//	})
+		//	return
+		//}
 
 		//统计该耗材的出库数量
 		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId)
@@ -2052,7 +2088,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 	var cancelStockInfos []*models.CancelStockInfo
 	var upDateCancelStockInfos []*models.CancelStockInfo
-
+	var stockFlow []*models.VmStockFlow
 	if dataBody["cancelStock"] != nil && reflect.TypeOf(dataBody["cancelStock"]).String() == "[]interface {}" {
 		thisCancelStock, _ := dataBody["cancelStock"].([]interface{})
 		if len(thisCancelStock) > 0 {
@@ -2156,6 +2192,40 @@ func (c *StockManagerApiController) EditCancelStock() {
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
+					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:                  2,
+						CancelStockId:           cancelStock.ID,
+						CancelOrderNumber:       cancelStock.OrderNumber,
+						Manufacturer:            0,
+						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)
+
 				} else {
 					cancelStockInfo := &models.CancelStockInfo{
 						ID:              id,
@@ -2178,6 +2248,40 @@ func (c *StockManagerApiController) EditCancelStock() {
 						Price:           price,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
+
+					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:                  2,
+						CancelStockId:           cancelStock.ID,
+						CancelOrderNumber:       cancelStock.OrderNumber,
+						Manufacturer:            0,
+						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)
 				}
 			}
 		}
@@ -2185,6 +2289,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 	var errs error
 	if len(cancelStockInfos) > 0 {
 		errs = service.CreateCancelStockInfo(cancelStockInfos)
+		service.CreateStockFlow(stockFlow)
 		// 改变入库单的值
 		for _, item := range cancelStockInfos {
 			//查询该耗材的入库记录
@@ -2205,7 +2310,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 	if len(upDateCancelStockInfos) > 0 {
 		for _, item := range upDateCancelStockInfos {
-
+			service.CreateStockFlow(stockFlow)
 			errs = service.UpDateCancelStockInfo(item)
 			list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
 			//调用退库的方法

models/stock_models.go

@@ -506,7 +506,7 @@ type VmStockFlow struct {
 	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
 	IsEdit                  int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
 	CancelStockId           int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber       int64   `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	CancelOrderNumber       string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
 	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`

service/gobal_config_service.go

@@ -664,7 +664,7 @@ func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*m
 
 }
 
-func GetCancelDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.XtCancelStockInfo, err error) {
+func GetCancelDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
 
 	db := XTReadDB().Table(" xt_drug_cancel_stock_info as x").Where("x.status = 1")
 

service/patient_service.go

@@ -1504,3 +1504,14 @@ func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string,
 	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and advice_name = ? and advice_desc = ? and template_id = ? and frequency_type = ? AND advice_type = 2 ", patient_id, user_org_id, record_date, advice_name, advice_desc, template_id, fre_type).First(&advice).Error
 	return
 }
+
+func UpdateScheduleByDeathTime(patientid int64, shcheduledate int64) error {
+	err := XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date>?", patientid, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateScheduleItemByPatientId(id int64) error {
+
+	err := XTWriteDB().Model(models.PatientScheduleTemplateItem{}).Where("patient_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -214,3 +214,23 @@ func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error)
 	err = p_service.XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
 	return goodInfo, err
 }
+
+func GetWarehouseInfoGoodDetailPrintList(orgid int64, startime int64, endtime int64, limit int64, page int64) (info []*models.VmWarehousingInfo, err error) {
+	offset := (page - 1) * limit
+	db := p_service.XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Limit(limit).Scan(&info).Error
+	return info, err
+}

service/stock_service.go

@@ -1117,6 +1117,7 @@ type DrugCancelStockInfo struct {
 	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	BatchNumberId    int64   `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
 }
 
 func (DrugCancelStockInfo) TableName() string {
@@ -2151,6 +2152,12 @@ func FindCancelStockById(id int64, org_id int64) (cancelStock models.CancelStock
 
 }
 
+func FindCancelDrugById(id int64, org_id int64) (cancelStock models.DrugCancelStock, err error) {
+	err = readDb.Model(&models.CancelStock{}).Where("id = ? AND status = 1", id).First(&cancelStock).Error
+	return cancelStock, err
+
+}
+
 func FindDrugCancelStockById(id int64) (cancelStock models.DrugCancelStock, err error) {
 	err = readDb.Model(&models.DrugCancelStock{}).Where("id = ? AND status = 1", id).First(&cancelStock).Error
 	return cancelStock, err
@@ -3846,6 +3853,11 @@ func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int6
 		if consumable_type == 3 {
 			db = db.Where(" consumable_type = ? and is_sys = 1", consumable_type)
 		}
+
+		//4.手动退库
+		if consumable_type == 4 {
+			db = db.Where(" consumable_type = ?", consumable_type)
+		}
 	}
 	if orgId > 0 {
 		db = db.Where("user_org_id = ?", orgId)
@@ -3939,6 +3951,9 @@ func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime i
 		if stock_type == 3 {
 			db = db.Where("consumable_type = 3 and is_sys = 1")
 		}
+		if stock_type == 4 {
+			db = db.Where("consumable_type = 4")
+		}
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&drug_flow).Error
 	return drug_flow, total, err
@@ -4029,3 +4044,23 @@ func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) erro
 	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_min_number": info.StockMaxNumber}).Error
 	return err
 }
+
+func GetLastCancelStockInfo(id int64) (models.DrugCancelStockInfo, error) {
+
+	info := models.DrugCancelStockInfo{}
+
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdatedDrugInfo(id int64, count int64) (err error) {
+
+	err = writeDb.Model(&models.DrugWarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	return err
+}
+
+func UpdatedDrugInfoOne(id int64, count int64) (err error) {
+
+	err = writeDb.Model(&models.DrugWarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	return err
+}

service/warhouse_service.go

@@ -1313,7 +1313,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,
-			CancelOrderNumber:       0,
+			CancelOrderNumber:       "",
 			Manufacturer:            goods.Manufacturer,
 			Dealer:                  goods.Dealer,
 			Creator:                 creator,
@@ -1401,7 +1401,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,
-			CancelOrderNumber:       0,
+			CancelOrderNumber:       "",
 			Manufacturer:            goods.Manufacturer,
 			Dealer:                  goods.Dealer,
 			Creator:                 creator,