XMLWAN hace 3 años
padre
commit
39f7aa0ec6

+ 2 - 3
controllers/dialysis_api_controller.go Ver fichero

3129
 		}
3129
 		}
3130
 	}
3130
 	}
3131
 	// record.UltrafiltrationRate = ultrafiltration_rate
3131
 	// record.UltrafiltrationRate = ultrafiltration_rate
3132
-	if adminInfo.CurrentOrgId != 9538 {
3133
-		record.UltrafiltrationVolume = 0
3134
-	}
3132
+
3133
+	record.UltrafiltrationVolume = 0
3135
 
3134
 
3136
 	if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
3135
 	if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
3137
 		if ultrafiltration_rate > 0 {
3136
 		if ultrafiltration_rate > 0 {

+ 13 - 2
controllers/dialysis_record_api_controller.go Ver fichero

557
 func (this *DialysisRecordAPIController) StartDialysis() {
557
 func (this *DialysisRecordAPIController) StartDialysis() {
558
 	patientID, _ := this.GetInt64("patient_id")
558
 	patientID, _ := this.GetInt64("patient_id")
559
 	recordDateStr := this.GetString("date")
559
 	recordDateStr := this.GetString("date")
560
-	fmt.Println("上机日期222222222222222222222222", recordDateStr)
561
 	nurseID, _ := this.GetInt64("nurse")
560
 	nurseID, _ := this.GetInt64("nurse")
562
 	punctureNurseId, _ := this.GetInt64("puncture_nurse")
561
 	punctureNurseId, _ := this.GetInt64("puncture_nurse")
563
 	startDateStr := this.GetString("start_time")
562
 	startDateStr := this.GetString("start_time")
762
 
761
 
763
 		var ultrafiltration_rate float64
762
 		var ultrafiltration_rate float64
764
 		_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.CurrentOrgId)
763
 		_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.CurrentOrgId)
764
+
765
+		//获取预增水量
766
+		_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.CurrentOrgId)
765
 		if prescription.ID > 0 {
767
 		if prescription.ID > 0 {
766
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
768
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
767
 
769
 
768
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
770
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
769
-				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36 {
771
+				if (template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36) && adminUserInfo.CurrentOrgId != 9671 {
770
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
772
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
771
 				}
773
 				}
774
+
775
+				//针对福建医师汇
776
+				if template.TemplateId == 6 && adminUserInfo.CurrentOrgId == 9671 {
777
+					if evaluation.ID > 0 {
778
+						dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
779
+						ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
780
+					}
781
+				}
782
+
772
 				// 只针对方济医院
783
 				// 只针对方济医院
773
 				if template.TemplateId == 1 && adminUserInfo.CurrentOrgId != 9849 {
784
 				if template.TemplateId == 1 && adminUserInfo.CurrentOrgId != 9849 {
774
 					value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
785
 					value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)

+ 21 - 5
controllers/mobile_api_controllers/dialysis_api_controller.go Ver fichero

1818
 
1818
 
1819
 	var ultrafiltration_rate float64
1819
 	var ultrafiltration_rate float64
1820
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
1820
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
1821
+	//后期预增脱水量
1822
+	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
1823
+	fmt.Println(evaluation)
1821
 	if prescription.ID > 0 {
1824
 	if prescription.ID > 0 {
1822
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
1825
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
1823
 
1826
 
1824
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
1827
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
1825
-			if template.TemplateId == 6 || template.TemplateId == 32 { //adminUserInfo.Org.Id == 9538
1828
+			if (template.TemplateId == 6 || template.TemplateId == 32) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
1826
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
1829
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
1827
 			}
1830
 			}
1828
 
1831
 
1832
+			//针对医师汇
1833
+			if template.TemplateId == 6 && adminUserInfo.Org.Id == 9671 {
1834
+				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
1835
+				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
1836
+			}
1837
+
1829
 			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
1838
 			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
1830
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
1839
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
1831
 			}
1840
 			}
2320
 
2329
 
2321
 	var ultrafiltration_rate float64
2330
 	var ultrafiltration_rate float64
2322
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
2331
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
2332
+
2333
+	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
2334
+	fmt.Println(evaluation)
2323
 	if prescription.ID > 0 {
2335
 	if prescription.ID > 0 {
2324
 
2336
 
2325
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
2337
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
2326
 
2338
 
2327
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
2339
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
2328
-			if template.TemplateId == 6 {
2340
+			if template.TemplateId == 6 && adminInfo.Org.Id != 9671 {
2329
 
2341
 
2330
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
2342
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
2331
 				record.UltrafiltrationRate = ultrafiltration_rate
2343
 				record.UltrafiltrationRate = ultrafiltration_rate
2332
 			}
2344
 			}
2345
+			//if template.TemplateId == 6 && adminInfo.Org.Id ==9671{
2346
+			//  dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
2347
+			//  ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
2348
+			//  record.UltrafiltrationRate = ultrafiltration_rate
2349
+			//}
2333
 
2350
 
2334
 			if template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 {
2351
 			if template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 {
2335
 
2352
 
2351
 		}
2368
 		}
2352
 	}
2369
 	}
2353
 	// record.UltrafiltrationRate = ultrafiltration_rate
2370
 	// record.UltrafiltrationRate = ultrafiltration_rate
2354
-	if adminInfo.Org.Id != 9538 {
2355
-		record.UltrafiltrationVolume = 0
2356
-	}
2371
+
2372
+	record.UltrafiltrationVolume = 0
2357
 
2373
 
2358
 	if template.TemplateId == 1 && adminInfo.Org.Id != 9849 { //adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535
2374
 	if template.TemplateId == 1 && adminInfo.Org.Id != 9849 { //adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535
2359
 		if ultrafiltration_rate > 0 {
2375
 		if ultrafiltration_rate > 0 {

+ 7 - 0
service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go Ver fichero

196
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
196
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
197
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
197
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
198
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
198
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
199
+	Illness                    int64   `gorm:"column:illness" json:"illness" form:"illness"`
200
+	Amylaceum                  string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
201
+	SingleTime                 string  `gorm:"column:single_time" json:"single_time" form:"single_time"`
202
+	SingleWater                string  `gorm:"column:single_water" json:"single_water" form:"single_water"`
203
+	ReplacementFlow            string  `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
204
+	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
205
+	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
199
 }
206
 }
200
 
207
 
201
 func (PrescriptionVM) TableName() string {
208
 func (PrescriptionVM) TableName() string {

+ 1 - 2
service/schedule_service.go Ver fichero

382
 }
382
 }
383
 
383
 
384
 func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.Time, weektime int64) (schedules []*models.WeekSchedule, err error) {
384
 func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.Time, weektime int64) (schedules []*models.WeekSchedule, err error) {
385
-	fmt.Println("日期22222222222222222", scheduleDate)
386
-	fmt.Println("scheduledate2222222222", scheduleDates)
385
+
387
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
386
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
388
 	if orgID > 0 {
387
 	if orgID > 0 {
389
 		db = db.Where("s.user_org_id = ?", orgID)
388
 		db = db.Where("s.user_org_id = ?", orgID)