修改

conf/app.conf

@@ -143,33 +143,33 @@ aliquid = 83
 [dev]
 mobile_token_expiration_second = 3600
 httpdomain = http://new_mobile.xt.api.sgjyun.com
-sso_domain = https://testsso.sgjyun.com
+sso_domain = http://testsso.sgjyun.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = sgj_xt
+readmysqlname = test_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = sgj_xt
+writemysqlname = test_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = sgj_users
+readusername = test_users
 
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = sgj_users
+writeusername = test_users
 
 
 
@@ -215,8 +215,8 @@ writesgjpatientmysqlname = sgj_patient
 
 
 #redishost = 120.77.235.13
-#redishost = 112.74.16.180
-redishost = localhost
+redishost = 112.74.16.180
+# redishost = localhost
 redisport = 6379
 redispasswrod = 123456
 redisdb = 0

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -846,6 +846,8 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	// 获取患者透前干体重或者获取患者透前体重
 	var dry_weight map[string]interface{}
 	dry_weight = make(map[string]interface{})
+	var after_dry_weight map[string]interface{}
+	after_dry_weight = make(map[string]interface{})
 	if dialysistype == 1 {
 
 		lastPredialysisEvaluation, getLPEErr := service.MobileGetLastTimePredialysisEvaluation(adminUserInfo.Org.Id, id, endTime)
@@ -900,6 +902,44 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 				dry_weight["dry_weight"] = predialysisEvaluation.WeightBefore
 			}
 		}
+
+		lastPredialysisEvaluation, getLPEErr := service.MobileGetLastTimePredialysisEvaluation(adminUserInfo.Org.Id, id, endTime)
+		weight, err := service.FindLastDryWeightAdjust(adminUserInfo.Org.Id, id)
+		if err == gorm.ErrRecordNotFound {
+			if getLPEErr != nil {
+				after_dry_weight["code"] = 1
+				after_dry_weight["dry_weight"] = nil
+			} else {
+				if lastPredialysisEvaluation == nil {
+					after_dry_weight["code"] = 1
+					after_dry_weight["dry_weight"] = nil
+				} else {
+					// 传输的干体重实际为干体重加上衣服重
+					after_dry_weight["code"] = 0
+					after_dry_weight["dry_weight"] = lastPredialysisEvaluation.DryWeight + lastPredialysisEvaluation.AdditionalWeight
+				}
+			}
+		} else {
+			if err != nil {
+				after_dry_weight["code"] = 1
+				after_dry_weight["dry_weight"] = nil
+			} else {
+				after_dry_weight["code"] = 0
+				if getLPEErr != nil {
+					after_dry_weight["code"] = 0
+					after_dry_weight["dry_weight"] = weight.DryWeight
+				} else {
+					if lastPredialysisEvaluation == nil {
+						after_dry_weight["code"] = 1
+						after_dry_weight["dry_weight"] = weight.DryWeight
+					} else {
+						// 传输的干体重实际为干体重加上衣服重
+						after_dry_weight["code"] = 0
+						after_dry_weight["dry_weight"] = weight.DryWeight + lastPredialysisEvaluation.AdditionalWeight
+					}
+				}
+			}
+		}
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -907,6 +947,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		"patient":      dialysisinfo,
 		"schedule":     sc,
 		"dryweight":    dry_weight,
+		"after_dry_weight":    after_dry_weight,
 	})
 	return
 }