耗材参数

controllers/dialysis_record_api_controller.go

@@ -278,6 +278,9 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
 	}
 
+	//获取患者的最后一次血管通路数据
+	lastAssessment, parseDateErr := service.GetLastPassWayAssessment(adminInfo.CurrentOrgId, patientID)
+
 	returnData := map[string]interface{}{
 		"patient":                     patient,
 		"schedual":                    schedual,
@@ -306,6 +309,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		"is_open_config":              is_open_config,
 		"stockType":                   stockType,
 		"prepare":                     prepare,
+		"lastAssessment":              lastAssessment,
 	}
 	this.ServeSuccessJSON(returnData)
 

controllers/doctors_api_controller.go

@@ -30,6 +30,14 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/schedule/getdoctoradvicecount", &DoctorsApiController{}, "Get:GetDoctorAdviceCount")
 	beego.Router("/api/patient/savevasularaccess", &DoctorsApiController{}, "Get:SaveVasularAccess")
 	beego.Router("/api/patient/getallvascualraccesslist", &DoctorsApiController{}, "Get:GetAllVacualAccessList")
+	beego.Router("/api/patient/getvascularaccessbydetial", &DoctorsApiController{}, "Get:GetVascularAccessByDetail")
+	beego.Router("/api/patient/updatevasularaccess", &DoctorsApiController{}, "Get:UpdateVasularAccess")
+	beego.Router("/api/patient/deletevascularaccess", &DoctorsApiController{}, "Get:DeleteVasularAccess")
+	beego.Router("/api/patient/savepasswayassessment", &DoctorsApiController{}, "Get:SavePassWayAssessment")
+	beego.Router("/api/patient/getallpasswayassessment", &DoctorsApiController{}, "Get:GetAllPassWayAssessment")
+	beego.Router("/api/patient/getpasswayassmentbyid", &DoctorsApiController{}, "Get:GetPasswayAssesmentById")
+	beego.Router("/api/patient/updatepasswayassesment", &DoctorsApiController{}, "Get:UpdatePassWayAssesment")
+	beego.Router("/api/patient/deletepasswayassessment", &DoctorsApiController{}, "Get:DeleteWayAssessment")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -329,9 +337,105 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	stop_reason := this.GetString("stop_reason")
 	user_status, _ := this.GetInt64("user_status")
