耗材参数

controllers/drug_stock_api_contorller.go

@@ -197,13 +197,20 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 				}
 				batch_number, _ := items["batch_number"].(string)
 
-				if items["packing_unit"] == nil || reflect.TypeOf(items["packing_unit"]).String() != "string" {
-					utils.ErrorLog("packing_unit")
+				if items["max_unit"] == nil || reflect.TypeOf(items["max_unit"]).String() != "string" {
+					utils.ErrorLog("max_unit")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				packing_unit, _ := items["packing_unit"].(string)
-
+				max_unit, _ := items["max_unit"].(string)
+				fmt.Println("最大单位00000000000000000000000000000000", max_unit)
+				if items["min_unit"] == nil || reflect.TypeOf(items["min_unit"]).String() != "string" {
+					utils.ErrorLog("min_unit")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				min_unit, _ := items["min_unit"].(string)
+				fmt.Println("最下单位0090000000000000000000", min_unit)
 				var remark string
 				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 					remark = ""
@@ -232,7 +239,8 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					StockMaxNumber:   warehousing_count,
 					RetailTotalPrice: retail_price_total,
 					BatchNumber:      batch_number,
-					MaxUnit:          packing_unit,
+					MaxUnit:          max_unit,
+					MinUnit:          min_unit,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -611,6 +619,10 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				batch_number, _ := items["batch_number"].(string)
 
+				max_unit, _ := items["max_unit"].(string)
+
+				min_unit, _ := items["min_unit"].(string)
+
 				var remark string
 				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 					remark = ""
@@ -659,6 +671,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
 						BatchNumber:      batch_number,
+						MaxUnit:          max_unit,
+						MinUnit:          min_unit,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -684,6 +698,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
 						StockMaxNumber:   warehousing_count,
+						MaxUnit:          max_unit,
+						MinUnit:          min_unit,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 				}
@@ -1209,9 +1225,9 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				total := float64(count) * price
 				retail_price_total := float64(count) * last_price
 				remark := items["remark"].(string)
-				packing_unit := items["packing_unit"].(string)
+				max_unit := items["max_unit"].(string)
 
-				fmt.Println("包装单位999999999999", packing_unit)
+				fmt.Println("包装单位999999999999", max_unit)
 
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1229,7 +1245,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					Dealer:                  dealer_id,
 					RetailPrice:             last_price,
 					RetailTotalPrice:        retail_price_total,
-					CountUnit:               packing_unit,
+					CountUnit:               max_unit,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -989,7 +989,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 						//查询 该患者是否已出库
 						out, errcode := service.GetSelfOutStock(adminUserInfo.Org.Id, item.AdviceDate, item.PatientId, item.AdviceName, item.AdviceDesc)
-						fmt.Println("errcode ------------------22222", errcode)
+
 						if errcode == gorm.ErrRecordNotFound {
 							service.CreateOutStock(&outStock)
 						} else if errcode == nil {
@@ -1093,6 +1093,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		if err == nil {
 			//药品管理信息
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+			fmt.Println("drugstockconfig000000000000000000000000", drugStockConfig.IsOpen)
 			if drugStockConfig.IsOpen == 1 {
 				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
 				record_time := advice.RecordDate

controllers/patient_api_controller.go

@@ -1570,6 +1570,7 @@ func (c *PatientApiController) ExecGroupAdvice() {
 
 func (c *PatientApiController) ExecDoctorAdvice() {
 
+	fmt.Println("hhhhhhhhhhhhhhh9999999999")
 	origin, _ := c.GetInt64("origin", 0)
 
 	patient, _ := c.GetInt64("patient", 0)
@@ -2173,7 +2174,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
-
+		fmt.Println("000000000000000000000000000000000000", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)

service/stock_service.go

@@ -417,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,stock_max_number) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit) 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)
@@ -442,6 +442,8 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 				insertData = append(insertData, info.RetailPrice)
 				insertData = append(insertData, info.RetailTotalPrice)
 				insertData = append(insertData, info.StockMaxNumber)
+				insertData = append(insertData, info.MaxUnit)
+				insertData = append(insertData, info.MinUnit)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -1029,7 +1031,7 @@ func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime
 }
 
 func FindWarehouseOutInfoById(id int64) (list []*models.WarehouseOutInfo, err error) {
-	err = readDb.Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? AND status = 1 AND count <> 0 AND good_id <> 0", id).Order("good_type_id desc").Find(&list).Error
+	err = readDb.Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? AND status = 1 AND count <> 0 AND good_id <> 0", id).Preload("GoodInfo", "status = 1").Order("good_type_id desc").Find(&list).Error
 	return list, err
 }
 

service/warhouse_service.go

@@ -105,8 +105,11 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
 
 	if err != nil {
+		fmt.Println("9999998888888888888888888888888")
 
-		return err
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		return
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
@@ -265,10 +268,8 @@ func HisDrugsDelivery(orgID int64, advice *models.HisDoctorAdviceInfo) (err erro
 	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
 	isHasWay := false
 	record_time := int64(0)
-	if advice.Way == 1 {
-		isHasWay = true
-		record_time = advice.RecordDate
-	}
+	isHasWay = true
+	record_time = advice.RecordDate
 	if isHasWay {
 		//判断当天当前机构有没有创建出库单，没有则创建
 		out, err := FindDrugStockOutByIsSys(orgID, 1, record_time)
@@ -330,7 +331,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-
+	fmt.Println("单位99999999999999999999999999", advice.PrescribingNumberUnit)
+	fmt.Println("drup777777777777766666666", drup.MaxUnit)
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
 	} else {