XMLWAN пре 2 година
родитељ
комит
5f8ea60b39
1 измењених фајлова са 4 додато и 3 уклоњено
  1. 4 3
      controllers/doctors_api_controller.go

+ 4 - 3
controllers/doctors_api_controller.go Прегледај датотеку

69
 	schedule_type, _ := c.GetInt64("schedule_type")
69
 	schedule_type, _ := c.GetInt64("schedule_type")
70
 	partition_type, _ := c.GetInt64("partition_type")
70
 	partition_type, _ := c.GetInt64("partition_type")
71
 	patient_id, _ := c.GetInt64("patient_id")
71
 	patient_id, _ := c.GetInt64("patient_id")
72
+	excution_way, _ := c.GetInt64("excution_way")
72
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
73
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
73
 		adviceType = 0
74
 		adviceType = 0
74
 	}
75
 	}
87
 	adminUserInfo := c.GetAdminUserInfo()
88
 	adminUserInfo := c.GetAdminUserInfo()
88
 	orgID := adminUserInfo.CurrentOrgId
89
 	orgID := adminUserInfo.CurrentOrgId
89
 
90
 
90
-	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id)
91
-	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id)
91
+	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way)
92
+	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way)
92
 
93
 
93
-	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
94
+	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
94
 	//project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
95
 	//project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
95
 	for _, item := range project {
96
 	for _, item := range project {
96
 		index := 0
97
 		index := 0