Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/doctors_api_controller.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"XT_New/service"
 	"strconv"
-
+	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/utils"
 	"fmt"
@@ -26,6 +26,50 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/paients/getdryweightdetail", &DoctorsApiController{}, "Get:GetDryWeightDetail")
 	beego.Router("/api/patients/modifydryweightdata", &DoctorsApiController{}, "Get:ModifydryWeightData")
 	beego.Router("/api/patient/deletedryweight", &DoctorsApiController{}, "Delete:DeleteDryWeight")
+	beego.Router("/api/schedule/advices", &DoctorsApiController{}, "Get:ScheduleAdvices")
+}
+
+func (c *DoctorsApiController) ScheduleAdvices() {
+	schedualDate := c.GetString("date")
+	adviceType, _ := c.GetInt("advice_type")
+	patientType, _ := c.GetInt("patient_type")
+
+	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
+		adviceType = 0
+	}
+
+	if patientType != 1 && patientType != 2 {
+
+		patientType = 0
+	}
+
+	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
+	if parseDateErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgID := adminUserInfo.CurrentOrgId
+
+	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id)
+	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
+	if err != nil {
+		c.ErrorLog("获取排班信息失败:%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		filtedScheduals := []*service.MScheduleDoctorAdviceVM{}
+		for _, schedual := range scheduals {
+			if len(schedual.DoctorAdvices) > 0 {
+				filtedScheduals = append(filtedScheduals, schedual)
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"scheduals": filtedScheduals,
+
+			"adminUser": adminUser,
+		})
+	}
 }
 
 func (c *DoctorsApiController) GetAllDoctorAndNurse() {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -754,18 +754,18 @@ func (c *CheckWeightApiController) GetPatientListForSchedulesFind() {
 	theStartTime, _ := time.ParseInLocation(timeLayout, scheduleDateStart, loc)
 	syncTime := theStartTime.Unix()
 	adminUserInfo := c.GetMobileAdminUserInfo()
-	if len(patient_name) == 0 {
-		patientList, total, error := service.GetPatientListBySchedules(adminUserInfo.Org.Id, syncTime)
-	} else {
-		patientList, total, error := service.GetPatientListBySchedulesFind(adminUserInfo.Org.Id, syncTime,patient_name)
-	}
+	
+	patientList, total, error := service.GetPatientListBySchedulesFind(adminUserInfo.Org.Id, syncTime,patient_name)
+	
 	patientSchedule := make([]map[string]interface{},0)
 	for _, item := range patientList {
-		patientTemp := make(map[string]interface{})
-		patientTemp["patient_id"] = item.PatientId
-		patientTemp["patient_name"] = item.Patient.Name
-		patientTemp["schedule_type"] = item.ScheduleType
-		patientSchedule = append(patientSchedule, patientTemp)
+		if len(item.Patient.Name) > 0 {
+			patientTemp := make(map[string]interface{})
+			patientTemp["patient_id"] = item.PatientId
+			patientTemp["patient_name"] = item.Patient.Name
+			patientTemp["schedule_type"] = item.ScheduleType
+			patientSchedule = append(patientSchedule, patientTemp)
+		}
 	}
 
 	if error != nil {

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -13,6 +13,7 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/checkbeforedialysis", &CheckWeightApiController{}, "get:GetPatientInfoBeforeDialysis")
 	beego.Router("/m/api/getpatientlist", &CheckWeightApiController{}, "get:GetPatientList")
 	beego.Router("/m/api/getschedulepatient", &CheckWeightApiController{}, "get:GetPatientListForSchedules")
+	beego.Router("/m/api/getschedulepatientfind", &CheckWeightApiController{}, "get:GetPatientListForSchedulesFind")
 	beego.Router("/m/api/getpatientinfo", &CheckWeightApiController{}, "get:GetPatientListById")
 	beego.Router("/m/api/checkdialysis", &CheckWeightApiController{}, "get:GetPatientInfoDialysis")
 	beego.Router("/m/api/savecheckdialysis", &CheckWeightApiController{}, "Post:SavePatientInfoDialysis")