+	stop_time := this.GetString("stop_time")
+	stopTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", stop_time+" 00:00:00", loc)
+	patient_id, _ := this.GetInt64("patient_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	creator := adminUserInfo.AdminUser.Id
+
+	//查询改日期是否存在
+	_, errcode := service.GetDialysisDateByDate(startTime.Unix(), patient_id, orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		access := models.XtPatientVascularAccess{
+			AccessProject:          access_project,
+			BloodAccessPartId:      blood_access_part_id,
+			BloodAccessPartOperaId: blood_access_part_opera_id,
+			FirstStartTime:         firstStartTime.Unix(),
+			InflowPass:             inflow_pass,
+			Remark:                 remark,
+			StartTime:              startTime.Unix(),
+			StopReason:             stop_reason,
+			UserStatus:             user_status,
+			Creator:                creator,
+			UserOrgId:              orgId,
+			Status:                 1,
+			Ctime:                  time.Now().Unix(),
+			StopTime:               stopTime.Unix(),
+			PatientId:              patient_id,
+		}
+		err := service.SaveVascularAccess(&access)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"access": access,
+			})
+			return
+		}
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+		return
+	}
+
+}
+
+func (this *DoctorsApiController) GetAllVacualAccessList() {
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	list, total, err := service.GetAllVacualAccessList(orgId, limit, page, patient_id)
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":   list,
+			"total":  total,
+			"doctor": doctor,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) GetVascularAccessByDetail() {
+
+	id, _ := this.GetInt64("id")
+
+	accessDetail, err := service.GetVasularAccessByDetail(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"accessDetail": accessDetail,
+			"doctor":       doctor,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) UpdateVasularAccess() {
+	id, _ := this.GetInt64("id")
+	access_project, _ := this.GetInt64("access_project")
+	blood_access_part_id := this.GetString("blood_access_part_id")
+	blood_access_part_opera_id := this.GetString("blood_access_part_opera_id")
+	first_start_time := this.GetString("first_start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	firstStartTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", first_start_time+" 00:00:00", loc)
+	inflow_pass := this.GetString("inflow_pass")
+	remark := this.GetString("remark")
+	start_time := this.GetString("start_time")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	stop_reason := this.GetString("stop_reason")
+	user_status, _ := this.GetInt64("user_status")
+	stop_time := this.GetString("stop_time")
+	stopTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", stop_time+" 00:00:00", loc)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	creator := adminUserInfo.AdminUser.Id
+	patientId, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id222222222222222222", patientId)
 	access := models.XtPatientVascularAccess{
 		AccessProject:          access_project,
 		BloodAccessPartId:      blood_access_part_id,
@@ -342,26 +446,82 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 		StartTime:              startTime.Unix(),
 		StopReason:             stop_reason,
 		UserStatus:             user_status,
-		Creator:                creator,
+		Modify:                 creator,
 		UserOrgId:              orgId,
 		Status:                 1,
-		Ctime:                  time.Now().Unix(),
+		StopTime:               stopTime.Unix(),
+	}
+	_, errcode := service.GetDialysisDateByDateOne(startTime.Unix(), patientId, orgId, id)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.UpdateVascularAccess(&access, id)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"access": access,
+			})
+			return
+		}
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+		return
 	}
-	err := service.SaveVascularAccess(&access)
+
+}
+
+func (this *DoctorsApiController) DeleteVasularAccess() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteVasularAccess(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *DoctorsApiController) SavePassWayAssessment() {
+
+	blood_dealwidth := this.GetString("blood_dealwith")
+	blood_project := this.GetString("blood_project")
+	blood_result := this.GetString("blood_result")
+	creator, _ := this.GetInt64("creator")
+	parent_id, _ := this.GetInt64("parent_id")
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	modify := this.GetAdminUserInfo().AdminUser.Id
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	assessment := models.XtPatientPasswayAssessment{
+		StartTime:     startTime.Unix(),
+		BloodDealwith: blood_dealwidth,
+		BloodProject:  blood_project,
+		BloodResult:   blood_result,
+		Creator:       creator,
+		PatientId:     patient_id,
+		ParentId:      parent_id,
+		Modify:        modify,
+		UserOrgId:     orgId,
+		Status:        1,
+		Ctime:         time.Now().Unix(),
+	}
+
+	err := service.CreatePatientWayAssessment(&assessment)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"access": access,
+			"assessment": assessment,
 		})
 		return
 	}
 }
 
