|
@@ -68,7 +68,12 @@ func (c *DoctorsApiController) ScheduleAdvices() {
|
68
|
68
|
|
69
|
69
|
scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
|
70
|
70
|
hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
|
|
71
|
+
|
|
72
|
+ project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type)
|
|
73
|
+
|
71
|
74
|
config, _ := service.GetHisDoctorConfig(orgID)
|
|
75
|
+ project_config, _ := service.GetHisProjectConfig(orgID)
|
|
76
|
+
|
72
|
77
|
adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
|
73
|
78
|
if err != nil {
|
74
|
79
|
c.ErrorLog("获取排班信息失败:%v", err)
|
|
@@ -81,10 +86,12 @@ func (c *DoctorsApiController) ScheduleAdvices() {
|
81
|
86
|
}
|
82
|
87
|
}
|
83
|
88
|
c.ServeSuccessJSON(map[string]interface{}{
|
84
|
|
- "scheduals": filtedScheduals,
|
85
|
|
- "adminUser": adminUser,
|
86
|
|
- "hisAdvices": hisAdvices,
|
87
|
|
- "config": config,
|
|
89
|
+ "scheduals": filtedScheduals,
|
|
90
|
+ "adminUser": adminUser,
|
|
91
|
+ "hisAdvices": hisAdvices,
|
|
92
|
+ "config": config,
|
|
93
|
+ "project_config": project_config,
|
|
94
|
+ "project": project,
|
88
|
95
|
})
|
89
|
96
|
}
|
90
|
97
|
}
|