历史排班

controllers/manage_api_controller.go

@@ -993,9 +993,19 @@ func (this *MachineApiController) SaveInformation() {
 	contagion := dataBody["contagion"].(string)
 	dialysis_mode := int64(dataBody["dialysis_mode"].(float64))
 	startDateStr := dataBody["start_time"].(string)
-	startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startDateStr)
+	var startDataUnix int64
+	if len(startDateStr) > 0 {
+		startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startDateStr)
+		startDataUnix = startDate.Unix()
+	}
+
 	endDateStr := dataBody["end_time"].(string)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endDateStr)
+	var endDateUnix int64
+	if len(endDateStr) > 0 {
+		endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endDateStr)
+		endDateUnix = endDate.Unix()
+	}
+
 	dialysis_time := dataBody["dialysis_time"].(string)
 	hyperfiletration := dataBody["hyperfiltratio"].(float64)
 	weight_loss := dataBody["weight_loss"].(float64)
@@ -1018,9 +1028,19 @@ func (this *MachineApiController) SaveInformation() {
 	disinfection_residue := int64(dataBody["disinfection_residue"].(float64))
 	longtime := dataBody["longtime"].(string)
 	start_DateStr := dataBody["starttime"].(string)
-	start_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", start_DateStr)
+	var start_DateStr_Unix int64
+	if len(start_DateStr) > 0 {
+		start_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", start_DateStr)
+		start_DateStr_Unix = start_Date.Unix()
+	}
+
 	end_DateStr := dataBody["endtime"].(string)
-	end_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", end_DateStr)
+	var end_DateStr_Unix int64
+	if len(end_DateStr) > 0 {
+		end_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", end_DateStr)
+		end_DateStr_Unix = end_Date.Unix()
+	}
+
 	dialysis_checked := int64(dataBody["dialysis_checked"].(float64))
 
 	dialysis_name := int64(dataBody["dialysis_name"].(float64))
@@ -1040,7 +1060,7 @@ func (this *MachineApiController) SaveInformation() {
 	sign_name := int64(dataBody["sign_name"].(float64))
 
 	information, errinfor := service.GetInformation(eid, startdate, orgid, classtype)
-	fmt.Print("errinfor", errinfor)
+
 	fmt.Print("information", information)
 
 	//获取该机器最后一次的透析次数
@@ -1061,8 +1081,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1081,8 +1101,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,
@@ -1116,8 +1136,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1136,8 +1156,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,
@@ -1178,8 +1198,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1198,8 +1218,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,
@@ -1233,8 +1253,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1253,8 +1273,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1772,7 +1772,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				}
 
 				if schedulePatient.ScheduleType == 2 {
-					advice.StartTime = recordDate.Unix() + 11*60*60
+					advice.StartTime = recordDate.Unix() + 10*60*60
 				}
 			}
 			// 抗凝剂名称
@@ -2819,9 +2819,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = value
 			}
 
-			//针对医师汇
-			if adminUserInfo.Org.Id == 10471 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration*60/float64(totalMin)*1000) / 1000
+			//针对
+			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 {
+
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 		}
 	}
@@ -3407,7 +3409,7 @@ func (c *DialysisAPIController) PostSolution() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 11*60*60
+				advice.StartTime = recordDate.Unix() + 10*60*60
 			}
 		}
 		// 抗凝剂名称
@@ -3695,14 +3697,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			if adminInfo.Org.Id == 10471 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
-			}
 
-			if adminInfo.Org.Id == 10471 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
-				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
@@ -4289,9 +4287,9 @@ func (c *DialysisAPIController) GetLongAdviceOne() {
 		var advice_three []*models.DoctorAdvice
 
 		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.Org.Id, patient_id, theStartTime)
-		fmt.Println("advices++++++++++++++++", advices)
+
 		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.Org.Id, patient_id, theStartTime)
-		fmt.Println("advices_two------------------------", advices_two)
+
 		for _, advice := range advices {
 			if advice.FrequencyType == 3 {
 				t := time.Now()