-func (this *DoctorsApiController) GetAllVacualAccessList() {
+func (this *DoctorsApiController) GetAllPassWayAssessment() {
 
-	limit, _ := this.GetInt64("limit")
+	patient_id, _ := this.GetInt64("patient_id")
+	parent_id, _ := this.GetInt64("parent_id")
 	page, _ := this.GetInt64("page")
-	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, total, err := service.GetAllVacualAccessList(orgId, limit, page)
+	limit, _ := this.GetInt64("limit")
+	adminUserInfo := this.GetAdminUserInfo()
+	list, total, err := service.GetAllPassWayAssessment(parent_id, patient_id, page, limit, adminUserInfo.CurrentOrgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,
@@ -370,3 +530,54 @@ func (this *DoctorsApiController) GetAllVacualAccessList() {
 		return
 	}
 }
+
+func (this *DoctorsApiController) GetPasswayAssesmentById() {
+
+	id, _ := this.GetInt64("id")
+	assessment, err := service.GetPasswayAssesmentById(id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"assessment": assessment,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) UpdatePassWayAssesment() {
+	id, _ := this.GetInt64("id")
+	blood_dealwidth := this.GetString("blood_dealwith")
+	blood_project := this.GetString("blood_project")
+	blood_result := this.GetString("blood_result")
+	creator, _ := this.GetInt64("creator")
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	modify := this.GetAdminUserInfo().AdminUser.Id
+	assessment := models.XtPatientPasswayAssessment{
+		BloodResult:   blood_result,
+		BloodDealwith: blood_dealwidth,
+		BloodProject:  blood_project,
+		Creator:       creator,
+		StartTime:     startTime.Unix(),
+		Modify:        modify,
+	}
+	err := service.UpdatePassWayAssesment(&assessment, id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"assessment": assessment,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) DeleteWayAssessment() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteWayAssessment(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -337,6 +337,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, date.Unix(), schedual.ModeId)
+
 	//if getDialysisPrescribeErr != nil {
 	//	this.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -375,6 +376,11 @@ func (this *DialysisAPIController) DialysisRecord() {
 	stockType, _ := service.GetStockType(adminInfo.Org.Id)
 
 	prepare, _ := service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
+
+	//获取最后一次血管通路
+	lastAssessment, parseDateErr := service.GetLastPassWayAssessment(adminInfo.Org.Id, patientID)
+
+	prescribeOne, parseDateErr := service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
 	var his_advices []*models.HisDoctorAdviceInfo
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
@@ -429,6 +435,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"is_open_config":                 is_open_config,
 		"stockType":                      stockType,
 		"prepare":                        prepare,
+		"lastAssessment":                 lastAssessment,
+		"prescribeOne":                   prescribeOne,
 	}
 	this.ServeSuccessJSON(returnData)
 }

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2627,7 +2627,7 @@ func (this *NewDialysisApiController) GetRolePosition() {
 
 	//去查角色
 	role, err := service.GetAdminUserRole(cretor, orgid)
-	fmt.Println("role----------------", role.RoleIds)
+
 	role_ids := strings.Split(role.RoleIds, ",")
 	var names = ""
 	for _, item := range role_ids {
@@ -2750,3 +2750,46 @@ func (this *NewDialysisApiController) SaveCourseManageMentTwo() {
 		"record": record,
 	})
 }
+
+func (this *NewDialysisApiController) GetVascularAccess() {
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	adminInfo := this.GetMobileAdminUserInfo()
+	appId := adminInfo.App.Id
+	list, total, err := service.GetAllVacualAccessList(orgId, limit, page, patient_id)
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":   list,
+			"total":  total,
+			"doctor": doctor,
+		})
+		return
+	}
+}
+
+func (this *NewDialysisApiController) GetVascularAccessDetail() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	parent_id, _ := this.GetInt64("parent_id")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	list, total, err := service.GetAllPassWayAssessment(parent_id, patient_id, page, limit, orgId)
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	appId := adminInfo.App.Id
+	allDoctor, err := service.GetAllDoctor(orgId, appId)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"total":     total,
+			"allDoctor": allDoctor,
+		})
+		return
+	}
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -162,6 +162,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/deletemanagementtwo", &NewDialysisApiController{}, "Delete:DeleteManageMentTwo")
 	beego.Router("/m/api/patient/savecouresemanagement", &NewDialysisApiController{}, "Get:SaveCourseManageMent")
 	beego.Router("/m/api/patient/savecoursemanagementtwo", &NewDialysisApiController{}, "Get:SaveCourseManageMentTwo")
+	beego.Router("/m/api/patient/getvascularaccess", &NewDialysisApiController{}, "Get:GetVascularAccess")
+	beego.Router("/m/api/patient/getvascularaccessdetail", &NewDialysisApiController{}, "Get:GetVascularAccessDetail")
 
 	//His相关
 	beego.Router("/m/api/hispatientlist/get", &MobileHisApiController{}, "Get:GetHisPatientList")

