历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3217,7 +3217,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
+			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
@@ -4173,7 +4173,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 			fmt.Println("hahhdahahah", template.TemplateId)
-			if (template.TemplateId == 6 || template.TemplateId == 65) && adminInfo.Org.Id != 9538 {
+			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375) && adminInfo.Org.Id != 9538 {
 				fmt.Println("hahhdahahah")
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4233,6 +4233,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 
 			}
+
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -4259,7 +4260,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

service/mobile_dialysis_service.go

@@ -2486,14 +2486,14 @@ func MobileGetLastDialysisPrescribe(orgID int64, patientID int64) (*models.Dialy
 func MobileGetLastDialysisPrescribeByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
-	}
-	return &record, nil
+	//if err != nil {
+	//	if err == gorm.ErrRecordNotFound {
+	//		return nil, nil
+	//	} else {
+	//		return nil, err
+	//	}
+	//}
+	return &record, err
 }
 
 func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {