历史排班

controllers/dialysis_api_controller.go

@@ -2564,13 +2564,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 {
 					dewater_amount = dewater_amount * 1000
 				}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1696,22 +1696,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				//fmt.Println("config+++++++++++", config.IsOpen)
 				//fmt.Println("config+++++++++++", item.UserOrgId)
 				//
-				if config.IsOpen == 1 && item.UserOrgId == 10402 {
-
-					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//更新字典里面的库存
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					var sum_count int64
-					for _, its := range stockInfo {
-						if its.MaxUnit == medical.MaxUnit {
-							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-						}
-						sum_count += its.StockMaxNumber + its.StockMinNumber
-					}
-					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					//剩余库存
-					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				}
+				//if config.IsOpen == 1 && item.UserOrgId == 10402 {
+				//
+				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				//	//更新字典里面的库存
+				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				//	var sum_count int64
+				//	for _, its := range stockInfo {
+				//		if its.MaxUnit == medical.MaxUnit {
+				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				//		}
+				//		sum_count += its.StockMaxNumber + its.StockMinNumber
+				//	}
+				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+				//	//剩余库存
+				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				//}
 
 			}
 		}

controllers/sign_api_controller.go

@@ -1232,17 +1232,17 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.ModifyPatient(item.PatientId, item.Count)
 	//}
 
-	list, _ := service.GetNewAllpatient(orgId)
+	//list, _ := service.GetNewAllpatient(orgId)
+	//
+	//for _, item := range list {
+	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
+	//}
 
+	list, _ := service.GetAllDialysisOrder(10490)
 	for _, item := range list {
-		service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
+		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
 	}
 
-	//list, _ := service.GetAllDialysisOrder(6963)
-	//for _, item := range list {
-	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
-	//}
-
 	//drugList, _ := service.GetAllBaseDrugList(10571)
 	//for _, item := range drugList {
 	//	//service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)

service/new_stock_service.go

@@ -66,13 +66,7 @@ func UpdateGoodInCount(count int64, user_org_id int64, good_id int64, storehouse
 
 func CreateGoodErrcode(errcode models.XtGoodErrcode) error {
 
-	db := writeDb.Begin()
-	err := db.Create(&errcode).Error
-	if err != nil {
-		db.Rollback()
-		return err
-	}
-	db.Commit()
+	err := writeDb.Create(&errcode).Error
 	return err
 }
 

service/new_warehouse_service.go

@@ -580,13 +580,9 @@ func FindNewWarehouseOutInfoByPatientIdTwo(patient_id int64, record_time int64,
 func UpdateDrugStockCount(drug_id int64, org_id int64, storehouse_id int64, flush_count int64) error {
 
 	drug := models.XtDrugStockCount{}
-	ut := XTWriteDB().Begin()
-	err := ut.Model(&drug).Where("drug_id = ? and user_org_id = ? and storehouse_id = ? and status = 1", drug_id, org_id, storehouse_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err := XTWriteDB().Model(&drug).Where("drug_id = ? and user_org_id = ? and storehouse_id = ? and status = 1", drug_id, org_id, storehouse_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+
 	return err
 }
 
@@ -3862,10 +3858,10 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
 
 		//更改字典里面的价格
-		if advice.UserOrgId == 10265 || advice.UserOrgId == 10215 {
-
-			UpdateNewBasePrice(lastWarehouse.DrugId, lastWarehouse.RetailPrice, tx)
-		}
+		//if advice.UserOrgId == 10265 || advice.UserOrgId == 10215 {
+		//
+		//	UpdateNewBasePrice(lastWarehouse.DrugId, lastWarehouse.RetailPrice, tx)
+		//}
 		//
 		////查询剩余库存
 		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
@@ -4147,6 +4143,7 @@ func NewBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehous
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			AdviceId:                advice.ID,
 		}
+
 		AddNewSigleDrugAutoReduceRecordInfo(details, tx)
 
 		return nil

service/sign_service.go

@@ -2112,14 +2112,14 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 
 func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", 6963).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1", 21767).Find(&list).Error
 
 	return list, err
 }
 
 func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id int64, bed_id int64, zone_id int64, shcedule_type int64) error {
 
-	err := XTWriteDB().Model(&models.XtSchedule{}).Where("schedule_date =? and user_org_id =? and status=1 and patient_id =?", schedule_date, user_org_id, patient_id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type}).Error
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("schedule_date =? and user_org_id =? and patient_id =?", schedule_date, user_org_id, patient_id).Updates(map[string]interface{}{"bed_id": bed_id, "partition_id": zone_id, "schedule_type": shcedule_type, "status": 1}).Error
 	return err
 }
 

service/stock_service.go

@@ -1391,10 +1391,13 @@ func FindAllDrugCancelStockTotal(org_id int64) (total int64, err error) {
 func FindNewAllDrugCancelStockTotal(org_id int64, tx *gorm.DB) (total int64, err error) {
 
 	err = tx.Model(&models.DrugCancelStock{}).Where("org_id = ?", org_id).Count(&total).Error
-	if err != nil {
-		tx.Rollback()
-		return total, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return total, err
+		}
 	}
+
 	return total, err
 }
 
