耗材参数

controllers/dialysis_api_controller.go

@@ -256,7 +256,9 @@ func (c *DialysisApiController) PostPrescription() {
 	replacement_flow := c.GetString("replacement_flow")
 	plasma_separator := c.GetString("plasma_separator")
 	bilirubin_adsorption_column := c.GetString("bilirubin_adsorption_column")
-
+	oxygen_uptake, _ := c.GetInt64("oxygen_uptake")
+	oxygen_flow := c.GetString("oxygen_flow")
+	oxygen_time := c.GetString("oxygen_time")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -347,6 +349,9 @@ func (c *DialysisApiController) PostPrescription() {
 		ReplacementFlow:            replacement_flow,
 		PlasmaSeparator:            plasma_separator,
 		BilirubinAdsorptionColumn:  bilirubin_adsorption_column,
+		OxygenFlow:                 oxygen_flow,
+		OxygenUptake:               oxygen_uptake,
+		OxygenTime:                 oxygen_time,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -589,6 +594,9 @@ func (c *DialysisApiController) PostSoulution() {
 	replacement_flow := c.GetString("replacement_flow")
 	plasma_separator := c.GetString("plasma_separator")
 	bilirubin_adsorption_column := c.GetString("bilirubin_adsorption_column")
+	oxygen_uptake, _ := c.GetInt64("oxygen_uptake")
+	oxygen_flow := c.GetString("oxygen_flow")
+	oxygen_time := c.GetString("oxygen_time")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -690,6 +698,9 @@ func (c *DialysisApiController) PostSoulution() {
 		ReplacementFlow:           replacement_flow,
 		PlasmaSeparator:           plasma_separator,
 		BilirubinAdsorptionColumn: bilirubin_adsorption_column,
+		OxygenTime:                oxygen_time,
+		OxygenUptake:              oxygen_uptake,
+		OxygenFlow:                oxygen_flow,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器

controllers/drug_stock_api_contorller.go

@@ -446,7 +446,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 
 	warehousing, err := service.FindDrugWarehousingById(id, admin.CurrentOrgId)
 
-	manufacturerList, _ := service.GetAllDrugLibList(admin.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -597,12 +597,12 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 				}
 
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-					utils.ErrorLog("number")
+				if items["lot_number"] == nil || reflect.TypeOf(items["lot_number"]).String() != "string" {
+					utils.ErrorLog("lot_number")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				number, _ := items["number"].(string)
+				number, _ := items["lot_number"].(string)
 
 				if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
 					utils.ErrorLog("batch_number")
@@ -683,6 +683,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						//Dealer:           dealer,
 						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
+						StockMaxNumber:   warehousing_count,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 				}
@@ -1170,8 +1171,10 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
+
 		if len(thisStockIn) > 0 {
 			for _, item := range thisStockIn {
+
 				items := item.(map[string]interface{})
 
 				if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
@@ -1194,18 +1197,21 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 
-				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
-					utils.ErrorLog("retail_price")
+				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+					utils.ErrorLog("last_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
-				retail_price_total := float64(count) * retail_price
+				retail_price_total := float64(count) * last_price
 				remark := items["remark"].(string)
+				packing_unit := items["packing_unit"].(string)
+
+				fmt.Println("包装单位999999999999", packing_unit)
 
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1221,25 +1227,41 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					Type:                    types,
 					Manufacturer:            manufacturer_id,
 					Dealer:                  dealer_id,
-					RetailPrice:             retail_price,
+					RetailPrice:             last_price,
 					RetailTotalPrice:        retail_price_total,
+					CountUnit:               packing_unit,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
 			}
 		}
 	}
-	errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-	info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-		return
+
+	//调用出库逻辑
+	for _, item := range warehousingOutInfo {
+
+		// 出库流程
+		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+		drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
+		if drup.ID > 0 {
+			prescribingNumber := item.Count
+
+			service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
+
+		}
+
 	}
 
+	//errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+	//info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
+	//if errs != nil {
+	//	utils.ErrorLog(errs.Error())
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+	//	return
+	//}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":                   "出库成功",
-		"info":                  info,
 		"warehousing_out_order": warehousing_out_order,
 	})
 

controllers/gobal_config_api_controller.go

@@ -86,6 +86,10 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/order/getorderconfig", &GobalConfigApiController{}, "Get:GetOrderConfig")
 	beego.Router("/api/drugstock/getdrugautomaticlist", &GobalConfigApiController{}, "Get:GetDrugAutoMaticList")
 	beego.Router("/api/drugstock/getdrugwarehouseorderinfo", &GobalConfigApiController{}, "Get:GetDrugWarehuseOrderInfo")
+
+	//新接口
+	beego.Router("/api/drugstock/drugstocklist", &GobalConfigApiController{}, "Get:GetDrugStockList")
+	beego.Router("/api/drugstock/getdrugstockflow", &GobalConfigApiController{}, "Get:GetDrugStockFllow")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1732,3 +1736,111 @@ func (c *GobalConfigApiController) GetDrugWarehuseOrderInfo() {
 		"list": list,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugStockList() {
+
+	page, _ := c.GetInt64("page", -1)
+	limit, _ := c.GetInt64("limit", -1)
+	keyword := c.GetString("keyword")
+	drug_category, _ := c.GetInt64("drug_category")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminUserInfo := c.GetAdminUserInfo()
+
+	//查询入库数量
+	list, total, err := service.GetDrugStockList(page, limit, keyword, drug_category, startTime, endTime, adminUserInfo.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugStockFllow() {
+
+	drug_id, _ := c.GetInt64("drug_id")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	stock_type, _ := c.GetInt64("stock_type")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	//查询入库数据
+	if stock_type == 3 || stock_type == 0 {
+		list, total, err := service.GetDrugStockFlow(drug_id, startTime, endTime, page, limit, orgId)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"total":            total,
+			"manufacturerList": manufacturerList,
+		})
+	}
+
+	if stock_type >= 0 && stock_type != 3 {
+		outList, total, err := service.GetDrugStockOutFlow(drug_id, startTime, endTime, page, limit, orgId, stock_type)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"outList": outList,
+			"total":   total,
+		})
+	}
+
+}

controllers/manager_center_api_controller.go

@@ -136,10 +136,10 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
-	dosage := c.GetString("dosage")
-	unval := c.GetString("unval")
-	packing_unit := c.GetString("packing_unit")
-	packing_price, _ := c.GetFloat("packing_price")
+	dose, _ := c.GetFloat("dose")
+	dose_unit := c.GetString("dose_unit")
+	min_price, _ := c.GetFloat("min_price")
+	min_number, _ := c.GetInt64("min_number")
 	drug_day := c.GetString("drug_day")
 	adminInfo := c.GetAdminUserInfo()
 
@@ -197,11 +197,11 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
-		Dosage:                      dosage,
-		Unval:                       unval,
-		PackingUnit:                 packing_unit,
-		PackingPrice:                packing_price,
 		DrugDay:                     drug_day,
+		MinNumber:                   min_number,
+		Dose:                        dose,
+		MinPrice:                    min_price,
+		DoseUnit:                    dose_unit,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -286,11 +286,12 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
-	dosage := c.GetString("dosage")
-	unval := c.GetString("unval")
-	packing_unit := c.GetString("packing_unit")
-	packing_price, _ := c.GetFloat("packing_price")
+	min_number, _ := c.GetInt64("min_number")
 	drug_day := c.GetString("drug_day")
+	dose, _ := c.GetFloat("dose")
+	dose_unit := c.GetString("dose_unit")
+	fmt.Println("单位999999999999999999999999999999", dose_unit)
+	min_price, _ := c.GetFloat("min_price")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -350,11 +351,11 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
-		Dosage:                      dosage,
-		Unval:                       unval,
-		PackingPrice:                packing_price,
-		PackingUnit:                 packing_unit,
 		DrugDay:                     drug_day,
+		MinNumber:                   min_number,
+		Dose:                        dose,
+		MinPrice:                    min_price,
+		DoseUnit:                    dose_unit,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)
@@ -1460,6 +1461,11 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	social_security_directory_code := c.GetString("social_security_directory_code")
 	production_type := c.GetString("production_type")
 	special_medical := c.GetString("special_medical")
+	min_number, _ := c.GetInt64("min_number")
+	packing_unit := c.GetString("packing_unit")
+	packing_price, _ := c.GetFloat("packing_price")
+	min_unit := c.GetString("min_unit")
+	default_count_unit := c.GetString("default_count_unit")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
@@ -1513,6 +1519,11 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		ProductionType:              production_type,
 		SpecialMedical:              special_medical,
