9月2日

.idea/vcs.xml

@@ -7,5 +7,6 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/golang.org/x/sync" vcs="Git" />
   </component>
-</project>
+</project>

controllers/dialysis_api_controller.go

@@ -1289,6 +1289,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.MachineRun = data.MachineRun
 	assessment.AfterUrea = data.AfterUrea
 	assessment.PipCoagulation = data.PipCoagulation
+	assessment.AccumulatedBloodVolume = data.AccumulatedBloodVolume
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {

controllers/stock_in_api_controller.go

@@ -7021,7 +7021,6 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	//更改审核状态
 	err := service.UpdateCheckWarehouseInfo(warehousing_info_id)
 	if err == nil {
-
 		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
 		Creator := this.GetAdminUserInfo().AdminUser.Id
 		for _, item := range list {

models/dialysis.go

@@ -640,6 +640,7 @@ type AssessmentAfterDislysis struct {
 	MachineRun                      string  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
 	AfterUrea                       string  `gorm:"column:after_urea" json:"after_urea" form:"after_urea"`
 	PipCoagulation                  string  `gorm:"column:pip_coagulation" json:"pip_coagulation" form:"pip_coagulation"`
+	AccumulatedBloodVolume          string  `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

service/auto_create_week_schedules_service.go

@@ -142,7 +142,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 
 	now := time.Now()
 	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&week)
-	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", orgID, monday.Unix(), sunday.Unix()).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", orgID, monday.Unix(), sunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
 	//fmt.Println("disableErr323232332323232233222332232332",disableErr)
 	if disableErr != nil {
 		return disableErr

service/his_config_service.go

@@ -3,10 +3,11 @@ package service
 import (
 	"XT_New/enums"
 	"XT_New/models"
+	"XT_New/src/golang.org/x/sync/errgroup"
 	"XT_New/utils"
 	"fmt"
 	"github.com/astaxie/beego/config"
-	"golang.org/x/sync/errgroup"
+
 	"reflect"
 	"strconv"
 	"time"

service/mobile_dialysis_service.go

@@ -634,6 +634,7 @@ func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":assessment_before_dislysis"
 	assessment_before_dislysis_str, _ := redis.Get(key).Result()
+	redis.Set(key, "", time.Second)
 	if len(assessment_before_dislysis_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
@@ -901,6 +902,7 @@ func MobileGetMonitorRecords(orgID int64, patientID int64, recordDate int64) ([]
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":monitor_records"
+	redis.Set(key, "", time.Second)
 	monitor_records_str, _ := redis.Get(key).Result()
 
 	if len(monitor_records_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/stock_service.go

@@ -753,8 +753,13 @@ func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id in
 }
 
 func CreateDrugFlowTwo(flow *models.DrugFlow) error {
-
-	err := XTWriteDB().Create(&flow).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Create(&flow).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err error) {
@@ -4896,8 +4901,13 @@ func CreateStockFlow(warehousingInfo []*models.VmStockFlow) (err error) {
 }
 
 func CreateStockFlowOne(flow models.VmStockFlow) error {
-
-	err := XTWriteDB().Create(&flow).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Create(&flow).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -6564,8 +6574,13 @@ func ModifyGoodReduceInformationTwentyOne(good_id int64, waresing_count int64, s
 }
 
 func UpdateMedicalSumCount(drug_id int64, sum_count int64, sum_in_count int64, orgid int64) error {
-
-	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7080,8 +7095,13 @@ func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
 }
 
 func UpdateCheckWarehouseInfo(id int64) error {
-
-	err := XTWriteDB().Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7092,29 +7112,58 @@ func GetWarehouseInfoList(id int64, orgid int64) (info []*models.WarehousingInfo
 }
 
 func UpdateWarehouseInfoByIdList(count int64, id int64) error {
-
-	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func ReturnCheckWarehouseInfo(id int64) error {
-
-	err := XTWriteDB().Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("warehousing_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx.Commit()
 	return err
 }
 
 func UpdateWarehouseInfoByIdListTwo(count int64, id int64) error {
-
-	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func UpdateWarehouseInfoFlow(id int64) error {
+	tx := XTWriteDB().Begin()
+	err := tx.Model(models.VmStockFlow{}).Where("warehousing_detail_id =  ?", id).Update(map[string]interface{}{"status": 0}).Error
 
-	err := XTWriteDB().Model(models.VmStockFlow{}).Where("warehousing_detail_id =  ?", id).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7158,8 +7207,13 @@ func UpdateWarehouseing(info *models.DrugWarehouseInfo) error {
 }
 
 func CheckWarehousingInfo(id int64, orgid int64) error {
-
-	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7170,41 +7224,89 @@ func GetWarehousingInfoByList(id int64, orgid int64) (info []*models.DrugWarehou
 }
 
 func AddDrugWarehouseStockMaxNumber(count int64, id int64) error {
-
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func UpdateWarehousingInfoFlow(id int64, orgid int64) error {
-
-	err := XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugFlow{}).Where("warehousing_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func AddDrugWarehouseStockMinNumber(count int64, id int64) error {
-
+	tx := XTWriteDB().Begin()
 	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx.Commit()
 	return err
 }
 
 func ReturnCheckWarehouseingInfo(id int64, orgid int64) error {
-
+	tx := XTWriteDB().Begin()
 	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("warehousing_id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func AddDrugReturnWarehouseStockMaxNumber(count int64, id int64) error {
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func AddDrugReturnWarehouseStockMinNumber(count int64, id int64) error {
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7318,8 +7420,13 @@ func UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) er
 }
 
 func UpdateGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64) error {
-
-	err := XTReadDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).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
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7424,9 +7531,18 @@ func GetDrugAllStockInfo(storehouse_id int64, orgid int64, drugid int64) (info [
 }
 
 func UpdateBaseDrugSumInfo(sum_count int64, drugid int64, orgid int64, sum_in_count int64) error {
-
-	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
+	tx := XTWriteDB().Begin()
+	err := tx.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 {
+		tx.Rollback()
+		return err
+	}
+	err = tx.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 {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 

src/golang.org/x/sync

@@ -0,0 +1 @@
+Subproject commit f12130a5280420d36872ab0a7717d160c768df46