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

controllers/drug_stock_api_contorller.go

@@ -1408,12 +1408,15 @@ func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 	warehouseOutList, total, err := service.FindAllDrugWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type, check_type)
 
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
+
+	patients, _ := service.GetAllpatient(adminUserInfo.CurrentOrgId)
 	fmt.Println(err)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":      warehouseOutList,
 			"total":     total,
 			"houseList": houseList,
+			"patients":  patients,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1670,6 +1673,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				admin_user_id := int64(items["admin_user_id"].(float64))
 
+				patient_id := int64(items["patient_id"].(float64))
+
 				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
 				//  utils.ErrorLog("last_price")
 				//  c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1708,6 +1713,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						PatientId:               patient_id,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1737,6 +1743,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						PatientId:               patient_id,
 					}
 
 					drugFlow = append(drugFlow, drugflow)
@@ -1785,6 +1792,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						PatientId:               patient_id,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 
@@ -1814,6 +1822,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						PatientId:               patient_id,
 					}
 
 					drugFlow = append(drugFlow, drugflow)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5399,6 +5399,11 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			advice.DrugNameId = drug_name_id
 		}
 
+		if adviceNameM["remark"] != nil && reflect.TypeOf(adviceNameM["remark"]).String() == "string" {
+			remark, _ := adviceNameM["remark"].(string)
+			advice.Remark = remark
+		}
+
 		if adviceNameM["groupno"] != nil || reflect.TypeOf(adviceNameM["groupno"]).String() == "float64" {
 			groupno := int64(adviceNameM["groupno"].(float64))
 			advice.GroupNo = groupno
@@ -5485,6 +5490,11 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 						advice.GroupNo = groupno
 					}
 
+					if childMap["remark"] != nil && reflect.TypeOf(childMap["remark"]).String() == "string" {
+						remark, _ := childMap["remark"].(string)
+						child.Remark = remark
+					}
+
 					child.DeliveryWay = advice.DeliveryWay
 					child.ExecutionFrequency = advice.ExecutionFrequency
 					advice.Children = append(advice.Children, &child)

controllers/stock_in_api_controller.go

@@ -157,6 +157,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getnewgoodwarehouseinfo", &StockManagerApiController{}, "Get:GetNewGoodWarehouseInfo")
 	beego.Router("/api/stock/getnewwarehouseoutinfolist", &StockManagerApiController{}, "Get:GetNewWarehouseOutInfoList")
 
+	beego.Router("/api/stock/getstockfloworderlist", &StockManagerApiController{}, "Get:GetStockFlowOrderList")
+
 }
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -1490,12 +1492,15 @@ func (c *StockManagerApiController) GetWarehouseOutList() {
 	}
 	warehouseOutList, total, err := service.FindAllWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type, check_type)
 	houselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
+	patients, _ := service.GetAllpatient(adminUserInfo.CurrentOrgId)
 	fmt.Println(err)
+
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":      warehouseOutList,
 			"total":     total,
 			"houselist": houselist,
+			"patients":  patients,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -7951,3 +7956,55 @@ func (this *StockManagerApiController) GetNewWarehouseOutInfoList() {
 		"storeHouseList":   storeHouseList,
 	})
 }
+
+func (this *StockManagerApiController) GetStockFlowOrderList() {
+
+	good_id, _ := this.GetInt64("good_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetStockFlowOrderList(good_id, orgId)
+	fmt.Println("listowowowow", list)
+	for index, _ := range list {
+		fmt.Println("index", index)
+		if list[index].ConsumableType == 3 || list[index].ConsumableType == 2 || list[index].ConsumableType == 11 || list[index].ConsumableType == 12 || list[index].ConsumableType == 15 {
+			var count int64
+			if index == 0 {
+				count = list[index].OverCount - list[index].Count
+				fmt.Println("id", list[index].ID)
+				fmt.Println("woowowow", list[index].OverCount)
+				fmt.Println("wowoowowowoww", list[index].Count)
+				service.UpdateOverCount(list[index+1].ID, count)
+			}
+
+			if index >= 1 {
+				count = list[index-1].OverCount - list[index].Count
+				fmt.Println("id", list[index].ID)
+				fmt.Println("over_count", list[index-1].OverCount)
+				fmt.Println("wowoowowowoww", list[index].Count)
+				service.UpdateOverCount(list[index].ID, count)
+			}
+
+		}
+		if list[index].ConsumableType == 7 || list[index].ConsumableType == 4 || list[index].ConsumableType == 1 || list[index].ConsumableType == 10 || list[index].ConsumableType == 13 {
+
+			if index == 0 {
+				var count int64
+				count = list[index].OverCount + list[index].Count
+				fmt.Println("id=", list[index].ID)
+				fmt.Println("over_count", list[index].OverCount)
+				fmt.Println("count", list[index].Count)
+				service.UpdateOverCount(list[index+1].ID, count)
+			}
+
+			if index >= 1 {
+				var count int64
+				count = list[index-1].OverCount + list[index].Count
+				fmt.Println("id=", list[index].ID)
+				fmt.Println("over_count", list[index-1].OverCount)
+				fmt.Println("count", list[index].Count)
+				service.UpdateOverCount(list[index].ID, count)
+			}
+
+		}
+
+	}
+}

service/secondary_service.go

@@ -1149,3 +1149,15 @@ func DeleteSecondOrderInfo(id int64) error {
 	err := XTWriteDB().Model(&models.XtSecondWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetStockFlowOrderList(good_id int64, user_org_id int64) (list []*models.VmStockFlow, err error) {
+
+	err = XTReadDB().Where("good_id = ? and user_org_id =? and ctime>=1704038400 and ctime<=1706716799 and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
+	return list, err
+}
+
+func UpdateOverCount(id int64, count int64) (err error) {
+
+	err = XTWriteDB().Model(models.VmStockFlow{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"over_count": count}).Error
+	return err
+}

service/stock_service.go

@@ -4304,7 +4304,7 @@ func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutI
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.supply_cancel_out_id,x.supply_warehouse_id,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.register_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.patient_id,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.supply_cancel_out_id,x.supply_warehouse_id,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.register_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -4334,7 +4334,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,x.remark,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,x.remark,x.patient_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 
 	return out, err
 }
@@ -7693,7 +7693,7 @@ func UpdateDrugWarehouseInfoTwenty(id int64, info *models.DrugWarehouseInfo) err
 
 func UpdatedDrugWarehouseInfo(info *models.DrugWarehouseOutInfo, id int64) error {
 
-	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount, "storehouse_id": info.StorehouseId, "patient_id": info.PatientId}).Error
 	return err
 }