提交代码

controllers/his_api_controller.go

@@ -1411,7 +1411,7 @@ func (c *HisApiController) GetHisPatientList() {
 	//patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
 	patients, _ := service.GetNewHisPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
 	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
-	patient_three, _ := service.GetNewHisPatientListTwo(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+	//patient_three, _ := service.GetNewHisPatientListTwo(adminInfo.CurrentOrgId, recordDateTime, sch_type)
 
 	//patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
 
@@ -1420,10 +1420,15 @@ func (c *HisApiController) GetHisPatientList() {
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
+	//var aa []service.PatientThree
+
+	noElementsSlice := make([]service.PatientThree, 0)
 	c.ServeSuccessJSON(map[string]interface{}{
+
 		"list":       patients,
 		"list_two":   patients_two,
-		"list_three": patient_three,
+		"list_three": noElementsSlice,
+
 		"info":       adminUserInfo,
 		"doctors":    doctors,
 		"department": department,
@@ -9825,6 +9830,8 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 
+	sch, _ := service.GetScheduleByDate(c.GetAdminUserInfo().CurrentOrgId, recordDateTime, patient_id)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":     his_patient_info,
 		"xt_info":      xt_patient_info,
@@ -9835,6 +9842,7 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 		"order":        order,
 		"doctors":      doctors,
 		"department":   department,
+		"sch":          sch,
 	})
 	return
 }