@@ -8139,18 +8142,11 @@ func UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) er
 }
 
 func UpdateGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64, sum_in_count int64) error {
-	tx := XTWriteDB().Begin()
-	err := tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	tx.Commit()
+
+	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+
+	err = XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
+
 	return err
 }
 
@@ -8185,18 +8181,11 @@ func GetCancelWarehouseList(orgId int64, goodId int64, warehouseInfoId int64) (i
 }
 
 func CheckCancelStock(stock models.CancelStock, cancel_stock_id int64, orgid int64) error {
-	ut := writeDb.Begin()
-	err := ut.Model(&models.CancelStock{}).Where("id = ? and status = 1 and org_id = ?", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	err = ut.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? and status = 1 and org_id = ?", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err := XTWriteDB().Model(&models.CancelStock{}).Where("id = ? and status = 1 and org_id = ?", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+
+	err = XTWriteDB().Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? and status = 1 and org_id = ?", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+
 	return err
 }
 
@@ -8207,67 +8196,41 @@ func GetCancelStockInfoById(cancel_stock_id int64, orgid int64) (info []*models.
 }
 
 func UpdateCancelStockNumber(stock_count int64, warehouse_info_id int64, orgid int64) error {
-	ut := writeDb.Begin()
-	err := ut.Model(&models.WarehousingInfo{}).Where("id = ? and org_id = ? and status = 1", warehouse_info_id, orgid).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", stock_count)).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and org_id = ? and status = 1", warehouse_info_id, orgid).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", stock_count)).Error
+
 	return err
 }
 
 func UpdateGoodSumCount(sum_count int64, good_id int64, orgid int64) error {
-	ut := writeDb.Begin()
-	err := ut.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", good_id, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", sum_count)).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", good_id, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", sum_count)).Error
+
 	return err
 }
 
 func UpdateStockWarehouseInfo(cancel_stock_id int64, orgid int64, stock models.CancelStock) error {
-	ut := writeDb.Begin()
-	err := ut.Model(&models.CancelStock{}).Where("id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	err = ut.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err := XTWriteDB().Model(&models.CancelStock{}).Where("id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+
+	err = XTWriteDB().Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+
 	return err
 }
 
 func UpdateStockWarehouseInfoStockFlow(id int64, orgid int64, goodid int64) error {
-	ut := writeDb.Begin()
-	err = ut.Model(&models.VmStockFlow{}).Where("cancel_out_detail_id = ? and user_org_id = ? and status = 1 and good_id =?", id, orgid, goodid).Update(map[string]interface{}{"status": 0}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("cancel_out_detail_id = ? and user_org_id = ? and status = 1 and good_id =?", id, orgid, goodid).Update(map[string]interface{}{"status": 0}).Error
+
 	return err
 }
 
 func UpdateStockNumberWarehouseInfo(warehouse_info_id int64, good_id int64, org_id int64, stock_count int64) error {
-	ut := writeDb.Begin()
+
 	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and good_id = ? and org_id = ? and status = 1", warehouse_info_id, good_id, org_id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", stock_count)).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
+
 	err = XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and status = 1 and org_id = ?", good_id, org_id).UpdateColumn("sum_count", gorm.Expr("sum_count - ?", stock_count)).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
 	return err
 }
 
@@ -8311,18 +8274,10 @@ func GetNewDrugAllStockInfo(storehouse_id int64, orgid int64, drugid int64, tx *
 }
 
 func UpdateBaseDrugSumInfo(sum_count int64, drugid int64, orgid int64, sum_in_count int64) error {
-	ut := XTWriteDB().Begin()
-	err := ut.Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	err = ut.Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+
+	err = XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
 	return err
 }
 
@@ -8445,13 +8400,9 @@ func ModifyDrugFlowByCancelId(cancelstock_id int64, drugId int64, orgid int64) e
 }
 
 func ModifyDrugMaxNumberWarehouseInfo(id int64, count int64, orgid int64) error {
-	ut := XTWriteDB().Begin()
-	err := ut.Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and status = 1", id, orgid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and status = 1", id, orgid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+
 	return err
 
 }
@@ -8513,14 +8464,8 @@ func CreateGoodStockCount(stock models.XtGoodStockCount) error {
 
 func AddGoodSumInCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
 
-	ut := XTWriteDB().Begin()
+	err := XTWriteDB().Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count + ?", count)).Error
 
-	err := ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count + ?", count)).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
 	return err
 }
 
@@ -8538,14 +8483,9 @@ func ReduceGoodSumInCount(storehouse_id int64, good_id int64, user_org_id int64,
 }
 
 func UpdateGoodFlushCount(storehouse_id int64, good_id int64, user_org_id int64, flush_count int64) error {
-	ut := XTWriteDB().Begin()
 
-	err := ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+	err := XTWriteDB().Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+
 	return err
 }