+		MinNumber:                   min_number,
+		PackingUnit:                 packing_unit,
+		PackingPrice:                packing_price,
+		DefaultCountUnit:            default_count_unit,
+		MinUnit:                     min_unit,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1566,6 +1577,12 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	social_security_directory_code := c.GetString("social_security_directory_code")
 	production_type := c.GetString("production_type")
 	special_medical := c.GetString("special_medical")
+
+	min_number, _ := c.GetInt64("min_number")
+	packing_unit := c.GetString("packing_unit")
+	packing_price, _ := c.GetFloat("packing_price")
+	default_count_unit := c.GetString("default_count_unit")
+	min_unit := c.GetString("min_unit")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	goodInfo := models.GoodInfo{
@@ -1610,6 +1627,11 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		SpecialMedical:              special_medical,
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		ProductionType:              production_type,
+		MinNumber:                   min_number,
+		PackingUnit:                 packing_unit,
+		PackingPrice:                packing_price,
+		DefaultCountUnit:            default_count_unit,
+		MinUnit:                     min_unit,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -637,7 +637,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				if isHasWay {
-					out, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
+					_, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
 					if err == gorm.ErrRecordNotFound {
 						//没有记录，则创建出库单
 						timeStr := time.Now().Format("2006-01-02")
@@ -668,43 +668,46 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						} else {
 							for _, item := range advices {
 								if item.Way == 1 {
-									if item.PrescribingNumber > 0 {
-										warehouseOutInfo := &models.DrugWarehouseOutInfo{
-											WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-											WarehouseOutId:          warehouseOut.ID,
-											Status:                  1,
-											Ctime:                   time.Now().Unix(),
-											Remark:                  "",
-											OrgId:                   adminUserInfo.Org.Id,
-											Type:                    1,
-											Manufacturer:            0,
-											Dealer:                  0,
-											IsSys:                   1,
-											SysRecordTime:           record_time,
-											DrugId:                  item.DrugId,
-										}
-										prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-										count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-										warehouseOutInfo.Count = count
-										stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-										warehouseOutInfo.Price = stockInInfo.Price
-										err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-										if err == nil {
-											details := &models.DrugAutomaticReduceDetail{
-												WarehouseOutId:          warehouseOutInfo.ID,
-												WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-												PatientId:               item.PatientId,
-												Ctime:                   time.Now().Unix(),
-												Mtime:                   time.Now().Unix(),
-												Status:                  1,
-												RecordTime:              record_time,
-												OrgId:                   adminUserInfo.Org.Id,
-												DrugId:                  item.DrugId,
-												Count:                   count,
-											}
-											service.AddSigleDrugAutoReduceRecordInfo(details)
-										}
-									}
+
+									service.DrugsDelivery(item.UserOrgId, &item)
+
+									//if item.PrescribingNumber > 0 {
+									//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
+									//		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+									//		WarehouseOutId:          warehouseOut.ID,
+									//		Status:                  1,
+									//		Ctime:                   time.Now().Unix(),
+									//		Remark:                  "",
+									//		OrgId:                   adminUserInfo.Org.Id,
+									//		Type:                    1,
+									//		Manufacturer:            0,
+									//		Dealer:                  0,
+									//		IsSys:                   1,
+									//		SysRecordTime:           record_time,
+									//		DrugId:                  item.DrugId,
+									//	}
+									//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									//	warehouseOutInfo.Count = count
+									//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+									//	warehouseOutInfo.Price = stockInInfo.Price
+									//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+									//	if err == nil {
+									//		details := &models.DrugAutomaticReduceDetail{
+									//			WarehouseOutId:          warehouseOutInfo.ID,
+									//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+									//			PatientId:               item.PatientId,
+									//			Ctime:                   time.Now().Unix(),
+									//			Mtime:                   time.Now().Unix(),
+									//			Status:                  1,
+									//			RecordTime:              record_time,
+									//			OrgId:                   adminUserInfo.Org.Id,
+									//			DrugId:                  item.DrugId,
+									//			Count:                   count,
+									//		}
+									//		service.AddSigleDrugAutoReduceRecordInfo(details)
+									//	}
+									//}
 								}
 
 							}
@@ -713,71 +716,72 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					} else if err == nil {
 						for _, item := range advices {
 							if item.Way == 1 {
-								outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-								if err == gorm.ErrRecordNotFound {
-									warehouseOutInfo := &models.DrugWarehouseOutInfo{
-										WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-										WarehouseOutId:          out.ID,
-										Status:                  1,
-										Ctime:                   time.Now().Unix(),
-										Remark:                  "",
-										OrgId:                   adminUserInfo.Org.Id,
-										Type:                    1,
-										Manufacturer:            0,
-										Dealer:                  0,
-										IsSys:                   1,
-										SysRecordTime:           record_time,
-									}
-
-									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-									warehouseOutInfo.Price = stockInInfo.Price
-									warehouseOutInfo.DrugId = item.DrugId
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									warehouseOutInfo.Count = count
-									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-									if err == nil {
-										details := &models.DrugAutomaticReduceDetail{
-											WarehouseOutId:          warehouseOutInfo.ID,
-											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-											PatientId:               item.PatientId,
-											Ctime:                   time.Now().Unix(),
-											Mtime:                   time.Now().Unix(),
-											Status:                  1,
-											RecordTime:              record_time,
-											OrgId:                   adminUserInfo.Org.Id,
-											DrugId:                  item.DrugId,
-											Count:                   count,
-										}
-										service.AddSigleDrugAutoReduceRecordInfo(details)
-									}
-
-								} else if err == nil { //记录存在，则将增加数量
-									if outInfo.ID > 0 {
-										prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-										count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-										service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
-									}
-
-									//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
-									//if count == 0 {
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									details := &models.DrugAutomaticReduceDetail{
-										WarehouseOutId:          outInfo.ID,
-										WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-										PatientId:               item.PatientId,
-										Ctime:                   time.Now().Unix(),
-										Mtime:                   time.Now().Unix(),
-										Status:                  1,
-										RecordTime:              record_time,
-										OrgId:                   adminUserInfo.Org.Id,
-										DrugId:                  item.DrugId,
-										Count:                   count,
-									}
-									service.AddSigleDrugAutoReduceRecordInfo(details)
-
-								}
+								service.DrugsDelivery(item.UserOrgId, &item)
+								//outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+								//if err == gorm.ErrRecordNotFound {
+								//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
+								//		WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+								//		WarehouseOutId:          out.ID,
+								//		Status:                  1,
+								//		Ctime:                   time.Now().Unix(),
+								//		Remark:                  "",
+								//		OrgId:                   adminUserInfo.Org.Id,
+								//		Type:                    1,
+								//		Manufacturer:            0,
+								//		Dealer:                  0,
+								//		IsSys:                   1,
+								//		SysRecordTime:           record_time,
+								//	}
+								//
+								//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+								//	warehouseOutInfo.Price = stockInInfo.Price
+								//	warehouseOutInfo.DrugId = item.DrugId
+								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								//	warehouseOutInfo.Count = count
+								//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+								//	if err == nil {
+								//		details := &models.DrugAutomaticReduceDetail{
+								//			WarehouseOutId:          warehouseOutInfo.ID,
+								//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+								//			PatientId:               item.PatientId,
+								//			Ctime:                   time.Now().Unix(),
+								//			Mtime:                   time.Now().Unix(),
+								//			Status:                  1,
+								//			RecordTime:              record_time,
+								//			OrgId:                   adminUserInfo.Org.Id,
+								//			DrugId:                  item.DrugId,
+								//			Count:                   count,
+								//		}
+								//		service.AddSigleDrugAutoReduceRecordInfo(details)
+								//	}
+								//
+								//} else if err == nil { //记录存在，则将增加数量
+								//	if outInfo.ID > 0 {
+								//		prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								//		count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								//		service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
+								//	}
+								//
+								//	//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
+								//	//if count == 0 {
+								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								//	details := &models.DrugAutomaticReduceDetail{
+								//		WarehouseOutId:          outInfo.ID,
+								//		WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+								//		PatientId:               item.PatientId,
+								//		Ctime:                   time.Now().Unix(),
+								//		Mtime:                   time.Now().Unix(),
+								//		Status:                  1,
+								//		RecordTime:              record_time,
+								//		OrgId:                   adminUserInfo.Org.Id,
+								//		DrugId:                  item.DrugId,
+								//		Count:                   count,
+								//	}
+								//	service.AddSigleDrugAutoReduceRecordInfo(details)
+								//
+								//}
 							}
 						}
 
@@ -796,7 +800,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				if isHasWay {
-					out, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
+					_, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
 					if err == gorm.ErrRecordNotFound {
 						//没有记录，则创建出库单
 						timeStr := time.Now().Format("2006-01-02")
@@ -827,43 +831,44 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						} else {
 							for _, item := range advices {
 								if item.Way == 1 {
-									if item.PrescribingNumber > 0 {
-										warehouseOutInfo := &models.DrugWarehouseOutInfo{
-											WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-											WarehouseOutId:          warehouseOut.ID,
-											Status:                  1,
-											Ctime:                   time.Now().Unix(),
-											Remark:                  "",
-											OrgId:                   adminUserInfo.Org.Id,
-											Type:                    1,
-											Manufacturer:            0,
-											Dealer:                  0,
-											IsSys:                   1,
-											SysRecordTime:           record_time,
-											DrugId:                  item.DrugId,
-										}
-										prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-										count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-										warehouseOutInfo.Count = count
-										stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-										warehouseOutInfo.Price = stockInInfo.Price
-										err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-										if err == nil {
-											details := &models.DrugAutomaticReduceDetail{
-												WarehouseOutId:          warehouseOutInfo.ID,
-												WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-												PatientId:               item.PatientId,
-												Ctime:                   time.Now().Unix(),
-												Mtime:                   time.Now().Unix(),
-												Status:                  1,
-												RecordTime:              record_time,
-												OrgId:                   adminUserInfo.Org.Id,
-												DrugId:                  item.DrugId,
-												Count:                   count,
-											}
-											service.AddSigleDrugAutoReduceRecordInfo(details)
-										}
-									}
+									service.DrugsDelivery(item.UserOrgId, &item)
+									//if item.PrescribingNumber > 0 {
+									//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
+									//		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+									//		WarehouseOutId:          warehouseOut.ID,
+									//		Status:                  1,
+									//		Ctime:                   time.Now().Unix(),
+									//		Remark:                  "",
+									//		OrgId:                   adminUserInfo.Org.Id,
+									//		Type:                    1,
+									//		Manufacturer:            0,
+									//		Dealer:                  0,
+									//		IsSys:                   1,
+									//		SysRecordTime:           record_time,
+									//		DrugId:                  item.DrugId,
+									//	}
+									//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+									//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+									//	warehouseOutInfo.Count = count
+									//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+									//	warehouseOutInfo.Price = stockInInfo.Price
+									//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+									//	if err == nil {
+									//		details := &models.DrugAutomaticReduceDetail{
+									//			WarehouseOutId:          warehouseOutInfo.ID,
+									//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+									//			PatientId:               item.PatientId,
+									//			Ctime:                   time.Now().Unix(),
+									//			Mtime:                   time.Now().Unix(),
+									//			Status:                  1,
+									//			RecordTime:              record_time,
+									//			OrgId:                   adminUserInfo.Org.Id,
+									//			DrugId:                  item.DrugId,
+									//			Count:                   count,
+									//		}
+									//		service.AddSigleDrugAutoReduceRecordInfo(details)
+									//	}
+									//}
 								}
 
 							}
@@ -872,77 +877,73 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					} else if err == nil {
 						for _, item := range advices {
 							if item.Way == 1 {
-								outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-								if err == gorm.ErrRecordNotFound {
-									warehouseOutInfo := &models.DrugWarehouseOutInfo{
-										WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-										WarehouseOutId:          out.ID,
-										Status:                  1,
-										Ctime:                   time.Now().Unix(),
-										Remark:                  "",
-										OrgId:                   adminUserInfo.Org.Id,
-										Type:                    1,
-										Manufacturer:            0,
-										Dealer:                  0,
-										IsSys:                   1,
-										SysRecordTime:           record_time,
-									}
-
-									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-									warehouseOutInfo.Price = stockInInfo.Price
-									warehouseOutInfo.DrugId = item.DrugId
-									//warehouseOutInfo.Count = item.
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-									if err == nil {
-										details := &models.DrugAutomaticReduceDetail{
-											WarehouseOutId:          warehouseOutInfo.ID,
-											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-											PatientId:               item.PatientId,
-											Ctime:                   time.Now().Unix(),
-											Mtime:                   time.Now().Unix(),
-											Status:                  1,
-											RecordTime:              record_time,
-											OrgId:                   adminUserInfo.Org.Id,
-											DrugId:                  item.DrugId,
-											Count:                   count,
-										}
-										service.AddSigleDrugAutoReduceRecordInfo(details)
-									}
-
-								} else if err == nil { //记录存在，则将增加数量
-									if outInfo.ID > 0 {
-										prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-										count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-										service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
-									}
-
-									//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
-									//if count == 0 {
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									details := &models.DrugAutomaticReduceDetail{
-										WarehouseOutId:          outInfo.ID,
-										WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-										PatientId:               item.PatientId,
-										Ctime:                   time.Now().Unix(),
-										Mtime:                   time.Now().Unix(),
-										Status:                  1,
-										RecordTime:              record_time,
-										OrgId:                   adminUserInfo.Org.Id,
-										DrugId:                  item.DrugId,
-										Count:                   count,
-									}
-									service.AddSigleDrugAutoReduceRecordInfo(details)
-									//}
-									//else if count == 1 {
-									//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									//	service.UpdateDrugUserInfoDetails(item.DrugId, record_time, adminUserInfo.Org.Id, item.PatientId, count, &outInfo)
-									//}
-
-								}
+								service.DrugsDelivery(item.UserOrgId, &item)
+								//outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+								//if err == gorm.ErrRecordNotFound {
+								//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
+								//		WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+								//		WarehouseOutId:          out.ID,
+								//		Status:                  1,
+								//		Ctime:                   time.Now().Unix(),
+								//		Remark:                  "",
+								//		OrgId:                   adminUserInfo.Org.Id,
+								//		Type:                    1,
+								//		Manufacturer:            0,
+								//		Dealer:                  0,
+								//		IsSys:                   1,
+								//		SysRecordTime:           record_time,
+								//	}
+								//
+								//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
+								//	warehouseOutInfo.Price = stockInInfo.Price
+								//	warehouseOutInfo.DrugId = item.DrugId
+								//	//warehouseOutInfo.Count = item.
+								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+								//	if err == nil {
+								//		details := &models.DrugAutomaticReduceDetail{
+								//			WarehouseOutId:          warehouseOutInfo.ID,
+								//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+								//			PatientId:               item.PatientId,
+								//			Ctime:                   time.Now().Unix(),
+								//			Mtime:                   time.Now().Unix(),
+								//			Status:                  1,
+								//			RecordTime:              record_time,
+								//			OrgId:                   adminUserInfo.Org.Id,
+								//			DrugId:                  item.DrugId,
+								//			Count:                   count,
+								//		}
+								//		service.AddSigleDrugAutoReduceRecordInfo(details)
+								//	}
+								//
+								//} else if err == nil { //记录存在，则将增加数量
+								//	if outInfo.ID > 0 {
+								//		prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								//		count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								//		service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
+								//	}
+								//
+								//	//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
+								//	//if count == 0 {
+								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+								//	details := &models.DrugAutomaticReduceDetail{
+								//		WarehouseOutId:          outInfo.ID,
+								//		WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+								//		PatientId:               item.PatientId,
+								//		Ctime:                   time.Now().Unix(),
+								//		Mtime:                   time.Now().Unix(),
+								//		Status:                  1,
+								//		RecordTime:              record_time,
+								//		OrgId:                   adminUserInfo.Org.Id,
+								//		DrugId:                  item.DrugId,
+								//		Count:                   count,
+								//	}
+								//	service.AddSigleDrugAutoReduceRecordInfo(details)
+								//
+								//
+								//}
 							}
 						}
 
@@ -1001,7 +1002,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 				for _, item := range advices {
-					fmt.Println("item222222222222", item.ExecutionState)
+
 					if item.ExecutionState == 1 && item.Way == 2 {
 
 						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -1036,7 +1037,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 						//查询 该患者是否已出库
 						out, errcode := service.GetSelfOutStock(adminUserInfo.Org.Id, item.AdviceDate, item.PatientId, item.AdviceName, item.AdviceDesc)
-						fmt.Println("errcode ------------------", errcode)
+
 						if errcode == gorm.ErrRecordNotFound {
 							service.CreateOutStock(&outStock)
 						} else if errcode == nil {
@@ -1146,26 +1147,28 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							stockInInfo, _ := service.FindLastDrugStockInInfoRecord(advice.DrugId, adminInfo.Org.Id)
 							warehouseOutInfo.Price = stockInInfo.Price
 							err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+
 							if err == nil {
-								details := &models.DrugAutomaticReduceDetail{
-									WarehouseOutId:          warehouseOutInfo.ID,
-									WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-									PatientId:               advice.PatientId,
-									Ctime:                   time.Now().Unix(),
-									Mtime:                   time.Now().Unix(),
-									Status:                  1,
-									RecordTime:              record_time,
-									OrgId:                   adminInfo.Org.Id,
-									DrugId:                  advice.DrugId,
-									Count:                   count,
-								}
-								service.AddSigleDrugAutoReduceRecordInfo(details)
+								service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
+								//details := &models.DrugAutomaticReduceDetail{
+								//	WarehouseOutId:          warehouseOutInfo.ID,
+								//	WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+								//	PatientId:               advice.PatientId,
+								//	Ctime:                   time.Now().Unix(),
+								//	Mtime:                   time.Now().Unix(),
+								//	Status:                  1,
+								//	RecordTime:              record_time,
+								//	OrgId:                   adminInfo.Org.Id,
+								//	DrugId:                  advice.DrugId,
+								//	Count:                   count,
+								//}
+								//service.AddSigleDrugAutoReduceRecordInfo(details)
 							}
 						}
 					}
 
 				} else if err == nil {
-					outInfo, err := service.FindDrugStockOutInfoByTypeId(adminInfo.Org.Id, advice.DrugId, out.ID, out.WarehouseOutOrderNumber)
+					_, err := service.FindDrugStockOutInfoByTypeId(adminInfo.Org.Id, advice.DrugId, out.ID, out.WarehouseOutOrderNumber)
 					if err == gorm.ErrRecordNotFound {
 						warehouseOutInfo := &models.DrugWarehouseOutInfo{
 							WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
@@ -1189,42 +1192,44 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						warehouseOutInfo.Count = count
 						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 						if err == nil {
-							details := &models.DrugAutomaticReduceDetail{
-								WarehouseOutId:          warehouseOutInfo.ID,
-								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-								PatientId:               advice.PatientId,
-								Ctime:                   time.Now().Unix(),
-								Mtime:                   time.Now().Unix(),
-								Status:                  1,
-								RecordTime:              record_time,
-								OrgId:                   adminInfo.Org.Id,
-								DrugId:                  advice.DrugId,
-								Count:                   count,
-							}
-							service.AddSigleDrugAutoReduceRecordInfo(details)
+							service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
+							//details := &models.DrugAutomaticReduceDetail{
+							//	WarehouseOutId:          warehouseOutInfo.ID,
+							//	WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+							//	PatientId:               advice.PatientId,
+							//	Ctime:                   time.Now().Unix(),
+							//	Mtime:                   time.Now().Unix(),
+							//	Status:                  1,
+							//	RecordTime:              record_time,
+							//	OrgId:                   adminInfo.Org.Id,
+							//	DrugId:                  advice.DrugId,
+							//	Count:                   count,
+							//}
+							//service.AddSigleDrugAutoReduceRecordInfo(details)
 						}
 
 					} else if err == nil { //记录存在，则将增加数量
-						if outInfo.ID > 0 {
-							prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-							service.UpdateDrugStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, count)
-						}
-						prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						details := &models.DrugAutomaticReduceDetail{
-							WarehouseOutId:          outInfo.ID,
-							WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-							PatientId:               advice.PatientId,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   time.Now().Unix(),
-							Status:                  1,
-							RecordTime:              record_time,
-							OrgId:                   adminInfo.Org.Id,
-							DrugId:                  advice.DrugId,
-							Count:                   count,
-						}
-						service.AddSigleDrugAutoReduceRecordInfo(details)
+						service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
+						//if outInfo.ID > 0 {
+						//	prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+						//	service.UpdateDrugStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, count)
+						//}
+						//prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						//count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+						//details := &models.DrugAutomaticReduceDetail{
+						//	WarehouseOutId:          outInfo.ID,
+						//	WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+						//	PatientId:               advice.PatientId,
+						//	Ctime:                   time.Now().Unix(),
+						//	Mtime:                   time.Now().Unix(),
+						//	Status:                  1,
+						//	RecordTime:              record_time,
+						//	OrgId:                   adminInfo.Org.Id,
+						//	DrugId:                  advice.DrugId,
+						//	Count:                   count,
+						//}
+						//service.AddSigleDrugAutoReduceRecordInfo(details)
 					}
 				}
 			}

controllers/patient_api_controller.go

@@ -6,7 +6,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
-	"github.com/jinzhu/gorm"
+	//"github.com/jinzhu/gorm"
 	"math"
 	"math/rand"
 	"reflect"
@@ -858,6 +858,9 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 		DialysisDialyszers:         solution.DialysisDialyszers,
 		PlasmaSeparator:            solution.PlasmaSeparator,
 		BilirubinAdsorptionColumn:  solution.BilirubinAdsorptionColumn,
+		OxygenUptake:               solution.OxygenUptake,
+		OxygenFlow:                 solution.OxygenFlow,
+		OxygenTime:                 solution.OxygenTime,
 	}
 	service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	if err != nil {
@@ -1648,12 +1651,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
-		fmt.Println("", drugStockConfig.IsOpen)
+		fmt.Println("9999999999999999999999999", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
 			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
-
+				fmt.Println("imte00000000000000", item.PrescribingNumber)
 				//调用药品出库接口
 				service.DrugsDelivery(item.UserOrgId, item)
 
@@ -1978,188 +1981,191 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			//查询已经执行的医嘱
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
-				out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
-				if err == gorm.ErrRecordNotFound {
-					//没有记录，则创建出库单
-					timeStr := time.Now().Format("2006-01-02")
-					timeArr := strings.Split(timeStr, "-")
-					total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
-					total = total + 1
-					warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-					number = number + total
-					warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-					creater := adminUserInfo.AdminUser.Id
-					warehouseOut := models.DrugWarehouseOut{
-						WarehouseOutOrderNumber: warehousing_out_order,
-						OperationTime:           time.Now().Unix(),
-						OrgId:                   adminUserInfo.CurrentOrgId,
-						Creater:                 creater,
-						Ctime:                   time.Now().Unix(),
-						Status:                  1,
-						WarehouseOutTime:        item.RecordDate,
-						Dealer:                  0,
-						Manufacturer:            0,
-						Type:                    1,
-						IsSys:                   1,
-					}
-
-					err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-					if err != nil {
-						utils.TraceLog("创建出库单失败 err = %v", err)
-					} else {
-						if item.PrescribingNumber > 0 {
-							warehouseOutInfo := &models.DrugWarehouseOutInfo{
-								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-								WarehouseOutId:          warehouseOut.ID,
-								Status:                  1,
-								Ctime:                   time.Now().Unix(),
-								Remark:                  "",
-								OrgId:                   adminUserInfo.CurrentOrgId,
-								Type:                    1,
-								Manufacturer:            0,
-								Dealer:                  0,
-								IsSys:                   1,
-								SysRecordTime:           item.RecordDate,
-								DrugId:                  item.DrugId,
-							}
-							prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-							warehouseOutInfo.Count = count
-							stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-							warehouseOutInfo.Price = stockInInfo.Price
-							err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-							if err == nil {
-								details := &models.DrugAutomaticReduceDetail{
-									WarehouseOutId:          warehouseOutInfo.ID,
-									WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-									PatientId:               item.PatientId,
-									Ctime:                   time.Now().Unix(),
-									Mtime:                   time.Now().Unix(),
-									Status:                  1,
-									RecordTime:              item.RecordDate,
-									OrgId:                   adminUserInfo.CurrentOrgId,
-									DrugId:                  item.DrugId,
-									Count:                   count,
-								}
-								service.AddSigleDrugAutoReduceRecordInfo(details)
-								if err != nil {
-									utils.TraceLog("创建出库单失败 err = %v", err)
-								} else {
-									if item.PrescribingNumber > 0 {
-										warehouseOutInfo := &models.DrugWarehouseOutInfo{
-											WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-											WarehouseOutId:          warehouseOut.ID,
-											Status:                  1,
-											Ctime:                   time.Now().Unix(),
-											Remark:                  "",
-											OrgId:                   adminUserInfo.CurrentOrgId,
-											Type:                    1,
-											Manufacturer:            0,
-											Dealer:                  0,
-											IsSys:                   1,
-											SysRecordTime:           item.RecordDate,
-											DrugId:                  item.DrugId,
-										}
-										prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-										count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-										warehouseOutInfo.Count = count
-										stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-										warehouseOutInfo.Price = stockInInfo.Price
-										err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-										if err == nil {
-											details := &models.DrugAutomaticReduceDetail{
-												WarehouseOutId:          warehouseOutInfo.ID,
-												WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-												PatientId:               item.PatientId,
-												Ctime:                   time.Now().Unix(),
-												Mtime:                   time.Now().Unix(),
-												Status:                  1,
-												RecordTime:              item.RecordDate,
-												OrgId:                   adminUserInfo.CurrentOrgId,
-												DrugId:                  item.DrugId,
-												Count:                   count,
-											}
-											service.AddSigleDrugAutoReduceRecordInfo(details)
-										}
-									}
-								}
-
-							}
-						}
-					}
-				} else if err == nil {
-					outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-					if err == gorm.ErrRecordNotFound {
-						warehouseOutInfo := &models.DrugWarehouseOutInfo{
-							WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-							WarehouseOutId:          out.ID,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Remark:                  "",
-							OrgId:                   adminUserInfo.CurrentOrgId,
-							Type:                    1,
-							Manufacturer:            0,
-							Dealer:                  0,
-							IsSys:                   1,
-							SysRecordTime:           item.RecordDate,
-						}
-
-						stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-						warehouseOutInfo.Price = stockInInfo.Price
-						warehouseOutInfo.DrugId = item.DrugId
-						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						warehouseOutInfo.Count = count
-						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-						if err == nil {
-							details := &models.DrugAutomaticReduceDetail{
-								WarehouseOutId:          warehouseOutInfo.ID,
-								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-								PatientId:               item.PatientId,
-								Ctime:                   time.Now().Unix(),
-								Mtime:                   time.Now().Unix(),
-								Status:                  1,
-								RecordTime:              item.RecordDate,
-								OrgId:                   adminUserInfo.CurrentOrgId,
-								DrugId:                  item.DrugId,
-								Count:                   count,
-							}
-							service.AddSigleDrugAutoReduceRecordInfo(details)
-						}
-
-					} else if err == nil { //记录存在，则将增加数量
-						if outInfo.ID > 0 {
-							prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-							service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
-						}
 
-						count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
-						if count == 0 {
-							prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-							details := &models.DrugAutomaticReduceDetail{
-								WarehouseOutId:          outInfo.ID,
-								WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-								PatientId:               item.PatientId,
-								Ctime:                   time.Now().Unix(),
-								Mtime:                   time.Now().Unix(),
-								Status:                  1,
-								RecordTime:              item.RecordDate,
-								OrgId:                   adminUserInfo.CurrentOrgId,
-								DrugId:                  item.DrugId,
-								Count:                   count,
-							}
-							service.AddSigleDrugAutoReduceRecordInfo(details)
-						} else if count == 1 {
-							prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-							service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
-						}
-
-					}
-				}
+				service.HisDrugsDelivery(item.UserOrgId, item)
+
+				//out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
+				//if err == gorm.ErrRecordNotFound {
+				//	//没有记录，则创建出库单
+				//	timeStr := time.Now().Format("2006-01-02")
+				//	timeArr := strings.Split(timeStr, "-")
+				//	total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
+				//	total = total + 1
+				//	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+				//	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+				//	number = number + total
+				//	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+				//	creater := adminUserInfo.AdminUser.Id
+				//	warehouseOut := models.DrugWarehouseOut{
+				//		WarehouseOutOrderNumber: warehousing_out_order,
+				//		OperationTime:           time.Now().Unix(),
+				//		OrgId:                   adminUserInfo.CurrentOrgId,
+				//		Creater:                 creater,
+				//		Ctime:                   time.Now().Unix(),
+				//		Status:                  1,
+				//		WarehouseOutTime:        item.RecordDate,
+				//		Dealer:                  0,
+				//		Manufacturer:            0,
+				//		Type:                    1,
+				//		IsSys:                   1,
+				//	}
+				//
+				//	err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+				//	if err != nil {
+				//		utils.TraceLog("创建出库单失败 err = %v", err)
+				//	} else {
+				//		if item.PrescribingNumber > 0 {
+				//			warehouseOutInfo := &models.DrugWarehouseOutInfo{
+				//				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				//				WarehouseOutId:          warehouseOut.ID,
+				//				Status:                  1,
+				//				Ctime:                   time.Now().Unix(),
+				//				Remark:                  "",
+				//				OrgId:                   adminUserInfo.CurrentOrgId,
+				//				Type:                    1,
+				//				Manufacturer:            0,
+				//				Dealer:                  0,
+				//				IsSys:                   1,
+				//				SysRecordTime:           item.RecordDate,
+				//				DrugId:                  item.DrugId,
+				//			}
+				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				//			warehouseOutInfo.Count = count
+				//			stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+				//			warehouseOutInfo.Price = stockInInfo.Price
+				//			err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+				//			if err == nil {
+				//				details := &models.DrugAutomaticReduceDetail{
+				//					WarehouseOutId:          warehouseOutInfo.ID,
+				//					WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+				//					PatientId:               item.PatientId,
+				//					Ctime:                   time.Now().Unix(),
+				//					Mtime:                   time.Now().Unix(),
+				//					Status:                  1,
+				//					RecordTime:              item.RecordDate,
+				//					OrgId:                   adminUserInfo.CurrentOrgId,
+				//					DrugId:                  item.DrugId,
+				//					Count:                   count,
+				//				}
+				//				service.AddSigleDrugAutoReduceRecordInfo(details)
+				//				if err != nil {
+				//					utils.TraceLog("创建出库单失败 err = %v", err)
+				//				} else {
+				//					if item.PrescribingNumber > 0 {
+				//						warehouseOutInfo := &models.DrugWarehouseOutInfo{
+				//							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				//							WarehouseOutId:          warehouseOut.ID,
+				//							Status:                  1,
+				//							Ctime:                   time.Now().Unix(),
+				//							Remark:                  "",
+				//							OrgId:                   adminUserInfo.CurrentOrgId,
+				//							Type:                    1,
+				//							Manufacturer:            0,
+				//							Dealer:                  0,
+				//							IsSys:                   1,
+				//							SysRecordTime:           item.RecordDate,
+				//							DrugId:                  item.DrugId,
+				//						}
+				//						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				//						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				//						warehouseOutInfo.Count = count
+				//						stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+				//						warehouseOutInfo.Price = stockInInfo.Price
+				//						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+				//						if err == nil {
+				//							details := &models.DrugAutomaticReduceDetail{
+				//								WarehouseOutId:          warehouseOutInfo.ID,
+				//								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+				//								PatientId:               item.PatientId,
+				//								Ctime:                   time.Now().Unix(),
+				//								Mtime:                   time.Now().Unix(),
+				//								Status:                  1,
+				//								RecordTime:              item.RecordDate,
+				//								OrgId:                   adminUserInfo.CurrentOrgId,
+				//								DrugId:                  item.DrugId,
+				//								Count:                   count,
+				//							}
+				//							service.AddSigleDrugAutoReduceRecordInfo(details)
+				//						}
+				//					}
+				//				}
+				//
+				//			}
+				//		}
+				//	}
+				//} else if err == nil {
+				//	outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+				//	if err == gorm.ErrRecordNotFound {
+				//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+				//			WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+				//			WarehouseOutId:          out.ID,
+				//			Status:                  1,
+				//			Ctime:                   time.Now().Unix(),
+				//			Remark:                  "",
+				//			OrgId:                   adminUserInfo.CurrentOrgId,
+				//			Type:                    1,
+				//			Manufacturer:            0,
+				//			Dealer:                  0,
+				//			IsSys:                   1,
+				//			SysRecordTime:           item.RecordDate,
+				//		}
+				//
+				//		stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+				//		warehouseOutInfo.Price = stockInInfo.Price
+				//		warehouseOutInfo.DrugId = item.DrugId
+				//		prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				//		count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				//		warehouseOutInfo.Count = count
+				//		err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+				//		if err == nil {
+				//			details := &models.DrugAutomaticReduceDetail{
+				//				WarehouseOutId:          warehouseOutInfo.ID,
+				//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+				//				PatientId:               item.PatientId,
+				//				Ctime:                   time.Now().Unix(),
+				//				Mtime:                   time.Now().Unix(),
+				//				Status:                  1,
+				//				RecordTime:              item.RecordDate,
+				//				OrgId:                   adminUserInfo.CurrentOrgId,
+				//				DrugId:                  item.DrugId,
+				//				Count:                   count,
+				//			}
+				//			service.AddSigleDrugAutoReduceRecordInfo(details)
+				//		}
+				//
+				//	} else if err == nil { //记录存在，则将增加数量
+				//		if outInfo.ID > 0 {
+				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				//			service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
+				//		}
+				//
+				//		count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
+				//		if count == 0 {
+				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				//			details := &models.DrugAutomaticReduceDetail{
+				//				WarehouseOutId:          outInfo.ID,
+				//				WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+				//				PatientId:               item.PatientId,
+				//				Ctime:                   time.Now().Unix(),
+				//				Mtime:                   time.Now().Unix(),
+				//				Status:                  1,
+				//				RecordTime:              item.RecordDate,
+				//				OrgId:                   adminUserInfo.CurrentOrgId,
+				//				DrugId:                  item.DrugId,
+				//				Count:                   count,
+				//			}
+				//			service.AddSigleDrugAutoReduceRecordInfo(details)
+				//		} else if count == 1 {
+				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+				//			service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
+				//		}
+				//
+				//	}
+				//}
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -3423,6 +3429,20 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		solution.BilirubinAdsorptionColumn = bilirubinAdsorptionColumn
 	}
 
+	if dataBody["oxygen_uptake"] != nil && reflect.TypeOf(dataBody["oxygen_uptake"]).String() == "float64" {
+		oxygen_uptake := int64(dataBody["oxygen_uptake"].(float64))
+		solution.OxygenUptake = oxygen_uptake
+	}
+
+	if dataBody["oxygen_flow"] != nil && reflect.TypeOf(dataBody["oxygen_flow"]).String() == "string" {
+		oxygen_flow := dataBody["oxygen_flow"].(string)
+		solution.OxygenFlow = oxygen_flow
+	}
+
+	if dataBody["oxygen_time"] != nil && reflect.TypeOf(dataBody["oxygen_time"]).String() == "string" {
+		oxygen_time := dataBody["oxygen_time"].(string)
+		solution.OxygenTime = oxygen_time
+	}
 	return
 }
 

controllers/stock_in_api_controller.go

@@ -76,6 +76,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/initializtion", &StockManagerApiController{}, "Get:GetInitializtion")
 
 	beego.Router("/api/good/getwarehouseorderinfolist", &StockManagerApiController{}, "Get:GetWarehouseOrderInfolist")
+
+	beego.Router("/api/good/postsearchgoodlist", &StockManagerApiController{}, "Get:PostSearchGoodList")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -2607,12 +2609,13 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.DrugName = drug_name
 
-		if goodNameM["unval"] == nil || reflect.TypeOf(goodNameM["unval"]).String() != "string" {
-			utils.ErrorLog("unval")
+		if goodNameM["min_number"] == nil || reflect.TypeOf(goodNameM["min_number"]).String() != "string" {
+			utils.ErrorLog("min_number")
 			return
 		}
 
-		unval, _ := goodNameM["unval"].(string)
+		min_number, _ := goodNameM["min_number"].(string)
+		minNumber, _ := strconv.ParseInt(min_number, 10, 64)
 		if len(drug_name) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
@@ -2627,7 +2630,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.Unval = unval
+		drug.MinNumber = minNumber
 
 		min_unit := goodNameM["min_unit"].(string)
 		if len(min_unit) == 0 { //名字为空则生成一条导入错误日志
@@ -2646,8 +2649,8 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.MinUnit = min_unit
 
-		dosage, _ := goodNameM["dosage"].(string)
-		if len(dosage) == 0 { //名字为空则生成一条导入错误日志
+		dose := goodNameM["dose"].(float64)
+		if dose < 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -2661,7 +2664,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.Dosage = dosage
+		drug.Dose = dose
 
 		max_unit_id := goodNameM["max_unit"].(string)
 		if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
@@ -2680,8 +2683,8 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.MaxUnit = max_unit_id
 
-		packing_unit := goodNameM["packing_unit"].(string)
-		if len(packing_unit) == 0 { //名字为空则生成一条导入错误日志
+		max_unit := goodNameM["max_unit"].(string)
+		if len(max_unit) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -2695,7 +2698,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.PackingUnit = packing_unit
+		drug.MaxUnit = max_unit
 
 		delivery_way := goodNameM["delivery_way"].(string)
 		if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
@@ -3463,17 +3466,14 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				DrugDose:                    item.DrugDose,
 				DrugDoseUnit:                item.DrugDoseUnit,
 				LmtUsedFlag:                 item.LmtUsedFlag,
-				Dosage:                      item.Dosage,
-				Unval:                       item.Unval,
-				PackingUnit:                 item.PackingUnit,
-				PackingPrice:                item.PackingPrice,
 				DrugDay:                     item.DrugDay,
 				DeliveryWay:                 item.DeliveryWay,
 				ExecutionFrequency:          item.ExecutionFrequency,
+				DoseUnit:                    item.DoseUnit,
 			}
 
 			//查询同种药品同种规格是否存在
-			_, drugerror := service.IsExistDrugByNameOne(item.DrugName, item.Dosage, item.MaxUnit, item.Unval, item.MinUnit, item.PackingUnit, orgId)
+			_, drugerror := service.IsExistDrugByNameOne(item.DrugName, item.Dose, item.MaxUnit, item.MinNumber, item.MinUnit, item.MaxUnit, orgId)
 
 			if drugerror == gorm.ErrRecordNotFound {
 				service.CreateDrugsInfomation(&goodInfo)
@@ -3593,3 +3593,16 @@ func (this *StockManagerApiController) GetWarehouseOrderInfolist() {
 		"list": list,
 	})
 }
+
+func (this *StockManagerApiController) PostSearchGoodList() {
+
+	keyword := this.GetString("keyword")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, _ := service.GetSearchGoodList(keyword, orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+	})
+}

models/dialysis.go

@@ -198,6 +198,38 @@ type DialysisSchedule struct {
 	//TreatmentMode   TreatmentMode   `gorm:"ForeignKey:ModeId"`
 }
 
+type DialysisScheduleOne 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"`
+
+	MonitorPatients MonitorPatients `gorm:"ForeignKey:PatientId" json:"patient"`
+	DeviceNumber    DeviceNumber    `gorm:"ForeignKey:BedId" json:"device_number"`
+	DeviceZone      DeviceZone      `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	TreatmentMode   TreatmentMode   `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
+
+	DialysisOrder            MonitorDialysisOrder    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	Prescription             DialysisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	AssessmentBeforeDislysis PredialysisEvaluation   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
+	MonitoringRecord         []MonitoringRecord      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+
+	//Patient         string          `gorm:"-" json:"patient" form:"patient"`
+	//SchedualPatient SchedualPatient `gorm:"ForeignKey:PatientId"`
+	//DeviceNumber    DeviceNumber    `gorm:"ForeignKey:BedId"`
+	//DeviceZone      DeviceZone      `gorm:"ForeignKey:PartitionId"`
+	//TreatmentMode   TreatmentMode   `gorm:"ForeignKey:ModeId"`
+}
+
 func (DialysisSchedule) TableName() string {
 	return "xt_schedule"
 }
@@ -987,6 +1019,7 @@ type DialysisBeforePrepare struct {
 	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	Status       int64  `gorm:"column:status" json:"status" form:"status"`
 	CommdityCode string `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	NewCount     int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
 }
 
 func (DialysisBeforePrepare) TableName() string {
@@ -994,11 +1027,20 @@ func (DialysisBeforePrepare) TableName() string {
 }
 
 type DialysisBeforePrepareGoods struct {
-	GoodId       int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	Count       int64  `gorm:"column:count" json:"count" form:"count"`
-	GoodTypeId   int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	TypeName   	 string  `gorm:"column:type_name" json:"type_name" form:"type_name"`
-	SpecificationName   string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count             int64  `gorm:"column:count" json:"count" form:"count"`
+	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+}
+
+type NewDialysisBeforePrepareGoods struct {
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count             int64  `gorm:"column:count" json:"count" form:"count"`
+	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
 }
 
 type QueueCallConfig struct {

models/drug.go

@@ -16,12 +16,11 @@ type BaseDrugLib struct {
 	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
 	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
 	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber					int64 	`gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                     	float64  `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit                    string  `gorm:"column:Dose_unit" json:"Dose_unit" form:"Dose_unit"`
-	MinPrice                    string  `gorm:"column:min_price" json:"min_price" form:"min_price"`
-
+	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
 	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
@@ -65,11 +64,8 @@ type BaseDrugLib struct {
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
-	Dosage       string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
-	Unval        string  `gorm:"column:unval" json:"unval" form:"unval"`
-	PackingUnit  string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	DrugDay      string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	DrugDay string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total   float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (BaseDrugLib) TableName() string {

models/good_models.go

@@ -71,6 +71,11 @@ type GoodInfo struct {
 	ProductionType              string    `gorm:"column:production_type" json:"production_type" form:"production_type"`
 	SpecialMedical              string    `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
 	IsMark                      int64     `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	MinNumber                   int64     `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string    `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64   `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string    `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string    `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 }
 
 func (GoodInfo) TableName() string {

models/new_monitor.go

@@ -20,7 +20,7 @@ type NewVMMonitorDialysisSchedule struct {
 	Prescription             VMDialysisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	AssessmentBeforeDislysis VMPredialysisEvaluation   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
 	AssessmentAfterDislysis  VMAssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
-	MonitoringRecord         []VMMonitoringRecord      `gorm:"ForeignKey:PatientId,MonitoringDate;AssociationForeignKey:PatientId,ScheduleDate" json:"monitoring_record"`
+	MonitoringRecord         []VMMonitoringRecord      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 
 func (NewVMMonitorDialysisSchedule) TableName() string {

models/patient_models.go

@@ -237,6 +237,9 @@ type DialysisPrescription struct {
 	ReplacementFlow            string        `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
 	PlasmaSeparator            string        `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
 	BilirubinAdsorptionColumn  string        `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
+	OxygenUptake               int64         `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
+	OxygenFlow                 string        `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
+	OxygenTime                 string        `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -342,6 +345,9 @@ type DialysisSolution struct {
 	Amylaceum                  string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
 	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
 	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
+	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
+	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
+	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
 }
 
 func (DialysisSolution) TableName() string {

models/self_drug_models.go

@@ -560,3 +560,39 @@ type XtOrderConfig struct {
 func (XtOrderConfig) TableName() string {
 	return "xt_order_config"
 }
+
+type StDrugWarehouseInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	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"`
+	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
+	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
+	DrugName         string  `json:"drug_name"`
+	DrugType         int64   `json:"drug_type"`
+	MaxUnit          string  `json:"max_unit"`
+	MinUnit          string  `json:"min_unit"`
+	MinNumber        int64   `json:"min_number"`
+	Dose             float64 `json:"dose"`
+	DoseUnit         string  `json:"dose_unit"`
+	LastPrice        string  `json:"last_price"`
+	PackingUnit      string  `json:"packing_unit"`
+	Dosage           int64   `json:"dosage"`
+}

models/service/dialysis_service.go

@@ -629,19 +629,19 @@ func GetLastAcceptsAssessment(patient int64, orgId int64) (error, models.Receive
 	return err, receiveTreatmentAsses
 }
 
-func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partitionType int64, page int64, limit int64) (schedule []*models.DialysisSchedule, err error, total int64) {
+func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partitionType int64, page int64, limit int64) (schedule []*models.DialysisScheduleOne, err error, total int64) {
 	db := readDb.
 		Model(&models.MonitorDialysisSchedule{}).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
-		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
+		Preload("TreatmentMode", "status = 1 ").
+		Preload("Prescription", "status = 1 AND user_org_id = ? and  record_date = ?", orgID, schedulDate).
+		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? and assessment_date = ?", orgID, schedulDate).
+		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? and assessment_date = ?", orgID).
 		Preload("MonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time asc")
+			return db.Where("status = 1 AND user_org_id = ? and monitoring_date = ?", orgID, schedulDate).Order("operate_time asc")
 		}).
-		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", "status = 1 AND user_org_id = ? and dialysis_date = ?", orgID, schedulDate).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
 	db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)
 	if schedulDate > 0 {

models/service/stock_service.go

@@ -1260,6 +1260,11 @@ func UpDateWarehouseInfoByStock(warehouseInfo *models.WarehousingInfo) (err erro
 	return
 }
 
+//func UpDateWarehouseInfoByStockDelete(id int64,count int64) (err error) {
+//  err = writeDb.Model(&models.WarehousingInfo{}).Where("id = ?",id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+//  return err
+//}
+
 func UpDateWarehouseStatus(id int64) (err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
@@ -1983,7 +1988,8 @@ func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
 }
 
 func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
-	err := writeDb.Create(&detail).Error
+
+	err := XTWriteDB().Create(&detail).Error
 	return err
 
 }

models/stock_models.go

@@ -80,7 +80,6 @@ type WarehousingInfo struct {
 	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date"`
 	WarehousingCount int64       `gorm:"column:warehousing_count" json:"warehousing_count"`
 	WarehousingUnit  string      `gorm:"column:warehousing_unit" json:"warehousing_unit"`
-	StockNumber   	 int64       `gorm:"column:stock_number" json:"stock_number"`
 	Price            float64     `gorm:"column:price" json:"price"`
 	TotalPrice       float64     `gorm:"column:total_price" json:"total_price"`
 	Dealer           int64       `gorm:"column:dealer" json:"dealer"`
@@ -91,6 +90,7 @@ type WarehousingInfo struct {
 	Status           int64       `gorm:"column:status" json:"status"`
 	OrgId            int64       `gorm:"column:org_id" json:"org_id"`
 	IsReturn         int64       `gorm:"column:is_return" json:"is_return"`
+	StockCount       int64       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	Warehousing      Warehousing `ForeignKey:WarehousingId json:"warehouse"`
 	WarehousingOrder string      `gorm:"column:warehousing_order" json:"warehousing_order"`
 	GoodInfo         GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
@@ -151,7 +151,7 @@ type WarehouseOutInfo struct {
 	Manufacturer            int64        `gorm:"column:manufacturer" json:"manufacturer"`
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
 	SysRecordTime           int64        `gorm:"column:sys_record_time" json:"sys_record_time"`
-	PatientId				int64 		 `gorm:"column:patient_id" json:"patient_id"`
+	PatientId               int64        `gorm:"column:patient_id" json:"patient_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {

service/gobal_config_service.go

@@ -479,3 +479,86 @@ func GetDrugWarehuseOrderInfo(orgid int64) (drug []*models.DrugWarehouseInfo, er
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Group("drug_id").Find(&drug).Error
 	return drug, err
 }
+
+func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int64, startime int64, endtime int64, orgid int64) (list []*models.StDrugWarehouseInfo, total int64, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	if len(keyword) > 0 {
+		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_name like ?", orgid, likeKey)
+	} else {
+		db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ?", orgid)
+	}
+	if drugcategory > 0 {
+		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_category = ?", orgid, drugcategory)
+	} else {
+		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_category = ?", orgid, drugcategory)
+	}
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.packing_unit,t.dosage,t.manufacturer").Offset(offset).Count(&total).Group("x.drug_id").Order("x.ctime desc").Scan(&list).Error
+	return list, total, err
+}
+
+func GetDrugStockFlow(drugid int64, startime int64, endtime int64, page int64, limit int64, orgid int64) (list []*models.StDrugWarehouseInfo, total int64, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	offset := (page - 1) * limit
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	if drugid > 0 {
+		db = db.Where("x.drug_id = ?", drugid)
+	}
+
+	err = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status = 1 and t.org_id = ?", orgid).Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.packing_unit,t.dosage,t.manufacturer").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
+	return list, total, err
+}
+
+func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64, limit int64, orgid int64, stocktype int64) (list []*models.XtDrugWarehouseOutInfo, total int64, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	offset := (page - 1) * limit
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	if drugid > 0 {
+		db = db.Where("x.drug_id = ?", drugid)
+	}
+	if stocktype == 1 {
+		db = db.Where("x.is_sys = 0")
+	}
+	if stocktype == 2 {
+		db = db.Where("x,is_sys = 1")
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
+	return list, total, err
+}

service/manage_center_service.go

@@ -159,7 +159,7 @@ func FindBaseDrugLibRecordCount(lib *models.BaseDrugLib) (count int64) {
 }
 
 func FindBaseDrugLibRecordCountOne(lib *models.BaseDrugLib) (count int64) {
-	readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_name = ? and dosage = ? and max_unit = ? and unval = ? and min_unit = ? and packing_unit = ? and manufacturer = ? and status = 1", lib.OrgId, lib.DrugName, lib.Dosage, lib.MaxUnit, lib.Unval, lib.MinUnit, lib.PackingUnit, lib.Manufacturer).Count(&count)
+	readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_name = ? and dose = ? and dose_unit = ? and min_number = ? and min_unit = ? and max_unit = ? and manufacturer = ? and status = 1", lib.OrgId, lib.DrugName, lib.Dose, lib.DoseUnit, lib.MinNumber, lib.MinUnit, lib.MaxUnit, lib.Manufacturer).Count(&count)
 	return
 }
 

service/patient_service.go

@@ -1491,7 +1491,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime}).Error
 	return err
 }
 

service/stock_service.go

@@ -241,6 +241,11 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"social_security_directory_code": goodInfo.SocialSecurityDirectoryCode,
 		"special_medical":                goodInfo.SpecialMedical,
 		"production_type":                goodInfo.ProductionType,
+		"min_number":                     goodInfo.MinNumber,
+		"packing_unit":                   goodInfo.PackingUnit,
+		"packing_price":                  goodInfo.PackingPrice,
+		"default_count_unit":             goodInfo.DefaultCountUnit,
+		"min_unit":                       goodInfo.MinUnit,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
@@ -412,11 +417,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) 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) 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)
@@ -436,7 +441,7 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 				insertData = append(insertData, info.Type)
 				insertData = append(insertData, info.RetailPrice)
 				insertData = append(insertData, info.RetailTotalPrice)
-
+				insertData = append(insertData, info.StockMaxNumber)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -453,11 +458,13 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 
 func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_order = ? AND status = 1", order).Last(&info).Error
+
 	return info, 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", order).Order("ctime").First(&info).Error
+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
 }
 
@@ -469,7 +476,7 @@ func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouse
 }
 
 // 出库时先进先出，找出最先入库的批次
-func  (drug_id int64) (info models.WarehousingInfo, err error) {
+func FindLastWarehousingInfoByID(drug_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
 	return info, err
 }
@@ -570,10 +577,9 @@ type Drug struct {
 	Mtime           int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	Dosage          string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
-	Unval           string  `gorm:"column:unval" json:"unval" form:"unval"`
-	PackingUnit     string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice    float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	Dose            float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	MinNumber       int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	DoseUnit        string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	DrugDay         string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MaxUnit         string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinUnit         string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
@@ -1613,7 +1619,13 @@ func UpDateWarehouseOutStatus(id int64) (err error) {
 }
 
 func UpDateDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo) (err error) {
-	err = writeDb.Save(&info).Error
+	ut := writeDb.Begin()
+	err = ut.Save(&info).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
 	return err
 }
 
@@ -1622,11 +1634,6 @@ func UpDateWarehouseInfoByStock(info *models.WarehousingInfo) (err error) {
 	return err
 }
 
-func UpDateWarehouseInfoByStockDelete(id int64,count int64) (err error) {
-	err = DB.Model(&models.WarehousingInfo{}).Where("id = ?",info.ID).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
-	return err
-}
-
 func UpDateDrugWarehouseOutStatus(id int64) (err error) {
 	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
@@ -2059,16 +2066,45 @@ func FindLastDrugStockInInfoRecord(drug_id int64, org_id int64) (in models.DrugW
 
 }
 
+func GetStockInRecoredByGoodId(goodid int64, goodtypeid int64, recordtime int64, patientid int64, orgid int64) (*models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+
+	err := XTReadDB().Model(&info).Where("good_id = ? and good_type_id = ? and sys_record_time = ? and patient_id = ? and org_id = ? and status = 1", goodid, goodtypeid, recordtime, patientid, orgid).Find(&info).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+func UpdateAutoMaticReduceDetail(goodid int64, goodtypeid int64, recordtime int64, patientid int64, orgid int64, prepare *models.WarehouseOutInfo) error {
+
+	err := XTWriteDB().Model(&prepare).Where("good_id = ? and good_type_id = ? and sys_record_time = ? and patient_id = ? and org_id = ? and status =1", goodid, goodtypeid, recordtime, patientid, orgid).Updates(map[string]interface{}{"count": prepare.Count}).Error
+	return err
+}
+
 func AddSigleWarehouseOutInfo(info *models.WarehouseOutInfo) error {
+
 	err := writeDb.Create(&info).Error
 	return err
 
 }
 
 func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
-	err := writeDb.Create(&info).Error
+	ut := writeDb.Begin()
+	err := ut.Create(&info).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
 	return err
-
 }
 
 func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
@@ -2088,7 +2124,7 @@ func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, o
 	return
 }
 
-func FindStockOutInfoByStock(org_id int64, good_type_id int64, good_id int64, record_date int64,patient_id int64) (out []*models.WarehouseOutInfo, err error) {
+func FindStockOutInfoByStock(org_id int64, good_type_id int64, good_id int64, record_date int64, patient_id int64) (out []*models.WarehouseOutInfo, err error) {
 	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND sys_record_time = ? AND patient_id = ?", org_id, good_type_id, good_id, record_date, patient_id).Order("ctime desc").Find(&out).Error
 	return
 }
@@ -2345,7 +2381,7 @@ func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.B
 	return &drug, nil
 }
 
-func IsExistDrugByNameOne(drugname string, dosage string, maxunit string, unival string, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
+func IsExistDrugByNameOne(drugname string, dosage float64, maxunit string, unival int64, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
 	var drug models.BaseDrugLib
 	var err error
 	err = XTReadDB().Model(&drug).Where("drug_name = ? and dosage = ?  and max_unit = ? and unval = ? and min_unit=? and packing_unit = ? and status =1 and org_id = ?", drugname, dosage, maxunit, unival, minunit, packtunit, orgid).Find(&drug).Error
@@ -2365,7 +2401,7 @@ func CreateDrugsInfomation(info *models.BaseDrugLib) error {
 
 func UpdateDrugsInformation(drug *models.BaseDrugLib, drugName string, drugSpec string, orgid int64) error {
 
-	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag, "delivery_way": drug.DeliveryWay, "execution_frequency": drug.ExecutionFrequency, "dosage": drug.Dosage, "unval": drug.Unval, "packing_unit": drug.PackingUnit, "packing_price": drug.PackingPrice, "drug_day": drug.DrugDay}).Error
+	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag, "delivery_way": drug.DeliveryWay, "execution_frequency": drug.ExecutionFrequency, "drug_day": drug.DrugDay}).Error
 	return err
 }
 
@@ -2582,3 +2618,61 @@ func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib
 	}
 	return
 }
+
+func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, err error) {
+
+	db := XTReadDB().Model(&good).Where("org_id =? and status = 1", orgid)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(good_name Like ?)", likekey).Find(&good).Error
+	} else {
+		err = db.Find(&good).Error
+	}
+	return
+}
+
+func CreateAutoReduceRecord(detail *models.BloodAutomaticReduceDetail) error {
+
+	err := writeDb.Create(&detail).Error
+	return err
+}
+
+func GetAutoMaticReduceDetail(orgid int64, patient_id int64, recordtime int64) (*models.BloodAutomaticReduceDetail, error) {
+
+	var autoreduece models.BloodAutomaticReduceDetail
+	var err error
+	err = XTReadDB().Model(&autoreduece).Where("org_id = ? and patient_id = ?  and status = 1 and record_time = ?", orgid, patient_id, recordtime).Find(&autoreduece).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &autoreduece, nil
+}
+
+func DeleteAutoRedeceDetailTwo(orgid int64, patient_id int64, recordtime int64) error {
+
+	detail := models.BloodAutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1", orgid, patient_id, recordtime).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpDateWarehouseInfoByStockDelete(id int64, count int64) (err error) {
+	err = writeDb.Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	return err
+}
+
+func GetAutoDialysisBefor(goodid int64, goodtypeid int64, patientid int64, orgid int64, recorddate int64) (*models.BloodAutomaticReduceDetail, error) {
+
+	var autoreduece models.BloodAutomaticReduceDetail
+	var err error
+	err = XTReadDB().Model(&autoreduece).Where("good_id = ? and good_type_id = ? and patient_id = ? and org_id = ?  and status = 1 and record_time = ?", goodid, goodtypeid, patientid, orgid, recorddate).Find(&autoreduece).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &autoreduece, nil
+}