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

controllers/his_project_api_controller.go

@@ -155,9 +155,9 @@ func (this *HisProjectApiController) GetProjectList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	is_charge, _ := this.GetInt64("is_charge")
-	fmt.Println("is_charge====================", is_charge)
+
 	is_start, _ := this.GetInt64("is_start")
-	fmt.Println("is_start--------------------", is_start)
+
 	keyword := this.GetString("keyword")
 	projecList, total, err := service.GetHisProjectList(orgId, limit, page, is_charge, is_start, keyword)
 	fmt.Println("err", err)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -745,6 +745,43 @@ func (c *CheckWeightApiController) GetPatientListForSchedules() {
 	})
 }
 
+func (c *CheckWeightApiController) GetPatientListForSchedulesFind() {
+	patient_name := c.GetString("patient_name")                   //脉率
+	thisTime := time.Now()
+	scheduleDateStart := thisTime.Format("2006-01-02") + " 00:00:00"
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	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)
+	}
+	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 error != nil {
+		c.ErrorLog("获取病人列表失败:%v", error)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	serviceTime := time.Now().Unix()
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patientlist": patientSchedule,
+		"total":       total,
+		"servicetime": serviceTime,
+	})
+}
+
+
 
 func (c *CheckWeightApiController) GetPatientListById() {
 	patientId, _ := c.GetInt64("patient_id", 0)

service/his_project_service.go

@@ -28,7 +28,7 @@ func CreateHisProject(project *models.XtHisProject) error {
 	return err
 }
 
-func GetHisProjectList(orgid int64, limit int64, page int64, start int64, charge int64, keyword string) (hisproject []*models.XtHisProject, total int64, err error) {
+func GetHisProjectList(orgid int64, limit int64, page int64, charge int64, start int64, keyword string) (hisproject []*models.XtHisProject, total int64, err error) {
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 	db := XTReadDB().Table("xt_his_project as x").Where("x.status = 1")
@@ -36,10 +36,10 @@ func GetHisProjectList(orgid int64, limit int64, page int64, start int64, charge
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
 	if start > 0 {
-		db = db.Where("x.medical_status = ?", charge)
+		db = db.Where("x.medical_status = ?", start)
 	}
 	if charge > 0 {
-		db = db.Where("x.is_charge = ? ", start)
+		db = db.Where("x.is_estimate = ? ", charge)
 	}
 	if len(keyword) > 0 {
 		db = db.Where("x.project_name like ?", likeKey)

service/patient_service.go

@@ -95,6 +95,12 @@ func GetPatientListBySchedules(orgID int64, syncTime int64) (patients []*models.
 	return
 }
 
+func GetPatientListBySchedulesFind(orgID int64, syncTime int64,patient_name string) (patients []*models.SchedulePatients, total int64, err error) {
+	db := readDb.Model(&models.SchedulePatients{}).Where("user_org_id=?  AND  status=1  AND  schedule_date = ?", orgID,syncTime).Preload("Patient", "status = 1 AND user_org_id = ? and name like '%?%' ", orgID,patient_name)
+	err = db.Count(&total).Find(&patients).Error
+	return
+}
+
 func GetPatientListById(orgID int64, patientId int64) (patients models.PatientListForFace, err error) {
 	err = readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=? and id = ? and status=1", orgID, patientId).First(&patients).Error
 	return