12

.idea/.gitignore

@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 小程序
-httpport = 9529
+httpport = 9539
 runmode = prod
 
 #
@@ -113,7 +113,7 @@ writepatientuser = syh
 writepatientpass = xhPECP2nFObR8aUK
 writepatientname = sgj_cdm
 
-redishost = 349e580b2a524290.redis.rds.aliyuncs.com
+redishost = kuyi6666.redis.rds.aliyuncs.com
 redisport = 6379
 redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
 redisdb = 0

controllers/dialysis_api_controller.go

@@ -1348,7 +1348,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	remark := c.GetString("remark")
 	puncture_method := c.GetString("puncture_method")
 
-	dialysis_count:= c.GetString("dialysis_count")
+	dialysis_count := c.GetString("dialysis_count")
 	emergency_treatment, _ := c.GetInt64("emergency_treatment", 0)
 	emergency_treatment_other := c.GetString("emergency_treatment_other")
 	ductus_arantii := c.GetString("ductus_arantii")
@@ -2159,7 +2159,7 @@ func (c *DialysisApiController) CreateMonitor() {
 	operate_time, _ := c.GetInt64("operate_time", 0)
 	// monitoring_time := c.GetString("monitoring_time")
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
-	breathing_rated, _ := c.GetFloat("breathing_rated", 0)
+	// breathing_rated, _ := c.GetFloat("breathing_rated", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 	blood_pressure_type, _ := c.GetInt64("blood_pressure_type", 0)
@@ -2213,8 +2213,8 @@ func (c *DialysisApiController) CreateMonitor() {
 		DialysisOrderId: dialysis_order_id,
 		OperateTime:     operate_time,
 		// MonitoringTime:            monitoring_time,
-		PulseFrequency:            pulse_frequency,
-		BreathingRate:             breathing_rated,
+		PulseFrequency: pulse_frequency,
+		// BreathingRate:             breathing_rated,
 		SystolicBloodPressure:     systolic_blood_pressure,
 		DiastolicBloodPressure:    diastolic_blood_pressure,
 		BloodPressureType:         blood_pressure_type,

controllers/dialysis_record_api_controller.go

@@ -436,8 +436,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringDate:  monitorParam.MonitoringDate,
 			OperateTime:     monitorParam.OperateTime,
 			// MonitoringTime:         monitorParam.MonitoringTime,
-			PulseFrequency:              monitorParam.PulseFrequency,
-			BreathingRate:               monitorParam.BreathingRated,
+			PulseFrequency: monitorParam.PulseFrequency,
+			// BreathingRate:               monitorParam.BreathingRated,
 			SystolicBloodPressure:       monitorParam.SystolicBP,
 			DiastolicBloodPressure:      monitorParam.DiastolicBP,
 			BloodFlowVolume:             monitorParam.BloodFlowVolume,
@@ -514,7 +514,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 
 		monitor.OperateTime = monitorParam.OperateTime
 		monitor.PulseFrequency = monitorParam.PulseFrequency
-		monitor.BreathingRate = monitorParam.BreathingRated
+		// monitor.BreathingRate = monitorParam.BreathingRated
 		monitor.SystolicBloodPressure = monitorParam.SystolicBP
 		monitor.DiastolicBloodPressure = monitorParam.DiastolicBP
 		monitor.BloodFlowVolume = monitorParam.BloodFlowVolume
@@ -978,7 +978,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	if fmonitorRecords.ID > 0 && endmonitorRecords.ID > 0 {
 		tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		tempassessmentAfterDislysis.PulseFrequency = endmonitorRecords.PulseFrequency
-		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+		// tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		if adminUserInfo.CurrentOrgId == 10101 {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -717,7 +717,7 @@ func (c *CheckWeightApiController) SetSyncTime() {
 	if len(sn) > 0 {
 		redis := service.RedisClient()
 		defer redis.Close()
-		redis.Set(redis.Context(),sn, 0, 0)
+		redis.Set(sn, 0, 0)
 	}
 	serviceTime := time.Now().Unix()
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -734,13 +734,13 @@ func (c *CheckWeightApiController) GetPatientList() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	if len(sn) > 0 {
-		syncTimeStr, _ := redis.Get(redis.Context(),sn).Result()
+		syncTimeStr, _ := redis.Get(sn).Result()
 		syncTime, _ = strconv.ParseInt(syncTimeStr, 10, 64)
 	}
 
 	if ftype == 1 {
 		timeNow := time.Now().Unix()
-		redis.Set(redis.Context(),sn, timeNow, 0)
+		redis.Set(sn, timeNow, 0)
 	}
 
 	adminUserInfo := c.GetMobileAdminUserInfo()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -88,7 +88,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-	scheduals_json_str, _ := redis.Get(redis.Context(),key).Result()
+	scheduals_json_str, _ := redis.Get(key).Result()
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
@@ -102,7 +102,7 @@ func (this *DialysisAPIController) Scheduals() {
 				//缓存数据
 				scheduals_json, err := json.Marshal(scheduals)
 				if err == nil {
-					redis.Set(redis.Context(),key, scheduals_json, time.Second*60)
+					redis.Set(key, scheduals_json, time.Second*60)
 				}
 			}
 
@@ -148,7 +148,7 @@ func (this *DialysisAPIController) WaitingScheduals() {
 	// cur_date := time.Now().Format("2006-01-02")
 	key := "wait_scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
 
-	wait_scheduals, _ := redis.Get(redis.Context(),key).Result()
+	wait_scheduals, _ := redis.Get(key).Result()
 
 	if len(wait_scheduals) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetWaitingScheduals(orgID, date.Unix())
@@ -165,7 +165,7 @@ func (this *DialysisAPIController) WaitingScheduals() {
 				//缓存数据
 				wait_scheduals_json, err := json.Marshal(scheduals)
 				if err == nil {
-					redis.Set(redis.Context(),key, wait_scheduals_json, time.Second*30)
+					redis.Set(key, wait_scheduals_json, time.Second*30)
 				}
 			}
 
@@ -795,7 +795,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	weightReduce, _ := c.GetFloat("weight_loss", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
-	breathing_rate, _ := c.GetFloat("breathing_rate", 0)
+	// breathing_rate, _ := c.GetFloat("breathing_rate", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 	actual_ultrafiltration, _ := c.GetFloat("actual_ultrafiltration", 0)
@@ -808,7 +808,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	catheter := c.GetString("catheter")
 	complications := c.GetString("complication")
 	remark := c.GetString("remark")
-	dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
+	//dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
 
 	dialysis_intakes_unit, _ := c.GetInt64("dialysis_intakes_unit", 0)
 
@@ -893,27 +893,27 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	//_, evaluation := service.FindPredialysisEvaluationByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 
 	assessmentAfterDislysis := models.AssessmentAfterDislysis{
-		UserOrgId:                    adminUserInfo.Org.Id,
-		PatientId:                    id,
-		AssessmentDate:               recordDate.Unix(),
-		Temperature:                  temperature,
-		PulseFrequency:               pulse_frequency,
-		BreathingRate:                breathing_rate,
-		SystolicBloodPressure:        systolic_blood_pressure,
-		DiastolicBloodPressure:       diastolic_blood_pressure,
-		ActualUltrafiltration:        actual_ultrafiltration,
-		ActualDisplacement:           actual_displacement,
-		ActualTreatmentHour:          actualtreatHour,
-		ActualTreatmentMinute:        actualtreatmin,
-		WeightAfter:                  weightAfter,
-		AdditionalWeight:             additionalWeight,
-		WeightLoss:                   weightReduce,
-		Cruor:                        cruor,
-		SymptomAfterDialysis:         symptomsAfterDialysi,
-		InternalFistula:              internalFistula,
-		Catheter:                     catheter,
-		Complication:                 complications,
-		DialysisIntakes:              dialysateVolume,
+		UserOrgId:      adminUserInfo.Org.Id,
+		PatientId:      id,
+		AssessmentDate: recordDate.Unix(),
+		Temperature:    temperature,
+		PulseFrequency: pulse_frequency,
+		// BreathingRate:          breathing_rate,
+		SystolicBloodPressure:  systolic_blood_pressure,
+		DiastolicBloodPressure: diastolic_blood_pressure,
+		ActualUltrafiltration:  actual_ultrafiltration,
+		ActualDisplacement:     actual_displacement,
+		ActualTreatmentHour:    actualtreatHour,
+		ActualTreatmentMinute:  actualtreatmin,
+		WeightAfter:            weightAfter,
+		AdditionalWeight:       additionalWeight,
+		WeightLoss:             weightReduce,
+		Cruor:                  cruor,
+		SymptomAfterDialysis:   symptomsAfterDialysi,
+		InternalFistula:        internalFistula,
+		Catheter:               catheter,
+		Complication:           complications,
+		//DialysisIntakes:              dialysateVolume,
 		CreatedTime:                  time.Now().Unix(),
 		Status:                       1,
 		Remark:                       remark,
@@ -1486,7 +1486,7 @@ func (c *DialysisAPIController) Finish() {
 
 		tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		tempassessmentAfterDislysis.PulseFrequency = endmonitorRecords.PulseFrequency
-		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+		// tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
@@ -1943,7 +1943,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		if errcode == nil {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
-			record.BreathingRate = befor.BreathingRate
+			// record.BreathingRate = befor.BreathingRate
 			record.PulseFrequency = befor.PulseFrequency
 			record.Temperature = befor.Temperature
 		}
@@ -3293,7 +3293,7 @@ func (this *DialysisAPIController) GetDialysisSchedule() {
 		//缓存数据
 		scheduals_json, err := json.Marshal(scheduals)
 		if err == nil {
-			redis.Set(redis.Context(),key, scheduals_json, time.Second*30)
+			redis.Set(key, scheduals_json, time.Second*30)
 		}
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -4550,7 +4550,7 @@ func (c *DialysisAPIController) UpdateStockGoods() {
 	return
 }
 
-//当前数据比上一次出库数据少
+// 当前数据比上一次出库数据少
 func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, creater int64, count int64) (err error) {
 
 	fmt.Println("w我的中国馆公共区发电房阿道夫安抚安抚安抚安抚安抚安抚阿道夫阿道夫阿凡达阿道夫a", count)
@@ -4605,7 +4605,7 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 	return nil
 }
 
-//耗材出库删除
+// 耗材出库删除
 func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
 	fmt.Println("count2323223884584854854854u5454785487547845785478758487545475475487,count", count)
@@ -4929,7 +4929,7 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 	return nil
 }
 
-//耗材出库删除
+// 耗材出库删除
 func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut) (err error) {
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockOne(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time)

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -61,7 +61,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	fmt.Println(operateTime)
 
 	pulseFrequency, _ := this.GetFloat("pulse_frequency")
-	breathingRated, _ := this.GetFloat("breathing_rated")
+	// breathingRated, _ := this.GetFloat("breathing_rated")
 	systolicBP, _ := this.GetFloat("systolic_bp")
 	diastolicBP, _ := this.GetFloat("diastolic_bp")
 	BPType, _ := this.GetInt("bp_type")
@@ -119,8 +119,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		MonitoringDate:  date,
 		OperateTime:     operateTime,
 		// MonitoringTime:            recordTime,
-		PulseFrequency:              pulseFrequency,
-		BreathingRate:               breathingRated,
+		PulseFrequency: pulseFrequency,
+		// BreathingRate:               breathingRated,
 		SystolicBloodPressure:       systolicBP,
 		DiastolicBloodPressure:      diastolicBP,
 		BloodPressureType:           int64(BPType),
@@ -227,7 +227,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 		operateTime = 0
 	}
 	pulseFrequency, _ := this.GetFloat("pulse_frequency")
-	breathingRated, _ := this.GetFloat("breathing_rated")
+	// breathingRated, _ := this.GetFloat("breathing_rated")
 	systolicBP, _ := this.GetFloat("systolic_bp")
 	diastolicBP, _ := this.GetFloat("diastolic_bp")
 	BPType, _ := this.GetInt("bp_type")
@@ -282,7 +282,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.MonitoringDate = date
 	monitor.OperateTime = operateTime
 	monitor.PulseFrequency = pulseFrequency
-	monitor.BreathingRate = breathingRated
+	// monitor.BreathingRate = breathingRated
 	monitor.SystolicBloodPressure = systolicBP
 	monitor.DiastolicBloodPressure = diastolicBP
 	monitor.BloodPressureType = int64(BPType)

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -125,7 +125,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//redis key值
 			key := "purviews_" + strconv.FormatInt(adminUserInfo.Org.Id, 10) + strconv.FormatInt(adminUserInfo.AdminUser.Id, 10)
-			purviews_json_str, _ := redis.Get(redis.Context(),key).Result()
+			purviews_json_str, _ := redis.Get(key).Result()
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
 			var userRolePurviewsArr []string
@@ -149,7 +149,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 				//缓存数据
 				purview_json, err := json.Marshal(userRolePurviewsArr)
 				if err == nil {
-					redis.Set(redis.Context(),key, purview_json, time.Minute*60*60*24)
+					redis.Set(key, purview_json, time.Minute*60*60*24)
 				}
 			} else {
 				var dat []string

controllers/mobile_api_controllers/qiniiu_api_controller.go

@@ -14,7 +14,7 @@ func (c *QiNiuApiController) GetQNUpToken() {
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
 
-	token, err := redisClient.Get(redisClient.Context(),"qn_token").Result()
+	token, err := redisClient.Get("qn_token").Result()
 	if err != nil {
 		defer fmt.Println(err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGetQiniuUpToken)

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -40,7 +40,7 @@ func (this *ForgetPwdController) ModifyPassword() {
 		// 修改成功后验证码就要使其失效
 		redisClient := service.RedisClient()
 		defer redisClient.Close()
-		redisClient.Del(redisClient.Context(),"code_msg_" + mobile)
+		redisClient.Del("code_msg_" + mobile)
 
 		ip := utils.GetIP(this.Ctx.Request)
 		ssoDomain := beego.AppConfig.String("sso_domain")
@@ -252,7 +252,7 @@ func (this *ForgetPwdController) checkParams(mobile string, code string, passwor
 	}
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
-	cache_code, _ := redisClient.Get(redisClient.Context(),"code_msg_" + mobile).Result()
+	cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
 	if cache_code != code {
 		return &enums.SGJError{Code: enums.ErrorCodeVerificationCodeWrong}
 	}

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -634,7 +634,7 @@ func (this *HomeController) ModifyPsw() {
 		// 修改成功后验证码就要使其失效
 		redisClient := service.RedisClient()
 		defer redisClient.Close()
-		redisClient.Del(redisClient.Context(),"code_msg_" + mobile)
+		redisClient.Del("code_msg_" + mobile)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"admin": adminUser,
 		})
@@ -657,7 +657,7 @@ func (this *HomeController) checkParam(mobile string, code string, password stri
 	}
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
-	cache_code, _ := redisClient.Get(redisClient.Context(),"code_msg_" + mobile).Result()
+	cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
 	if cache_code != code {
 		return &enums.SGJError{Code: enums.ErrorCodeVerificationCodeWrong}
 	}

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -74,7 +74,7 @@ func (this *MobileRegistController) RegistSubmit() {
 
 		redisClient := service.RedisClient()
 		defer redisClient.Close()
-		cache_code, _ := redisClient.Get(redisClient.Context(),"code_msg_" + mobile).Result()
+		cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
 		if cache_code != code {
 			//this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeVerificationCodeWrong)
 			//this.ServeJSON()
@@ -90,7 +90,7 @@ func (this *MobileRegistController) RegistSubmit() {
 			this.Ctx.SetCookie("mobile", mobile)
 			this.SetSession("mobile_admin_user", admin)
 			// 注册成功后验证码就要使其失效
-			redisClient.Del(redisClient.Context(),"code_msg_" + mobile)
+			redisClient.Del("code_msg_" + mobile)
 
 			this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
 				"result": true,

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -20,9 +20,9 @@ func (this *NewDialysisApiController) GetCodeInit() {
 	req := this.Ctx.Request
 	addr := utils.GetIP(req)
 	cur_time := time.Now().Format("2006-01-02")
-	_, err := redisClient.Get(redisClient.Context(),"ip:host_" + cur_time + "_" + addr).Result()
+	_, err := redisClient.Get("ip:host_" + cur_time + "_" + addr).Result()
 	if err != nil {
-		redisClient.Set(redisClient.Context(),"ip:host_"+cur_time+"_"+addr, 0, time.Second*24*60*60)
+		redisClient.Set("ip:host_"+cur_time+"_"+addr, 0, time.Second*24*60*60)
 	}
 	//将客户端的ip加密传给前端，作为短信验证的密钥，来验证短信发送的IP地址
 	aespass := utils.AESEncrypt(addr)

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -136,9 +136,9 @@ func (this *NewLoginApiController) GetCodeInit() {
 	req := this.Ctx.Request
 	addr := utils.GetIP(req)
 	cur_time := time.Now().Format("2006-01-02")
-	_, err := redisClient.Get(redisClient.Context(),"ip:host_" + cur_time + "_" + addr).Result()
+	_, err := redisClient.Get("ip:host_" + cur_time + "_" + addr).Result()
 	if err != nil {
-		redisClient.Set(redisClient.Context(),"ip:host_"+cur_time+"_"+addr, 0, time.Second*24*60*60)
+		redisClient.Set("ip:host_"+cur_time+"_"+addr, 0, time.Second*24*60*60)
 	}
 	//将客户端的ip加密传给前端，作为短信验证的密钥，来验证短信发送的IP地址
 	aespass := utils.AESEncrypt(addr)
@@ -378,7 +378,7 @@ func (this *NewLoginApiController) LoginByCs() {
 
 		redisClient := service.RedisClient()
 		defer redisClient.Close()
-		cachedCode, err := redisClient.Get(redisClient.Context(),"code_msg_" + mobile).Result()
+		cachedCode, err := redisClient.Get("code_msg_" + mobile).Result()
 
 		if err != nil {
 			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeAccountOrVerCodeWrong)
@@ -486,7 +486,7 @@ func (this *NewLoginApiController) LoginByCs() {
 						TemplateInfo: &templateInfo,
 					}
 					this.SetSession("mobile_admin_user_info", mobileAdminUserInfo)
-					redisClient.Del(redisClient.Context(),"code_msg_" + mobile)
+					redisClient.Del("code_msg_" + mobile)
 
 					mobile = mobile + "-" + strconv.FormatInt(org.Id, 10) + "-" + strconv.FormatInt(appRole.Id, 10)
 					token := utils.GenerateLoginToken(mobile)

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -568,7 +568,7 @@ func (this *NewRoleApiController) EditFunctionPermission() {
 	users := service.GetAllUserRole(adminUser.Org.Id)
 	for _, item := range users {
 		key := "purviews_" + strconv.FormatInt(adminUser.Org.Id, 10) + strconv.FormatInt(item.AdminUserId, 10)
-		redis.Set(redis.Context(),key, "", time.Second)
+		redis.Set(key, "", time.Second)
 	}
 
 	if err != nil {

controllers/patient_api_controller.go

@@ -76,7 +76,7 @@ func PatientApiRegistRouters() {
 
 }
 
-//GetPatientsList 取患者列表
+// GetPatientsList 取患者列表
 func (c *PatientApiController) GetPatientsList() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
@@ -138,7 +138,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 }
 
-//GetPatientTotal
+// GetPatientTotal
 func (c *PatientApiController) GetPatientTotal() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -163,7 +163,7 @@ func (c *PatientApiController) GetPatientsAllList() {
 	return
 }
 
-//GenerateDialysisNo 生成透析号
+// GenerateDialysisNo 生成透析号
 func (c *PatientApiController) GenerateDialysisNo() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -187,7 +187,7 @@ func (c *PatientApiController) GenerateDialysisNo() {
 	return
 }
 
-//CreatePatient 创建患者
+// CreatePatient 创建患者
 func (c *PatientApiController) CreatePatient() {
 	record_date := c.GetString("record_date")
 	is_infectious, _ := c.GetInt64("is_infectious")
@@ -413,7 +413,7 @@ func (c *PatientApiController) CreatePatient() {
 
 	redis := service.RedisClient()
 	defer redis.Close()
-	redis.SAdd(redis.Context(),"sgj_patient:new_user_set", patient.UserId)
+	redis.SAdd("sgj_patient:new_user_set", patient.UserId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
@@ -421,7 +421,7 @@ func (c *PatientApiController) CreatePatient() {
 	return
 }
 
-//EditPatient 修改
+// EditPatient 修改
 func (c *PatientApiController) EditPatient() {
 	id, _ := c.GetInt64("id", 0)
 
@@ -985,7 +985,7 @@ func (c *PatientApiController) DeleteDialysisSolution() {
 	return
 }
 
-//GetDryWeights 取患者干体重调整铺
+// GetDryWeights 取患者干体重调整铺
 func (c *PatientApiController) GetDryWeights() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
@@ -2450,7 +2450,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	return
 }
 
-//GetDoctorAdvices 医嘱列表
+// GetDoctorAdvices 医嘱列表
 func (c *PatientApiController) GetDoctorAdvices() {
 	id, _ := c.GetInt64("id", 0)
 	adviceType, _ := c.GetInt64("advice_type", 0)

controllers/qiniiu_api_controller.go

@@ -21,7 +21,7 @@ func (c *QiNiuApiController) GetQNUpToken() {
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
 
-	token, err := redisClient.Get(redisClient.Context(),"qn_token").Result()
+	token, err := redisClient.Get("qn_token").Result()
 	fmt.Print("token------------------------------------", token)
 	if err != nil {
 		defer fmt.Println(err)

controllers/role_controller.go

@@ -750,7 +750,7 @@ func (this *RoleAPIController) EditPurview() {
 	users := service.GetAllUserRole(adminUserInfo.CurrentOrgId)
 	for _, item := range users {
 		key := "purviews_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + strconv.FormatInt(item.AdminUserId, 10)
-		redis.Set(redis.Context(),key, "", time.Second)
+		redis.Set(key, "", time.Second)
 	}
 
 	err := service.SaveRolePurviewIds(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, roleId, purviewIds)
@@ -898,7 +898,7 @@ func (this *RoleAPIController) AddAdminInitData() {
 
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
-	qntoken, _ := redisClient.Get(redisClient.Context(),"qn_token").Result()
+	qntoken, _ := redisClient.Get("qn_token").Result()
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"roles":           roles,
@@ -1108,7 +1108,7 @@ func (this *RoleAPIController) EditAdminInitData() {
 
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
-	qntoken, _ := redisClient.Get(redisClient.Context(),"qn_token").Result()
+	qntoken, _ := redisClient.Get("qn_token").Result()
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"admin":           appRole,

controllers/schedule_api_controller.go

@@ -370,7 +370,7 @@ func (c *ScheduleApiController) CreateSchedule() {
 	err = service.CreateSchedule(&schedule)
 
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
-	redis.Set(redis.Context(),key, "", time.Second)
+	redis.Set(key, "", time.Second)
 
 	fmt.Println(err)
 	if err != nil {

controllers/sign_weigh_api_controller.go

@@ -383,16 +383,16 @@ func (c *SignWeighAPIController) EditData() {
 	dry_weight, _ := c.GetFloat("dry_weight", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
-	breathing_rate, _ := c.GetFloat("breathing_rate", 0)
+	// breathing_rate, _ := c.GetFloat("breathing_rate", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 
 	assessmentafterdislysis := &models.AssessmentAfterDislysis{
-		WeightAfter:            weight_after,
-		DryWeight:              dry_weight,
-		Temperature:            temperature,
-		PulseFrequency:         pulse_frequency,
-		BreathingRate:          breathing_rate,
+		WeightAfter:    weight_after,
+		DryWeight:      dry_weight,
+		Temperature:    temperature,
+		PulseFrequency: pulse_frequency,
+		// BreathingRate:          breathing_rate,
 		SystolicBloodPressure:  systolic_blood_pressure,
 		DiastolicBloodPressure: diastolic_blood_pressure,
 	}

controllers/verify_login_controller.go

@@ -408,7 +408,7 @@ func (this *PersonAPIController) ModifyPwd() {
 
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
-	cachedCode, err := redisClient.Get(redisClient.Context(),"xt_modify_pwd_" + mobile).Result()
+	cachedCode, err := redisClient.Get("xt_modify_pwd_" + mobile).Result()
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAccountOrVerCodeWrong)
 		return
@@ -425,7 +425,7 @@ func (this *PersonAPIController) ModifyPwd() {
 	}
 
 	// 清除验证码
-	redisClient.Del(redisClient.Context(),"xt_modify_pwd_" + mobile)
+	redisClient.Del("xt_modify_pwd_" + mobile)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "密码已修改",
 	})

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"github.com/shopspring/decimal"
 	"strconv"
 	"time"
 )
@@ -17,24 +18,36 @@ func XcxApiControllersRegisterRouters() {
 	////传送codeinit
 	beego.Router("/xcx/m/api/code", &XcxApiController{}, "Get:GetCodeInit")
 	//获取验证码
-	beego.Router("/xcx/api/mobile/code", &XcxApiController{}, "Get:GetCodeInfo")
+	beego.Router("/xcx/api/mobile/code", &XcxApiController{}, "Post:GetCodeInfo")
 	//用户绑定
 	beego.Router("/xcx/api/mobile/register", &XcxApiController{}, "Get:GetUserNameRegister")
-	//登录
+	//手机号登录
 	beego.Router("/xcx/api/mobile/login", &XcxApiController{}, "Get:GetLoginInfor")
 
+	//openid登录
+	beego.Router("/xcx/api/openid/login", &XcxApiController{}, "Get:GetLoginInfoByOpenid")
+
 	//获取二维码信息
 	beego.Router("/xcx/api/mobile/patient", &XcxApiController{}, "Get:GetPatientList")
 
 	//获取登录后的信息
 	beego.Router("/xcx/api/mobile/getdatainfo", &XcxApiController{}, "Get:GetDataInfo")
 
+	//获取排班数据
+	beego.Router("/xcx/api/mobile/schedulebyweek", &XcxApiController{}, "Post:GetSchedulesByWeek")
+
 	//获取排班数据
 	beego.Router("/xcx/api/mobile/schedule", &XcxApiController{}, "Get:GetScheduleInfo")
 
 	//获取透析记录
 	beego.Router("/xcx/api/mobile/dialysis", &XcxApiController{}, "Get:GetMobileSchedule")
 
+	//获取体重纪录
+	beego.Router("/xcx/api/mobile/signweight", &XcxApiController{}, "Get:GetSignsByWeight")
+
+	//获取血压纪录
+	beego.Router("/xcx/api/mobile/signblood", &XcxApiController{}, "Get:GetSignsByBlood")
+
 	//获取患者的电子病历
 	beego.Router("/xcx/api/mobile/getpatientinfo", &XcxApiController{}, "Get:GetPatientInfo")
 
@@ -56,9 +69,12 @@ func XcxApiControllersRegisterRouters() {
 	//获取数据字典数据
 	beego.Router("/xcx/api/mobile/getdataconfig", &XcxApiController{}, "Get:GetDataConfig")
 
-	//检验检查
+	//检验检查列表
 	beego.Router("/xcx/api/mobile/getinspectionlist", &XcxApiController{}, "Get:GetInspectionList")
 
+	//检验检查详情
+	beego.Router("/xcx/api/mobile/getinspectioninfo", &XcxApiController{}, "Get:GetInspectionInfo")
+
 	//肾有杯
 	beego.Router("/xcx/api/mobile/getarticlist", &XcxApiController{}, "Get:GetArticList")
 
@@ -68,26 +84,108 @@ func XcxApiControllersRegisterRouters() {
 
 	//获取appid
 	beego.Router("/xcx/api/mobile/getappid", &XcxApiController{}, "Get:GetAppId")
+
+	// 获取充值当前余额信息
+	beego.Router("/xcx/api/mobile/getbalance", &XcxApiController{}, "Get:IdToBalance")
+
+	// 获取一段时间内
+	beego.Router("/xcx/api/mobile/getbalanceinfo", &XcxApiController{}, "Get:DepositFlow")
 }
 
 type XcxApiController struct {
 	mobile_api_controllers.MobileBaseAPIController
 }
 
+// 根据id获取押金流水
+func (this *XcxApiController) DepositFlow() {
+	orgid, _ := this.GetInt64("org_id", 0)
+	patient_id, _ := this.GetInt64("patient_id", 0) //患者id
+	//获取当前患者的姓名
+	tmp, _ := service.GetHisUserName(orgid, patient_id)
+	name := tmp.Name
+
+	start_time := this.GetString("start_time", "") //开始时间
+	end_time := this.GetString("end_time", "")     //结束时间
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+	if start_time == "" || end_time == "" {
+		//如果为空则查全部的
+		stime, etime = service.GetMonth()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	////获取该角色当前时间段的余额
+	//decimal := service.GetMoneyforTime(id, orgid, etime)
+	//获取列表
+	deposirhistory, errs := service.GetFlowList(patient_id, orgid, stime, etime)
+	if errs != nil {
+		utils.ErrorLog("获取列表失败，原因为:", errs.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+	var expenditure, recharge decimal.Decimal
+
+	for i := 0; i < len(deposirhistory); i++ {
+		//如果为扣费，或退费 则把订单id变为就诊号
+		if deposirhistory[i].DepositStatus == 1 || deposirhistory[i].DepositStatus == 3 || deposirhistory[i].DepositStatus == 4 {
+			recharge = recharge.Add(deposirhistory[i].Deposit)
+		}
+
+		if deposirhistory[i].DepositStatus == 2 {
+			expenditure = expenditure.Add(deposirhistory[i].Deposit)
+		}
+
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":        deposirhistory,
+		"name":        name,
+		"start_time":  time.Unix(stime, 0).Format("2006-01-02"),
+		"end_time":    time.Unix(etime, 0).Format("2006-01-02"),
+		"expenditure": expenditure,
+		"recharge":    recharge,
+	})
+	return
+}
+
+// 根据患者id查询患者的余额
+func (this *XcxApiController) IdToBalance() {
+
+	orgid, _ := this.GetInt64("org_id", 0)
+	his_patient_id, _ := this.GetInt64("patient_id", 0)
+	if orgid <= 0 || his_patient_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"error_code": 1001,
+			"error_msg":  "参数错误",
+		})
+	}
+	balance := service.GetUserMoney(his_patient_id, orgid)
+	patient, _ := service.GetPatientByIdXcx(his_patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"balance": balance,
+		"patient": patient,
+	})
+	return
+}
+
 func (this *XcxApiController) GetCodeInit() {
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
 	req := this.Ctx.Request
 	addr := utils.GetIP(req)
 	cur_time := time.Now().Format("2006-01-02")
-	_, err := redisClient.Get(redisClient.Context(),"ip:host_" + cur_time + "_" + addr).Result()
+	_, err := redisClient.Get("ip:host_" + cur_time + "_" + addr).Result()
 	if err != nil {
-		redisClient.Set(redisClient.Context(),"ip:host_"+cur_time+"_"+addr, 0, time.Second*24*60*60)
+		redisClient.Set("ip:host_"+cur_time+"_"+addr, 0, time.Second*24*60*60)
 	}
 	//将客户端的ip加密传给前端，作为短信验证的密钥，来验证短信发送的IP地址
 	aespass := utils.AESEncrypt(addr)
 
-	fmt.Println("hhhhhhh3223323232332", aespass)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"aespass": aespass,
 	})
@@ -95,65 +193,94 @@ func (this *XcxApiController) GetCodeInit() {
 }
 
 func (this *XcxApiController) GetUserNameRegister() {
-	name := this.GetString("name")
+	// name := this.GetString("name")
+	// relationship := this.GetString("relationship")
 	id_card_no := this.GetString("id_card_no")
 	mobile := this.GetString("mobile")
-	patient, errcodes := service.GetNamePatient(name, id_card_no)
+	// code := this.GetString("code")
+	openid := this.GetString("openid")
+
+	if len(mobile) == 0 || len(openid) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	// redisClient := service.RedisClient()
+	// defer redisClient.Close()
+	// cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
+	// utils.TraceLog("cache_code:%v code:%v", cache_code, code)
+	// if cache_code != code {
+	// 	this.ServeSuccessJSON(map[string]interface{}{
+	// 		"err_code": "1001",
+	// 		"err_msg":  "验证码错误",
+	// 	})
+	// 	return
+	// }
+
+	// this.Ctx.SetCookie("mobile", mobile)
+	// // 注册成功后验证码就要使其失效
+	// redisClient.Del("code_msg_" + mobile)
+
+	patient, errcodes := service.GetPatientByIdcardno(id_card_no)
 	if errcodes == nil {
 		role := models.XcxAdminUserRole{
-			PatientName: name,
-			IdCardNo:    id_card_no,
-			Mobile:      mobile,
-			Code:        "000000",
-			PatientId:   patient.ID,
-			UserOrgId:   patient.UserOrgId,
-			Status:      1,
-			Ctime:       time.Now().Unix(),
-			Mtime:       0,
-			Appid:       "",
-			Appsecret:   "",
-			SessionKey:  "",
+			PatientName: patient.Name,
+			// Relationship: relationship,
+			IdCardNo: id_card_no,
+			Mobile:   mobile,
+			// Code:         code,
+			PatientId:  patient.ID,
+			UserOrgId:  patient.UserOrgId,
+			Status:     1,
+			Ctime:      time.Now().Unix(),
+			Mtime:      0,
+			Appid:      "",
+			Appsecret:  "",
+			SessionKey: "",
+			Openid:     openid,
 		}
 		err := service.CreateXcxAdminUser(role)
 		if err == nil {
-			mobilePatient, _ := service.GetNamePatient(name, id_card_no)
-			template_id, _ := service.GetTemplateMode(mobilePatient.UserOrgId)
-				//处方
-			prescripition_config, _ := service.GetPrescripionFieldConfig(mobilePatient.UserOrgId)
-
-				//接诊评估
-			receive_treatement_config, _ := service.GetReceiveTreatmentAssess(mobilePatient.UserOrgId)
-
-				//透前评估
-			dialysis_befor, _ := service.GetDialysisBefor(mobilePatient.UserOrgId)
-
-				//透析上机
-			dialysis_order, _ := service.GetDialysisOrderConfig(mobilePatient.UserOrgId)
-
-				//透析监测
-			monitor_record, _ := service.GetMonitorRecordConfig(mobilePatient.UserOrgId)
-
-				//透后评估
-			dialysis_after, _ := service.GetDialysisAfeterConfig(mobilePatient.UserOrgId)
-
-			treate_ment, _ := service.GetTreatMentConfig(mobilePatient.UserOrgId)
-			var configList interface{}
-			configList, _ = service.GetConfigList(mobilePatient.UserOrgId)
+			//mobilePatient, _ := service.GetNamePatient(name, id_card_no)
+			//template_id, _ := service.GetTemplateMode(mobilePatient.UserOrgId)
+			////处方
+			//prescripition_config, _ := service.GetPrescripionFieldConfig(mobilePatient.UserOrgId)
+			//
+			////接诊评估
+			//receive_treatement_config, _ := service.GetReceiveTreatmentAssess(mobilePatient.UserOrgId)
+			//
+			////透前评估
+			//dialysis_befor, _ := service.GetDialysisBefor(mobilePatient.UserOrgId)
+			//
+			////透析上机
+			//dialysis_order, _ := service.GetDialysisOrderConfig(mobilePatient.UserOrgId)
+			//
+			////透析监测
+			//monitor_record, _ := service.GetMonitorRecordConfig(mobilePatient.UserOrgId)
+			//
+			////透后评估
+			//dialysis_after, _ := service.GetDialysisAfeterConfig(mobilePatient.UserOrgId)
+			//
+			//treate_ment, _ := service.GetTreatMentConfig(mobilePatient.UserOrgId)
+			//var configList interface{}
+			//configList, _ = service.GetConfigList(mobilePatient.UserOrgId)
 			this.ServeSuccessJSON(map[string]interface{}{
-					"role":                      role,
-					"is_bind":                   true,
-					"patient":                   mobilePatient,
-					"template_id":               template_id,
-					"user_org_id":               mobilePatient.UserOrgId,
-					"prescripition_config":      prescripition_config,
-					"receive_treatement_config": receive_treatement_config,
-					"dialysis_befor":            dialysis_befor,
-					"dialysis_order":            dialysis_order,
-					"monitor_record":            monitor_record,
-					"dialysis_after":            dialysis_after,
-					"treate_ment":               treate_ment,
-					"configList":                configList,
-					"result":                    false,
+				"role":     role,
+				"is_bind":  true,
+				"err_code": "0",
+				"err_msg":  "",
+				//"patient":                   mobilePatient,
+				//"template_id":               template_id,
+				"user_org_id": patient.UserOrgId,
+				//"prescripition_config":      prescripition_config,
+				//"receive_treatement_config": receive_treatement_config,
+				//"dialysis_befor":            dialysis_befor,
+				//"dialysis_order":            dialysis_order,
+				//"monitor_record":            monitor_record,
+				//"dialysis_after":            dialysis_after,
+				//"treate_ment":               treate_ment,
+				//"configList":                configList,
+				//"result":                    false,
 			})
 		} else {
 			this.ServeSuccessJSON(map[string]interface{}{
@@ -165,7 +292,7 @@ func (this *XcxApiController) GetUserNameRegister() {
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"is_bind": false,
-			"msg":     "绑定失败",
+			"msg":     "绑定失败,没有对应的患者信息",
 			"result":  false,
 		})
 	}
@@ -307,7 +434,7 @@ func (this *XcxApiController) GetUserRegister() {
 	} else {
 		redisClient := service.RedisClient()
 		defer redisClient.Close()
-		cache_code, _ := redisClient.Get(redisClient.Context(),"code_msg_" + mobile).Result()
+		cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
 		fmt.Println("cache_code9999999293323232322323", cache_code)
 		if cache_code != code {
 			this.ServeSuccessJSON(map[string]interface{}{
@@ -317,7 +444,7 @@ func (this *XcxApiController) GetUserRegister() {
 		} else {
 			this.Ctx.SetCookie("mobile", mobile)
 			// 注册成功后验证码就要使其失效
-			redisClient.Del(redisClient.Context(),"code_msg_" + mobile)
+			redisClient.Del("code_msg_" + mobile)
 			patient, errcodes := service.GetMobilePatient(mobile, id_card_no)
 			fmt.Println("errcodes2323232232", errcodes)
 			if errcodes == nil {
@@ -445,7 +572,9 @@ func (this *XcxApiController) GetCodeInfo() {
 
 	mobile := this.GetString("phone")
 	aespass := this.GetString("aespass")
+
 	utils.TraceLog("mobile:%v aespass:%v", mobile, aespass)
+
 	if utils.CellPhoneRegexp().MatchString(mobile) == false {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeMobileFormat)
 		this.ServeJSON()
@@ -466,91 +595,50 @@ func (this *XcxApiController) GetCodeInfo() {
 	})
 }
 
-func (this *XcxApiController) GetLoginInfor() {
+func (this *XcxApiController) GetLoginInfoByOpenid() {
+	openid := this.GetString("openid")
+	user_admin, errcodes := service.GetXcxOpneidInformation(openid)
+	if errcodes == gorm.ErrRecordNotFound {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient":     "",
+			"patient_id":  0,
+			"user_org_id": 0,
+			"role":        user_admin,
+			"is_bind":     false,
+		})
+	} else if errcodes == nil {
+		info, _ := service.GetPatientListByPatientId(user_admin.PatientId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient":     info,
+			"role":        user_admin,
+			"is_bind":     true,
+			"user_org_id": info.UserOrgId,
+			"patient_id":  user_admin.PatientId,
+		})
+	}
+}
 
+func (this *XcxApiController) GetLoginInfor() {
 	mobile := this.GetString("mobile")
-	fmt.Println(mobile)
 	user_admin, errcodes := service.GetXcxMobileInformation(mobile)
 	if errcodes == gorm.ErrRecordNotFound {
-		info, _ := service.GetMobilePatientInfo(mobile)
-		template_id, _ := service.GetTemplateMode(info.UserOrgId)
-		//处方
-		prescripition_config, _ := service.GetPrescripionFieldConfig(info.UserOrgId)
-
-		//接诊评估
-		receive_treatement_config, _ := service.GetReceiveTreatmentAssess(info.UserOrgId)
-
-		//透前评估
-		dialysis_befor, _ := service.GetDialysisBefor(info.UserOrgId)
-
-		//透析上机
-		dialysis_order, _ := service.GetDialysisOrderConfig(info.UserOrgId)
-
-		//透析监测
-		monitor_record, _ := service.GetMonitorRecordConfig(info.UserOrgId)
-
-		//透后评估
-		dialysis_after, _ := service.GetDialysisAfeterConfig(info.UserOrgId)
-
-		treate_ment, _ := service.GetTreatMentConfig(info.UserOrgId)
-		var configList interface{}
-		configList, _ = service.GetConfigList(info.UserOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"patient":                   info,
-			"template_id":               template_id,
-			"user_org_id":               info.UserOrgId,
-			"prescripition_config":      prescripition_config,
-			"receive_treatement_config": receive_treatement_config,
-			"dialysis_befor":            dialysis_befor,
-			"dialysis_order":            dialysis_order,
-			"monitor_record":            monitor_record,
-			"dialysis_after":            dialysis_after,
-			"treate_ment":               treate_ment,
-			"role":                      user_admin,
-			"is_bind":                   false,
-			"list":                      configList,
+			"patient":     "",
+			"patient_id":  0,
+			"user_org_id": 0,
+			"role":        user_admin,
+			"is_bind":     false,
 		})
 	} else if errcodes == nil {
 		info, _ := service.GetPatientListByPatientId(user_admin.PatientId)
-		template_id, _ := service.GetTemplateMode(info.UserOrgId)
-		//处方
-		prescripition_config, _ := service.GetPrescripionFieldConfig(info.UserOrgId)
-
-		//接诊评估
-		receive_treatement_config, _ := service.GetReceiveTreatmentAssess(info.UserOrgId)
-
-		//透前评估
-		dialysis_befor, _ := service.GetDialysisBefor(info.UserOrgId)
-
-		//透析上机
-		dialysis_order, _ := service.GetDialysisOrderConfig(info.UserOrgId)
-
-		//透析监测
-		monitor_record, _ := service.GetMonitorRecordConfig(info.UserOrgId)
-
-		//透后评估
-		dialysis_after, _ := service.GetDialysisAfeterConfig(info.UserOrgId)
-
-		treate_ment, _ := service.GetTreatMentConfig(info.UserOrgId)
-		var configList interface{}
-		configList, _ = service.GetConfigList(info.UserOrgId)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"patient":                   info,
-			"role":                      user_admin,
-			"is_bind":                   true,
-			"template_id":               template_id,
-			"user_org_id":               info.UserOrgId,
-			"prescripition_config":      prescripition_config,
-			"receive_treatement_config": receive_treatement_config,
-			"dialysis_befor":            dialysis_befor,
-			"dialysis_order":            dialysis_order,
-			"monitor_record":            monitor_record,
-			"dialysis_after":            dialysis_after,
-			"treate_ment":               treate_ment,
-			"list":                      configList,
+			"patient":     info,
+			"role":        user_admin,
+			"is_bind":     true,
+			"user_org_id": info.UserOrgId,
+			"patient_id":  user_admin.PatientId,
 		})
 	}
-
 }
 
 func (this *XcxApiController) GetPatientList() {
@@ -592,7 +680,217 @@ func (this *XcxApiController) GetDataInfo() {
 	})
 }
 
+func (this *XcxApiController) GetSignsByBlood() {
+	start := this.GetString("start", "")
+	end := this.GetString("end", "")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	if len(start) <= 0 || len(end) <= 0 || patient_id <= 0 || org_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "缺少参数",
+			"data":     "",
+		})
+	}
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation("2006-01-02", start, loc)
+	startTimeUnix := startTime.Unix()
+	endTime, _ := time.ParseInLocation("2006-01-02", end, loc)
+	endTimeUinx := endTime.Unix()
+
+	utils.TraceLog("startTime:%v endTime:%v", startTime, endTime)
+	utils.TraceLog("startTimeUnix:%v endTimeUinx:%v", startTimeUnix, endTimeUinx)
+	if startTimeUnix < 0 || endTimeUinx < 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间超出范围",
+			"data":     "",
+		})
+	}
+	if startTimeUnix > endTimeUinx {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "开始时间大于结束时间",
+			"data":     "",
+		})
+	}
+
+	if endTimeUinx-startTimeUnix > 60*60*24*60 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间范围超过60天",
+			"data":     "",
+		})
+	}
+
+	beforeblood, _ := service.GetSignsByBlood(org_id, startTimeUnix, endTimeUinx, patient_id)
+	afterblood, _ := service.GetSignsByAfterBlood(org_id, startTimeUnix, endTimeUinx, patient_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"err_code":     0,
+		"err_msg":      "",
+		"before_blood": beforeblood,
+		"after_blood":  afterblood,
+	})
+
+	//now := time.Now()
+	//offset := int(time.Monday - now.Weekday())
+	//if offset > 0 {
+	//	offset = -6
+	//}
+	//monday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	//endday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset+6)
+	//startTime := monday.Unix()
+	//endTime := endday.Unix()
+	//
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"monday": startTime,
+	//	"endday": endTime,
+	//})
+}
+
+func (this *XcxApiController) GetSignsByWeight() {
+	start := this.GetString("start", "")
+	end := this.GetString("end", "")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	if len(start) <= 0 || len(end) <= 0 || patient_id <= 0 || org_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "缺少参数",
+			"data":     "",
+		})
+	}
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation("2006-01-02", start, loc)
+	startTimeUnix := startTime.Unix()
+	endTime, _ := time.ParseInLocation("2006-01-02", end, loc)
+	endTimeUinx := endTime.Unix()
+
+	utils.TraceLog("startTime:%v endTime:%v", startTime, endTime)
+	utils.TraceLog("startTimeUnix:%v endTimeUinx:%v", startTimeUnix, endTimeUinx)
+	if startTimeUnix < 0 || endTimeUinx < 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间超出范围",
+			"data":     "",
+		})
+	}
+	if startTimeUnix > endTimeUinx {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "开始时间大于结束时间",
+			"data":     "",
+		})
+	}
+
+	if endTimeUinx-startTimeUnix > 60*60*24*60 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间范围超过60天",
+			"data":     "",
+		})
+	}
+
+	beforeweight, _ := service.GetSignsByWeight(org_id, startTimeUnix, endTimeUinx, patient_id)
+	dryweight, _ := service.GetSignsByDryWeight(org_id, startTimeUnix, endTimeUinx, patient_id)
+	afterweight, _ := service.GetSignsByAfterWeight(org_id, startTimeUnix, endTimeUinx, patient_id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"err_code":       0,
+		"err_msg":        "",
+		"before_eweight": beforeweight,
+		"dry_eweight":    dryweight,
+		"after_eweight":  afterweight,
+	})
+
+	//now := time.Now()
+	//offset := int(time.Monday - now.Weekday())
+	//if offset > 0 {
+	//	offset = -6
+	//}
+	//monday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	//endday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset+6)
+	//startTime := monday.Unix()
+	//endTime := endday.Unix()
+	//
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"monday": startTime,
+	//	"endday": endTime,
+	//})
+}
+
+func (this *XcxApiController) GetSchedulesByWeek() {
+	start := this.GetString("start", "")
+	end := this.GetString("end", "")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	if len(start) <= 0 || len(end) <= 0 || patient_id <= 0 || org_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "缺少参数",
+			"data":     "",
+		})
+	}
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation("2006-01-02", start, loc)
+	startTimeUnix := startTime.Unix()
+	endTime, _ := time.ParseInLocation("2006-01-02", end, loc)
+	endTimeUinx := endTime.Unix()
+
+	utils.TraceLog("startTime:%v endTime:%v", startTime, endTime)
+	utils.TraceLog("startTimeUnix:%v endTimeUinx:%v", startTimeUnix, endTimeUinx)
+	if startTimeUnix < 0 || endTimeUinx < 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间超出范围",
+			"data":     "",
+		})
+	}
+	if startTimeUnix > endTimeUinx {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "开始时间大于结束时间",
+			"data":     "",
+		})
+	}
+
+	if endTimeUinx-startTimeUnix > 60*60*24*60 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"err_code": 1001,
+			"err_msg":  "时间范围超过60天",
+			"data":     "",
+		})
+	}
+
+	schedule, _ := service.GetScheduleByXcx(org_id, startTimeUnix, endTimeUinx, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"err_code": 0,
+		"err_msg":  "",
+		"data":     schedule,
+	})
+
+	//now := time.Now()
+	//offset := int(time.Monday - now.Weekday())
+	//if offset > 0 {
+	//	offset = -6
+	//}
+	//monday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	//endday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset+6)
+	//startTime := monday.Unix()
+	//endTime := endday.Unix()
+	//
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"monday": startTime,
+	//	"endday": endTime,
+	//})
+}
+
 func (this *XcxApiController) GetScheduleInfo() {
+
 	patient_id, _ := this.GetInt64("patient_id")
 	fmt.Println(patient_id)
 	thisWeekMonday := service.GetFirstDateOfWeek()
@@ -633,7 +931,7 @@ func (this *XcxApiController) GetScheduleInfo() {
 		return
 	}
 
-	var one = startTime.Unix() + 86400
+	var one = startTime.Unix()
 	fmt.Println("one2322332", one)
 	var two = one + 86400
 	var three = two + 86400
@@ -658,7 +956,6 @@ func (this *XcxApiController) GetScheduleInfo() {
 	var lastsix = lastfive + 86400
 	var lastseven = lastsix + 86400
 
-	fmt.Println("各地好当家232332323232", lastseven)
 	array := []interface{}{
 		map[string]string{"schedule_type": "1", "schedule_date": strconv.FormatInt(one, 10), "schedule_week": "1", "mode_id": "", "name": ""},
 		map[string]string{"schedule_type": "2", "schedule_date": strconv.FormatInt(one, 10), "schedule_week": "1", "mode_id": "", "name": ""},
@@ -738,18 +1035,14 @@ func (this *XcxApiController) GetScheduleInfo() {
 func (this *XcxApiController) GetMobileSchedule() {
 
 	patientID, _ := this.GetInt64("patient_id")
-	fmt.Println("1", patientID)
 	info, _ := service.GetXcxPatientInfo(patientID)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	time_now := time.Now().Format("2006-01-02")
 	timeNowUnix, _ := time.ParseInLocation(timeLayout+"15:04:05", time_now+"00:00:00", loc)
-
-	fmt.Println("timeNowUnix", timeNowUnix.Unix())
 	//获取该患者最后一次排班
 	list, _ := service.GetLastScheduleListOne(patientID, timeNowUnix.Unix())
-	fmt.Println("hh2332323232323223", list)
-	fmt.Println("list233232232332", list.ScheduleDate)
+
 	patient, getPatientErr := service.MobileGetPatientDetail(info.UserOrgId, patientID)
 	if getPatientErr != nil {
 		this.ErrorLog("获取患者信息失败：%v", getPatientErr)
@@ -968,9 +1261,9 @@ func (this *XcxApiController) GetDoctorAdvice() {
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
 	info, _ := service.GetXcxPatientInfo(patient_id)
-	config, _ := service.GetDoctorAdviceConfig(info.UserOrgId)
-	fmt.Println(startTime, endTime, config.IsOpenRemind)
-	if config.IsOpenRemind == 0 || config.IsOpenRemind == 2 {
+	_, config := service.FindXTHisRecordByOrgId(info.UserOrgId)
+	fmt.Println(startTime, endTime, config.IsOpen)
+	if config.IsOpen == 0 {
 		list, _ := service.GetDoctorAdviceGroup(patient_id, startTime.Unix(), endTime.Unix())
 		advice, _ := service.GetDoctorAdvice(patient_id, startTime.Unix(), endTime.Unix())
 		for _, item := range list {
@@ -986,7 +1279,7 @@ func (this *XcxApiController) GetDoctorAdvice() {
 		})
 	}
 
-	if config.IsOpenRemind == 1 {
+	if config.IsOpen == 1 {
 		list, _ := service.GetHisDoctorAdviceGroup(patient_id, startTime.Unix(), endTime.Unix())
 		advice, _ := service.GetHisDoctorAdvice(patient_id, startTime.Unix(), endTime.Unix())
 		for _, item := range list {
@@ -1064,27 +1357,46 @@ func (this *XcxApiController) GetDataConfig() {
 
 func (this *XcxApiController) GetInspectionList() {
 
-	start_time := this.GetString("start_time")
-	end_time := this.GetString("end_time")
-	patient_id, _ := this.GetInt64("patient_id")
-	fmt.Println("patient_id", patient_id)
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	page, _ := this.GetInt64("page", 0)
+	number, _ := this.GetInt64("number", 10)
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	//fmt.Println("patient_id", patient_id)
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+
+	list, err := service.GetInspectionGroupListByXcx(patient_id, page, number)
+
+	if err == gorm.ErrRecordNotFound {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"error_code": "1001",
+			"error_msg":  "没有更多数据",
+		})
+	}
 
-	list, _ := service.GetInspectionGroupList(patient_id, startTime.Unix(), endTime.Unix())
+	this.ServeSuccessJSON(map[string]interface{}{
+		"error_code": "0",
+		"error_msg":  "",
+		"list":       list,
+	})
+}
 
-	insepctionList, _ := service.GetInsepctionList(patient_id, startTime.Unix(), endTime.Unix())
+func (this *XcxApiController) GetInspectionInfo() {
 
-	for _, item := range list {
-		for _, it := range insepctionList {
-			if item.ProjectId == it.ProjectId && item.InspectDate == it.InspectDate {
-				item.Childs = append(item.Childs, it)
-			}
-		}
+	project_id, _ := this.GetInt64("project_id", 0)
+	inspect_date, _ := this.GetInt64("inspect_date", 0)
+	patient_id, _ := this.GetInt64("patient_id", 0)
+
+	if project_id <= 0 || inspect_date <= 0 || patient_id <= 0 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"error_code": 1001,
+			"error_msg":  "缺少参数",
+		})
 	}
 
+	list, _ := service.GetInspectionInfoByXcx(patient_id, project_id, inspect_date)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})

go.mod

@@ -0,0 +1,36 @@
+module Xcx_New
+
+go 1.19
+
+require (
+	github.com/astaxie/beego v1.12.3
+	github.com/go-redis/redis v6.15.9+incompatible
+	github.com/jinzhu/gorm v1.9.16
+	github.com/robfig/cron v1.2.0
+	github.com/shopspring/decimal v1.3.1
+	github.com/smartystreets/goconvey v1.7.2
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/go-sql-driver/mysql v1.5.0 // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jtolds/gls v4.20.0+incompatible // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/prometheus/client_golang v1.7.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.10.0 // indirect
+	github.com/prometheus/procfs v0.1.3 // indirect
+	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
+	github.com/smartystreets/assertions v1.2.0 // indirect
+	golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd // indirect
+	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
+	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 // indirect
+	golang.org/x/text v0.3.0 // indirect
+	google.golang.org/protobuf v1.23.0 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
+)

models/dialysis.go

@@ -234,6 +234,34 @@ func (DialysisSchedule) TableName() string {
 	return "xt_schedule"
 }
 
+type PredialysisEvaluationOne struct {
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightBefore   float64 `gorm:"column:weight_before" json:"weight_before"`
+}
+
+func (PredialysisEvaluationOne) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+type PredialysisEvaluationThree struct {
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+}
+
+func (PredialysisEvaluationThree) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+type PredialysisEvaluationTwo struct {
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	DryWeight      float64 `gorm:"column:dry_weight" json:"dry_weight"`
+}
+
+func (PredialysisEvaluationTwo) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
 type PredialysisEvaluation struct {
 	ID                          int64   `gorm:"column:id" json:"id"`
 	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id"`
@@ -287,7 +315,7 @@ type PredialysisEvaluation struct {
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other"`
-	DialysisCount                  string   `gorm:"column:dialysis_count" json:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type"`
@@ -301,7 +329,7 @@ type PredialysisEvaluation struct {
 	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other"`
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other"`
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other"`
-	HumorExcessiveSymptom          string   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
+	HumorExcessiveSymptom          string  `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
 	Phinholing                     string  `gorm:"column:pinholing" json:"pinholing" form:"pinholing"`
 	CatheterSuture                 string  `gorm:"column:catheter_suture" json:"catheter_suture" form:"catheter_suture"`
 	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
@@ -340,7 +368,7 @@ func (PredialysisEvaluationList) TableName() string {
 	return "xt_assessment_before_dislysis"
 }
 
-//更改的地方
+// 更改的地方
 type DoctorAdvices struct {
 	ID                         int64           `gorm:"column:id" json:"id" form:"id"`
 	GroupNo                    int64           `gorm:"column:groupno" json:"groupno" form:"groupno"`
@@ -542,6 +570,25 @@ func (DoubleCheck) TableName() string {
 	return "xt_double_check"
 }
 
+type AssessmentAfterDislysisOne struct {
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightAfter    float64 `gorm:"column:weight_after" json:"weight_after"`
+}
+
+func (AssessmentAfterDislysisOne) TableName() string {
+	return "xt_assessment_after_dislysis"
+}
+
+type AssessmentAfterDislysisTwo struct {
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+}
+
+func (AssessmentAfterDislysisTwo) TableName() string {
+	return "xt_assessment_after_dislysis"
+}
+
 type AssessmentAfterDislysis struct {
 	ID                     int64   `gorm:"column:id" json:"id"`
 	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id"`
@@ -550,7 +597,7 @@ type AssessmentAfterDislysis struct {
 	DialysisOrderId        int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
 	Temperature            float64 `gorm:"column:temperature" json:"temperature"`
 	PulseFrequency         float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate          float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	BreathingRate          string  `gorm:"column:breathing_rate" json:"breathing_rate"`
 	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	BloodPressureType      int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
@@ -571,7 +618,7 @@ type AssessmentAfterDislysis struct {
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`
@@ -696,7 +743,7 @@ type MonitoringRecord struct {
 	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_time"`
 	MonitoringTime              string  `gorm:"column:monitoring_time" json:"monitoring_time"`
 	PulseFrequency              float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate               float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	BreathingRate               string  `gorm:"column:breathing_rate" json:"breathing_rate"`
 	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	BloodPressureType           int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`

models/schedule_models.go

@@ -29,6 +29,26 @@ func (VmSchedules) TableName() string {
 	return "xt_schedule"
 }
 
+type ScheduleXcx struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+}
+
+func (ScheduleXcx) TableName() string {
+	return "xt_schedule"
+}
+
 type Schedule struct {
 	ID           int64 `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`

models/xcx_user_models.go

@@ -1,19 +1,23 @@
 package models
 
+import "github.com/shopspring/decimal"
+
 type XcxAdminUserRole struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	PatientName string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
-	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Mobile      string `gorm:"column:mobile" json:"mobile" form:"mobile"`
-	Code        string `gorm:"column:code" json:"code" form:"code"`
-	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status      int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Appid       string `gorm:"column:appid" json:"appid" form:"appid"`
-	Appsecret   string `gorm:"column:appsecret" json:"appsecret" form:"appsecret"`
-	SessionKey  string `gorm:"column:session_key" json:"session_key" form:"session_key"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientName  string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
+	Relationship string `gorm:"column:relationship" json:"relationship" form:"relationship"`
+	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Mobile       string `gorm:"column:mobile" json:"mobile" form:"mobile"`
+	Code         string `gorm:"column:code" json:"code" form:"code"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Appid        string `gorm:"column:appid" json:"appid" form:"appid"`
+	Appsecret    string `gorm:"column:appsecret" json:"appsecret" form:"appsecret"`
+	SessionKey   string `gorm:"column:session_key" json:"session_key" form:"session_key"`
+	Openid       string `gorm:"column:openid" json:"openid" form:"openid"`
 }
 
 func (XcxAdminUserRole) TableName() string {
@@ -541,6 +545,49 @@ func (XcxGobalTemplate) TableName() string {
 	return "xt_gobal_template"
 }
 
+type GetHisName struct {
+	ID   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (GetHisName) TableName() string {
+	return "sgj_xt.xt_patients"
+}
+
+type Deposit struct {
+	ID           int64           `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`          //机构id
+	HisPatientId int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	Ctime        int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status       int64           `gorm:"column:status" json:"status" form:"status"`
+	Deposit      decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"` //押金
+}
+
+func (Deposit) TableName() string {
+	return "sgj_xt.his_deposit"
+}
+
+type DepositHistory struct {
+	ID             int64           `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`          //机构id
+	HisPatientId   int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	DepositCode    string          `gorm:"column:deposit_code" json:"deposit_code" form:"deposit_code"`
+	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"`                         //本次操作金额
+	SurplusDeposit decimal.Decimal `gorm:"column:surplus_deposit" json:"surplus_deposit" form:"surplus_deposit"` //剩余金额
+	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退款,4：退费
+	Status         int64           `gorm:"column:status" json:"status" form:"status"`
+	CreateId       int64           `gorm:"column:create_id" json:"create_id" form:"create_id"`
+	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	TrialStatus    int64           `gorm:"column:trial_status" json:"trial_status" form:"trial_status"` //审核状态0：未审核 ，1：已审核
+	Remarks        string          `gorm:"column:remarks" json:"remarks" form:"remarks"`                //备注
+}
+
+func (DepositHistory) TableName() string {
+	return "sgj_xt.his_deposit_history"
+}
+
 type XcxSchedule struct {
 	ID           int64 `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
@@ -561,6 +608,28 @@ func (XcxSchedule) TableName() string {
 	return "xt_schedule"
 }
 
+type XcxInspectionTwo struct {
+	ID                  int64               `gorm:"column:id" json:"id" form:"id"`
+	PatientId           int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId               int64               `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId           int64               `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId              int64               `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName            string              `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName         string              `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType         int64               `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue        string              `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectTips         string              `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
+	InspectDate         int64               `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status              int64               `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime         int64               `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime         int64               `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	InspectionReference InspectionReference `json:"inspection_reference" gorm:"foreignkey:OrgId,ProjectId,ItemId;AssociationForeignKey:OrgId,ProjectId,ItemId;"`
+}
+
+func (XcxInspectionTwo) TableName() string {
+	return "xt_inspection"
+}
+
 type XcxInspection struct {
 	ID           int64            `gorm:"column:id" json:"id" form:"id"`
 	PatientId    int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`

service/new_sms_service.go

@@ -50,12 +50,12 @@ func SendVerificationCodeSMS(mobile string, aespass string) error {
 		redisClient := RedisClient()
 		defer redisClient.Close()
 		cur_date := time.Now().Format("2006-01-02")
-		redisClient.Set(redisClient.Context(),"code_msg_"+mobile, code_str, time.Minute*10)
-		redisClient.Incr(redisClient.Context(),"code_msg_" + mobile + "_" + cur_date).Result()
+		redisClient.Set("code_msg_"+mobile, code_str, time.Minute*10)
+		redisClient.Incr("code_msg_" + mobile + "_" + cur_date).Result()
 		// 取出地址信息，因为上面已经验证过，这里就直接解密而不做错误判断了
 		bytesPass, _ := base64.StdEncoding.DecodeString(aespass)
 		tpass := utils.AESDecrypt(bytesPass)
-		redisClient.Incr(redisClient.Context(),"ip:host_" + cur_date + "_" + tpass).Result()
+		redisClient.Incr("ip:host_" + cur_date + "_" + tpass).Result()
 	}
 	return err
 }
@@ -64,25 +64,27 @@ func newCheckVerificationCodeSMSLimit(aespass string, mobile string) error {
 	redisClient := RedisClient()
 	defer redisClient.Close()
 	bytesPass, err := base64.StdEncoding.DecodeString(aespass)
+	utils.TraceLog("bytesPass:%v err:%v", bytesPass, err)
+	utils.TraceLog("aespass:%v", aespass)
 	if err != nil {
-		return &SMSServiceError{Err: "缺少关键参数"}
+		return &SMSServiceError{Err: "缺少关键参数1"}
 	}
 	tpass := utils.AESDecrypt(bytesPass)
 	if len(tpass) == 0 {
-		return &SMSServiceError{Err: "缺少关键参数"}
+		return &SMSServiceError{Err: "缺少关键参数2"}
 	}
 
 	cur_date := time.Now().Format("2006-01-02")
-	add_redis, err := redisClient.Get(redisClient.Context(),"ip:host_" + cur_date + "_" + tpass).Result()
+	add_redis, err := redisClient.Get("ip:host_" + cur_date + "_" + tpass).Result()
 	if err != nil {
-		return &SMSServiceError{Err: "缺少关键参数"}
+		return &SMSServiceError{Err: "缺少关键参数3"}
 	}
 	ip_max_send_count, _ := beego.AppConfig.Int("ip_max_send_count")
 	if add_count, _ := strconv.Atoi(add_redis); add_count >= ip_max_send_count {
 		return &SMSServiceError{Err: "当前IP发送短信超过限制"}
 	}
 
-	moblie_count, _ := redisClient.Get(redisClient.Context(),"code_msg_" + mobile + "_" + cur_date).Result()
+	moblie_count, _ := redisClient.Get("code_msg_" + mobile + "_" + cur_date).Result()
 	moblie_count_int, _ := strconv.Atoi(moblie_count)
 	if moblie_max, _ := beego.AppConfig.Int("moblie_max_send_count"); moblie_count_int >= moblie_max {
 		return &SMSServiceError{Err: "当前手机号发送短信超过限制"}

service/redis.go

@@ -14,7 +14,7 @@ func RedisClient() *redis.Client {
 		Password: beego.AppConfig.String("redispasswrod"), // no password set
 		DB:       0,                                       // use default DB
 	})
-	pong, err := client.Ping(client.Context()).Result() 
+	pong, err := client.Ping().Result()
 	fmt.Println(pong, err)
 	return client
 }

service/sms_service.go

@@ -40,8 +40,8 @@ func SMSSendVerificationCode(mobile string) error {
 		redisClient := RedisClient()
 		defer redisClient.Close()
 		cur_date := time.Now().Format("2006-01-02")
-		redisClient.Set(redisClient.Context(),"xt_modify_pwd_"+mobile, code_str, time.Minute*10)
-		redisClient.Incr(redisClient.Context(),"xt_modify_pwd_" + mobile + "_" + cur_date).Result()
+		redisClient.Set("xt_modify_pwd_"+mobile, code_str, time.Minute*10)
+		redisClient.Incr("xt_modify_pwd_" + mobile + "_" + cur_date).Result()
 	}
 	return err
 }
@@ -68,7 +68,7 @@ func checkVerificationCodeSMSLimit(mobile string) error {
 	defer redisClient.Close()
 
 	cur_date := time.Now().Format("2006-01-02")
-	moblie_count, _ := redisClient.Get(redisClient.Context(),"xt_modify_pwd_" + mobile + "_" + cur_date).Result()
+	moblie_count, _ := redisClient.Get("xt_modify_pwd_" + mobile + "_" + cur_date).Result()
 	moblie_count_int, _ := strconv.Atoi(moblie_count)
 	if moblie_max := 5; moblie_count_int >= moblie_max {
 		return &SMSServiceError{Err: "当前手机号发送短信超过限制"}

service/xcx_mobile_api_service.go

@@ -9,11 +9,21 @@ import (
 	"errors"
 	"fmt"
 	"github.com/jinzhu/gorm"
-
+	"github.com/shopspring/decimal"
 	"net/http"
 	"time"
 )
 
+// 根据患者id获取该患者当前剩余的押金
+func GetUserMoney(id, orgid int64) decimal.Decimal {
+	tmp := models.Deposit{}
+	err := XTReadDB().Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&tmp).Error
+	if err != nil {
+		return decimal.NewFromFloat(0)
+	}
+	return tmp.Deposit
+}
+
 func GetXcxMobileInformation(mobile string) (*models.XcxAdminUserRole, error) {
 	role := models.XcxAdminUserRole{}
 
@@ -28,6 +38,20 @@ func GetXcxMobileInformation(mobile string) (*models.XcxAdminUserRole, error) {
 	return &role, nil
 }
 
+func GetXcxOpneidInformation(openid string) (*models.XcxAdminUserRole, error) {
+	role := models.XcxAdminUserRole{}
+
+	err := UserReadDB().Model(&role).Where("openid = ? and status = 1", openid).Find(&role).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return &role, nil
+}
+
 func CreateXcxAdminUser(role models.XcxAdminUserRole) error {
 
 	err := UserReadDB().Create(&role).Error
@@ -129,20 +153,63 @@ func GetWeekDayOfWeek() (weekMonday string) {
 	return
 }
 
-func GetMobilePatient(mobile string, idcard string) (*models.XcxPatients, error) {
+// 获取本月的起止时间戳
+func GetMonth() (int64, int64) {
+	timeNow := time.Now()
+	timeToday := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, timeNow.Location()) // 获取当天0点时间 time类型
+	timeMonthStartUnix1 := timeToday.AddDate(0, 0, -timeToday.Day()+1).Unix()                              // 获取本月第一天0点 时间戳类型
+	timeMonthEndUnix1 := timeToday.AddDate(0, 1, -timeToday.Day()+1).Unix() - 1                            // 获取下个月第一天/ 本月最后一天24点 时间戳类型
+	return timeMonthStartUnix1, timeMonthEndUnix1
+}
 
+// 押金流水
+func GetFlowList(patient_id, orgid, stime, etime int64) (deposit []models.DepositHistory, err error) {
+	err = XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and trial_status = 1 and user_org_id = ? and his_patient_id = ? and mtime >= ? and mtime <= ?", orgid, patient_id, stime, etime).Order("mtime desc").Find(&deposit).Error
+	return
+}
+
+// 获取his中的有效患者
+func GetHisUserName(orgid, id int64) (hisname models.GetHisName, err error) {
+	err = XTReadDB().Model(&models.GetHisName{}).Where("status = 1 and user_org_id = ? and id = ?", orgid, id).Find(&hisname).Error
+	return
+}
+
+func GetPatientByIdXcx(patient_id int64) (*models.XcxPatients, error) {
+	patient := models.XcxPatients{}
+	err := XTReadDB().Model(&patient).Where("id =? and status = 1", patient_id).Find(&patient).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &patient, nil
+}
+
+func GetMobilePatient(mobile string, idcard string) (*models.XcxPatients, error) {
 	patient := models.XcxPatients{}
 	err := XTReadDB().Model(&patient).Where("(phone = ? or relative_phone =?) and id_card_no =?", mobile, mobile, idcard).Find(&patient).Error
 	//err := XTReadDB().Model(&patient).Where("id_card_no = ? and status = 1", mobile).Find(&patient).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
-
 	if err != nil {
 		return nil, err
 	}
 	return &patient, nil
+}
 
+func GetPatientByIdcardno(idcard string) (*models.XcxPatients, error) {
+	patient := models.XcxPatients{}
+	err := XTReadDB().Model(&patient).Where("id_card_no =?", idcard).Find(&patient).Error
+	//err := XTReadDB().Model(&patient).Where("id_card_no = ? and status = 1", mobile).Find(&patient).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &patient, nil
 }
 
 func GetNamePatient(name string, idcard string) (*models.XcxPatients, error) {
@@ -220,7 +287,7 @@ func AesCBCDncrypt(encryptData, key, iv []byte) ([]byte, error) {
 	return encryptData, nil
 }
 
-//去除填充
+// 去除填充
 func PKCS7UnPadding(origData []byte) []byte {
 	length := len(origData)
 	unpadding := int(origData[length-1])
@@ -232,6 +299,50 @@ func PKCS7UnPadding(origData []byte) []byte {
 	return origData[:(length - unpadding)]
 }
 
+func GetScheduleByXcx(orgID, start, end, patientID int64) (schedule []*models.ScheduleXcx, err error) {
+	err = readDb.Model(&models.ScheduleXcx{}).Where("user_org_id=? and patient_id=? and schedule_date>=? and schedule_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByBlood(orgID, start, end, patientID int64) (schedule []*models.PredialysisEvaluationThree, err error) {
+	err = readDb.Model(&models.PredialysisEvaluationThree{}).Where("user_org_id=? and patient_id=? and assessment_date>=? and assessment_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByWeight(orgID, start, end, patientID int64) (schedule []*models.PredialysisEvaluationOne, err error) {
+	err = readDb.Model(&models.PredialysisEvaluationOne{}).Where("user_org_id=? and patient_id=? and assessment_date>=? and assessment_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByDryWeight(orgID, start, end, patientID int64) (schedule []*models.PredialysisEvaluationTwo, err error) {
+	err = readDb.Model(&models.PredialysisEvaluationTwo{}).Where("user_org_id=? and patient_id=? and assessment_date>=? and assessment_date<=? and status=1", orgID, patientID, start, end).Find(&schedule).Error
+	return
+}
+
+func GetSignsByAfterWeight(orgID, start, end, patientID int64) (record []*models.AssessmentAfterDislysisOne, err error) {
+	err = readDb.Model(&models.AssessmentAfterDislysisOne{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date >=?  and assessment_date <=?", patientID, orgID, start, end).Find(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return
+}
+
+func GetSignsByAfterBlood(orgID, start, end, patientID int64) (record []*models.AssessmentAfterDislysisTwo, err error) {
+	err = readDb.Model(&models.AssessmentAfterDislysisTwo{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date >=?  and assessment_date <=?", patientID, orgID, start, end).Find(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return
+}
+
 func GetScheduleInfo(startime int64, endtime int64, patient_id int64) (schedule []*models.VmBloodSchedule, err error) {
 
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
@@ -598,6 +709,28 @@ func GetLastScheduleListOne(patient_id int64, schedule_date int64) (models.XcxSc
 	return schedule, err
 }
 
+func GetInspectionGroupListByXcx(patientid int64, page int64, number int64) (inspection []*models.XcxInspectionTwo, err error) {
+
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	offset := (page - 1) * number
+	//if startime > 0 {
+	//	db = db.Where("x.inspect_date >= ?", startime)
+	//}
+	//if endtime > 0 {
+	//	db = db.Where("x.inspect_date <= ?", endtime)
+	//}
+	err = db.Group("x.inspect_date,x.project_id").Order("x.created_time").Offset(offset).Limit(number).Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetInspectionInfoByXcx(patientid int64, project_id int64, inspect_date int64) (inspection []*models.XcxInspectionTwo, err error) {
+	err = XTReadDB().Model(&inspection).Where("(patient_id = ? and project_id = ? and inspect_date=?) and status = 1", patientid, project_id, inspect_date).Preload("InspectionReference", "status = 1").Find(&inspection).Error
+	return inspection, err
+}
+
 func GetInspectionGroupList(patientid int64, startime int64, endtime int64) (inspection []*models.XcxInspection, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")