历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3352,7 +3352,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 == 10375) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
+			if (template.TemplateId == 6 || template.TemplateId == 32 || template.TemplateId == 65 || adminUserInfo.Org.Id == 10375 || template.TemplateId == 70) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
@@ -4359,7 +4359,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375) && adminInfo.Org.Id != 9538 {
+			if (template.TemplateId == 6 || template.TemplateId == 65 || adminInfo.Org.Id == 10375 || template.TemplateId == 70) && adminInfo.Org.Id != 9538 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 
@@ -4452,7 +4452,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || template.TemplateId == 70 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -5493,7 +5493,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10164 {
+		if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 9671 {
 			list, err := service.CreateMGroupAdviceOne(adminUserInfo.Org.Id, advices, groupNo)
 			for _, item := range advices {
 				byterequest, _ := json.Marshal(item)

service/patient_service.go

@@ -1134,7 +1134,8 @@ func CreateMGroupAdviceOne(orgId int64, advices []*models.GroupAdvice, groupNo i
 		list = append(list, advice)
 		if len(advice.Children) > 0 {
 			for _, child := range advice.Children {
-				child.GroupNo = child.GroupNo
+
+				child.GroupNo = advice.GroupNo
 				child.ParentId = advice.ID
 				fmt.Println(child)
 				if err = tx.Create(&child).Error; err != nil {