耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

controllers/dialysis_api_controller.go

@@ -3200,7 +3200,8 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 			if template.TemplateId == 6 && adminInfo.CurrentOrgId == 10234 {
 
-				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration) / float64(totalMin) * 60 * 1000)
+				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}

controllers/dialysis_record_api_controller.go

@@ -739,7 +739,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	fmt.Println("hhaaaaaaa888888888323232323232333232322333323232", adminUserInfo.CurrentOrgId)
+
 	dialysisRecord = &models.DialysisOrder{
 		DialysisDate:           recordDate.Unix(),
 		UserOrgId:              adminUserInfo.CurrentOrgId,
@@ -800,7 +800,8 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 				if template.TemplateId == 6 && adminUserInfo.CurrentOrgId == 10234 {
 					if evaluation.ID > 0 {
-						ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration) / float64(totalMin) * 60 * 1000)
+						dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+						ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
 					}
 				}
 

controllers/gobal_config_api_controller.go

@@ -1854,7 +1854,7 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	list, total, err := service.GetAllBaseDurgListCount(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId)
-	fmt.Println("total232323232323232232323", total)
+
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,10 +269,12 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 		afterevaluation.DiastolicBloodPressure = diastolic_blood_pressure // 舒张压
 		afterevaluation.PulseFrequency = pulse_frequency                  // 脉率
 
-		afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
-		afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
-		afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
-		afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk                   //跌倒风险
+		if adminUserInfo.Org.Id == 10138 {
+			afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
+			afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
+			afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
+			afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk                   //跌倒风险
+		}
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
 		if err == nil {
@@ -704,10 +706,13 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		afterevaluation.WeightAfter = weight_after
 		afterevaluation.WeightLoss = weight_loss
 
-		afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
-		afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
-		afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
-		afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk
+		if adminUserInfo.Org.Id == 10138 {
+			afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
+			afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
+			afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
+			afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk
+		}
+
 		// if (adminUserInfo.Org.Id == 9538){
 		// 	afterevaluation.ActualUltrafiltration = weight_loss * 1000  //中能建的计量单位是毫升（ml）
 		// } else {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1493,7 +1493,7 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
 	}
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 9671 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 {
 		evaluation, _ := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1542,6 +1542,11 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 	}
 
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10233 {
+
+		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
+	}
+
 	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10060 {
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 	}

controllers/schedule_api_controller.go

@@ -2369,6 +2369,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if week_type > 0 {
 		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
@@ -2383,7 +2384,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 	if week_type == 0 {
 		startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
 		list, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone)
-		fmt.Println("e23332232323232323322323", err)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

models/schedule_models.go

@@ -132,13 +132,13 @@ type WeekSchedule struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient              string                 `gorm:"-" json:"patient" form:"patient"`
-	DeviceZone           DeviceZone             `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber         DeviceNumber           `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisPrescription DialysisSolution       `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
-	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	//DialysisSolution     []*DialysisSolution    `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	Patient                    string                     `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	DialysisPrescription       DialysisSolution           `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
 }
@@ -197,6 +197,7 @@ type VmSchedulesRemind struct {
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {

service/schedule_service.go

@@ -608,7 +608,9 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("mode_id").Order("id asc")
+		return db.Where("status =1").Order("id asc")
+	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
@@ -633,7 +635,9 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("mode_id").Order("id asc")
+		return db.Where("status =1").Order("id asc")
+	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
@@ -820,6 +824,8 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 			return db.Where("status = 1").Order("id asc")
 		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Order("id asc")
+	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Group("patient_id,mode_id").Order("id desc")
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").