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

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -562,17 +562,17 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 		}
 
-		if dialysisPrescribe != nil {
-			dialysisPrescribe.UpdatedTime = time.Now().Unix()
-			dialysisPrescribe.RecordDate = theAssessmentDateTime
-			dialysisPrescribe.DewaterAmount = dewater_amount
-			dialysisPrescribe.TargetUltrafiltration = dewater_amount
-			dialysisPrescribe.Status = 1
-			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-			if updateErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
+		// if dialysisPrescribe != nil {
+		// 	dialysisPrescribe.UpdatedTime = time.Now().Unix()
+		// 	dialysisPrescribe.RecordDate = theAssessmentDateTime
+		// 	dialysisPrescribe.DewaterAmount = dewater_amount
+		// 	dialysisPrescribe.TargetUltrafiltration = dewater_amount
+		// 	dialysisPrescribe.Status = 1
+		// 	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+		// 	if updateErr != nil {
+		// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		// 	}
+		// }
 
 		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {
@@ -745,41 +745,64 @@ 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) 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)
+		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,
+		})
+	} else {
+		patientList, total, error := service.GetPatientListBySchedulesFind(adminUserInfo.Org.Id, syncTime,patient_name)
+		patientSchedule := make([]map[string]interface{},0)
+		for _, item := range patientList {
+			if item.Patient.ID > 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 {
+			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)
@@ -799,6 +822,7 @@ func (c *CheckWeightApiController) GetPatientListById() {
 		"patientinfo": patient,
 	})
 }
+
 func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {
@@ -865,12 +889,12 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		}
 
 		// 排队叫号的签到
-		ssoDomain := beego.AppConfig.String("call_domain")
-		api := ssoDomain + "/index/patientsign/" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + "/" + strconv.FormatInt(id, 10)
-		values := make(url.Values)
-
-		http.PostForm(api, values)
-
+		go func (){
+			ssoDomain := beego.AppConfig.String("call_domain")
+			api := ssoDomain + "/index/patientsign/" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + "/" + strconv.FormatInt(id, 10)
+			values := make(url.Values)
+			http.PostForm(api, values)
+		} ()
 	} else {
 		nextSchedule, _ := service.GetNextSchedule(adminUserInfo.Org.Id, endTime, id)
 		if len(nextSchedule) <= 0 {

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -80,6 +80,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	replacementRate, _ := this.GetFloat("replacement_rate")
 	displacementQuantity, _ := this.GetFloat("displacement_quantity")
 	ktv, _ := this.GetFloat("ktv")
+	fmt.Println("ktv -------------------", ktv)
 	symptom := this.GetString("symptom")
 	dispose := this.GetString("dispose")
 	conductivity, _ := this.GetFloat("conductivity")

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -13,7 +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/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")

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -841,6 +841,8 @@ func (this *NewDialysisApiController) GetlongDialysisrecord() {
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
 	dialysisrecord, total, err := service.GetlongDialysisrecord(patient.BloodId, startime, endtime, limit, page, orgid)
+	//获取当日患者的透后实际超滤量
+	//afterRecord, err := service.GetDialysAfterRecord(patient.BloodId, startime, endtime, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

service/patient_service.go

@@ -96,7 +96,7 @@ func GetPatientListBySchedules(orgID int64, syncTime int64) (patients []*models.
 }
 
 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)
+	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
 }

service/patientmanage_service.go

@@ -1445,3 +1445,23 @@ func AddPatientLapseto(lapseto *models.PatientLapseto) error {
 	err := XTWriteDB().Create(&lapseto).Error
 	return err
 }
+
+func GetDialysAfterRecord(patientid int64, startime int64, endtime int64, orgid int64) (dislysis []*models.XtAssessmentAfterDislysis, err error) {
+
+	db := XTReadDB().Model(&dislysis)
+	if startime > 0 {
+		db = db.Where("assessment_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("assessment_date <= ?", endtime)
+	}
+	if patientid > 0 {
+		db = db.Where("patient_id = ?", patientid)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Find(dislysis).Error
+
+	return dislysis, err
+}