controllers/patient_api_controller.go

@@ -3390,6 +3390,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		solution.Remark = remark
 	}
 
+	if dataBody["created_time"] != nil && reflect.TypeOf(dataBody["created_time"]).String() == "float64" {
+		created_time := int64(dataBody["created_time"].(float64))
+
+		solution.CreatedTime = created_time
+	}
 	return
 }
 

controllers/stock_in_api_controller.go

@@ -1985,6 +1985,7 @@ func (this *StockManagerApiController) GetOutStockTotalCount() {
 	warehouseOutTime, _ := this.GetInt64("warehouse_out_time")
 	adminUserInfo := this.GetAdminUserInfo()
 	stockCount, err := service.GetOutStockTotalCount(warehouseOutTime, adminUserInfo.CurrentOrgId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	}

models/user_models.go

@@ -487,9 +487,32 @@ type XtPatientVascularAccess struct {
 	Ctime                  int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                  int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Modify                 int64  `gorm:"column:modify" json:"modify" form:"modify"`
+	StopTime               int64  `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	PatientId              int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 func (XtPatientVascularAccess) TableName() string {
 
 	return "xt_patient_vascular_access"
 }
+
+type XtPatientPasswayAssessment struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	StartTime     int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	BloodProject  string `gorm:"column:blood_project" json:"blood_project" form:"blood_project"`
+	BloodResult   string `gorm:"column:blood_result" json:"blood_result" form:"blood_result"`
+	BloodDealwith string `gorm:"column:blood_dealwith" json:"blood_dealwith" form:"blood_dealwith"`
+	Modify        int64  `gorm:"column:modify" json:"modify" form:"modify"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ParentId      int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtPatientPasswayAssessment) TableName() string {
+
+	return "xt_patient_passway_assessment"
+}

service/mobile_dialysis_service.go

@@ -1190,6 +1190,19 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 	return &record, nil
 }
 
