|
|
@@ -69,6 +69,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
|
|
69
|
69
|
schedule_type, _ := c.GetInt64("schedule_type")
|
|
70
|
70
|
partition_type, _ := c.GetInt64("partition_type")
|
|
71
|
71
|
patient_id, _ := c.GetInt64("patient_id")
|
|
|
72
|
+ excution_way, _ := c.GetInt64("excution_way")
|
|
72
|
73
|
if adviceType != 1 && adviceType != 3 && adviceType != 2 {
|
|
73
|
74
|
adviceType = 0
|
|
74
|
75
|
}
|
|
|
@@ -87,10 +88,10 @@ func (c *DoctorsApiController) ScheduleAdvices() {
|
|
87
|
88
|
adminUserInfo := c.GetAdminUserInfo()
|
|
88
|
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
|
95
|
//project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
|
|
95
|
96
|
for _, item := range project {
|
|
96
|
97
|
index := 0
|
XMLWAN