+func MobileGetDialysisPrescribeByModeIdOne(orgID int64, patientID int64, recordDate int64) (*models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func MobileGetLastDialysisPrescribe(orgID int64, patientID int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 ", patientID, orgID).Last(&record).Error

service/patient_service.go

@@ -956,7 +956,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 		db = db.Where("do.dialysis_date<=?", end)
 	}
 	if mode_id > 0 {
-		db = db.Joins("JOIN xt_dialysis_prescription as dp ON dp.record_id=do.id")
+		db = db.Joins("JOIN xt_dialysis_prescription as dp ON dp.patient_id=do.patient_id and dp.user_org_id = do.user_org_id and dp.record_date = do.dialysis_date")
 		db = db.Where("dp.mode_id=?", mode_id)
 	}
 

service/patientmanage_service.go

@@ -1475,15 +1475,95 @@ func GetDialysAfterRecord(patientid int64, startime int64, endtime int64, orgid
 	return dislysis, err
 }
 
+func GetDialysisDateByDate(starTime int64, patientId int64, orgId int64) (*models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err := XTReadDB().Model(&access).Where("start_time = ? and patient_id = ? and user_org_id = ? and status = 1", starTime, patientId, orgId).Find(&access).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &access, nil
+}
+
+func GetDialysisDateByDateOne(starTime int64, patientId int64, orgId int64, id int64) (*models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err := XTReadDB().Model(&access).Where("start_time = ? and patient_id = ? and user_org_id = ? and status = 1 and id <> ?", starTime, patientId, orgId, id).Find(&access).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &access, nil
+}
+
 func SaveVascularAccess(access *models.XtPatientVascularAccess) error {
 
 	err := XTWriteDB().Create(&access).Error
 	return err
 }
 
-func GetAllVacualAccessList(orgid int64, limit int64, page int64) (vascular []*models.XtPatientVascularAccess, total int64, err error) {
+func GetAllVacualAccessList(orgid int64, limit int64, page int64, patientId int64) (vascular []*models.XtPatientVascularAccess, total int64, err error) {
 
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&vascular).Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Find(&vascular).Error
+	err = XTReadDB().Model(&vascular).Where("user_org_id = ? and status = 1 and patient_id = ?", orgid, patientId).Count(&total).Offset(offset).Limit(limit).Order("start_time desc").Find(&vascular).Error
 	return vascular, total, err
 }
+
+func GetVasularAccessByDetail(id int64) (models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err := XTReadDB().Where("id = ? and status =1", id).Find(&access).Error
+	return access, err
+}
+
+func UpdateVascularAccess(access *models.XtPatientVascularAccess, id int64) error {
+
+	err := XTWriteDB().Model(&access).Where("id= ?", id).Updates(map[string]interface{}{"access_project": access.AccessProject, "blood_access_part_id": access.BloodAccessPartId, "inflow_pass": access.InflowPass, "start_time": access.StartTime, "first_start_time": access.FirstStartTime, "blood_access_part_opera_id": access.BloodAccessPartOperaId, "stop_reason": access.StopReason, "remark": access.Remark, "user_status": access.UserStatus, "modify": access.Modify, "stop_time": access.StopTime}).Error
+	return err
+}
+
+func DeleteVasularAccess(id int64) error {
+	access := models.XtPatientVascularAccess{}
+	err := XTWriteDB().Model(&access).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func CreatePatientWayAssessment(assessment *models.XtPatientPasswayAssessment) error {
+
+	err := XTWriteDB().Create(&assessment).Error
+	return err
+}
+
+func GetAllPassWayAssessment(parent_id int64, patient_id int64, page int64, limit int64, orgid int64) (assessment []*models.XtPatientPasswayAssessment, total int64, err error) {
+	offset := (page - 1) * limit
+	err = XTReadDB().Model(&assessment).Where("parent_id = ? and patient_id = ? and user_org_id = ? and status =1", parent_id, patient_id, orgid).Count(&total).Offset(offset).Limit(limit).Order("start_time desc").Find(&assessment).Error
+	return assessment, total, err
+}
+
+func GetPasswayAssesmentById(id int64) (models.XtPatientPasswayAssessment, error) {
+
+	assessment := models.XtPatientPasswayAssessment{}
+	err := XTReadDB().Model(&assessment).Where("id=? and status =1", id).Find(&assessment).Error
+	return assessment, err
+}
+
+func UpdatePassWayAssesment(assessment *models.XtPatientPasswayAssessment, id int64) error {
+
+	err := XTWriteDB().Model(&assessment).Where("id = ?", id).Updates(map[string]interface{}{"start_time": assessment.StartTime, "creator": assessment.Creator, "blood_project": assessment.BloodProject, "blood_result": assessment.BloodResult, "blood_dealwith": assessment.BloodDealwith, "modify": assessment.Modify, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteWayAssessment(id int64) error {
+	assessment := models.XtPatientPasswayAssessment{}
+	err := XTWriteDB().Model(&assessment).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetLastPassWayAssessment(orgid int64, patientId int64) (models.XtPatientVascularAccess, error) {
+
+	assessment := models.XtPatientVascularAccess{}
+	err := XTReadDB().Model(&assessment).Where("user_org_id = ? and patient_id = ? and status =1 and user_status = 1", orgid, patientId).Order("start_time desc").Last(&assessment).Error
+	return assessment, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -506,6 +506,7 @@ type MonitoringRecordVM struct {
 	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
 	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/self_drug_service.go

@@ -793,6 +793,6 @@ func GetSelfOutStockQuery(startTime int64, endTime int64, orgid int64) (selfouts
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.drug_name_id,Sum(x.outstore_number) as count").Group("x.drug_name_id").Scan(&selfoutstock).Error
+	err = db.Select("x.drug_name_id,Sum(x.outstore_number) as count").Group("x.drug_name").Scan(&selfoutstock).Error
 	return selfoutstock, err
 }