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

controllers/gobal_config_api_controller.go

@@ -1027,16 +1027,21 @@ func (this *GobalConfigApiController) ChangeOrg() {
 			}
 		}
 
-		QualityeList, err := service.FindQualityByOrgId(tempOrg.Id)
-		if len(QualityeList) == 0 {
-			err = service.BatchInsertQualityControl(tempOrg.Id)
-		} else {
-			utils.ErrorLog("字段批量插入失败：%v", err)
-		}
+		major, err := service.GetInspectionMajor(tempOrg.Id)
+		if len(major) == 0 {
+			QualityeList, err := service.FindQualityByOrgId(tempOrg.Id)
+			if len(QualityeList) == 0 {
+				err = service.BatchInsertQualityControl(tempOrg.Id)
+			} else {
+				utils.ErrorLog("字段批量插入失败：%v", err)
+			}
 
-		InspectionList, err := service.FindeInspectionByOrgId(tempOrg.Id)
-		if len(InspectionList) == 0 {
-			err = service.BatchInspectionConfiguration(tempOrg.Id)
+			InspectionList, err := service.FindeInspectionByOrgId(tempOrg.Id)
+			if len(InspectionList) == 0 {
+				err = service.BatchInspectionConfiguration(tempOrg.Id)
+			} else {
+				utils.ErrorLog("字段批量插入失败：%v", err)
+			}
 		} else {
 			utils.ErrorLog("字段批量插入失败：%v", err)
 		}

controllers/mobile_api_controllers/login_api_controller.go

@@ -168,19 +168,24 @@ func (this *LoginAPIController) LoginByPwd() {
 		}
 
 		//批量插入质控达标统计配置
-		QualityeList, err := service.FindQualityByOrgId(org.Id)
-		if len(QualityeList) == 0 {
-			err = service.BatchInsertQualityControl(org.Id)
-		} else {
-			utils.ErrorLog("字段批量插入失败：%v", err)
-		}
+		major, requestErr := service.GetInspectionMajor(org.Id)
+		if len(major) == 0 {
+			QualityeList, err := service.FindQualityByOrgId(org.Id)
+			if len(QualityeList) == 0 {
+				err = service.BatchInsertQualityControl(org.Id)
+			} else {
+				utils.ErrorLog("字段批量插入失败：%v", err)
+			}
 
-		//批量插入检验检查统计配置
-		InspectionList, err := service.FindeInspectionByOrgId(org.Id)
-		if len(InspectionList) == 0 {
-			err = service.BatchInspectionConfiguration(org.Id)
+			//批量插入检验检查统计配置
+			InspectionList, err := service.FindeInspectionByOrgId(org.Id)
+			if len(InspectionList) == 0 {
+				err = service.BatchInspectionConfiguration(org.Id)
+			} else {
+				utils.ErrorLog("字段批量插入失败：%v", err)
+			}
 		} else {
-			utils.ErrorLog("字段批量插入失败：%v", err)
+			utils.ErrorLog("字段批量插入失败：%v", requestErr)
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -877,8 +877,10 @@ func (this *CommonApiController) GetNormData() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	//获取系统数据
 	normdata, err := service.GetNormDataByOrgId(orgid)
+	fmt.Println("normdata==============================", normdata)
 	if len(normdata) == 0 {
 		normdata, err := service.GetNormData(0)
+		fmt.Println("normdata=============================+++++", normdata)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -180,19 +180,25 @@ func (this *ForgetPwdController) ModifyPassword() {
 			}
 
 			if org.Id > 0 {
-				QualityeList, err := service.FindQualityByOrgId(org.Id)
-				if len(QualityeList) == 0 {
-					err = service.BatchInsertQualityControl(org.Id)
-				} else {
-					utils.ErrorLog("字段批量插入失败：%v", err)
-				}
+				major, requestErr := service.GetInspectionMajor(org.Id)
+				if len(major) == 0 {
+					QualityeList, err := service.FindQualityByOrgId(org.Id)
+					if len(QualityeList) == 0 {
+						err = service.BatchInsertQualityControl(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败：%v", err)
+					}
 
-				InspectionList, err := service.FindeInspectionByOrgId(org.Id)
-				if len(InspectionList) == 0 {
-					err = service.BatchInspectionConfiguration(org.Id)
+					InspectionList, err := service.FindeInspectionByOrgId(org.Id)
+					if len(InspectionList) == 0 {
+						err = service.BatchInspectionConfiguration(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败：%v", err)
+					}
 				} else {
-					utils.ErrorLog("字段批量插入失败：%v", err)
+					utils.ErrorLog("字段批量插入失败：%v", requestErr)
 				}
+
 			}
 
 			this.ServeSuccessJSON(map[string]interface{}{

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -234,19 +234,25 @@ func (this *HomeController) ChangeOrg() {
 			}
 
 			if org.Id > 0 {
-				QualityeList, err := service.FindQualityByOrgId(org.Id)
-				if len(QualityeList) == 0 {
-					err = service.BatchInsertQualityControl(org.Id)
-				} else {
-					utils.ErrorLog("字段批量插入失败：%v", err)
-				}
+				major, err := service.GetInspectionMajor(org.Id)
+				if len(major) == 0 {
+					QualityeList, err := service.FindQualityByOrgId(org.Id)
+					if len(QualityeList) == 0 {
+						err = service.BatchInsertQualityControl(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败：%v", err)
+					}
 
-				InspectionList, err := service.FindeInspectionByOrgId(org.Id)
-				if len(InspectionList) == 0 {
-					err = service.BatchInspectionConfiguration(org.Id)
+					InspectionList, err := service.FindeInspectionByOrgId(org.Id)
+					if len(InspectionList) == 0 {
+						err = service.BatchInspectionConfiguration(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败：%v", err)
+					}
 				} else {
 					utils.ErrorLog("字段批量插入失败：%v", err)
 				}
+
 			}
 
 		}
@@ -534,19 +540,25 @@ func (this *HomeController) CreateOrg() {
 				}
 
 				if org.Id > 0 {
-					QualityeList, err := service.FindQualityByOrgId(org.Id)
-					if len(QualityeList) == 0 {
-						err = service.BatchInsertQualityControl(org.Id)
-					} else {
-						utils.ErrorLog("字段批量插入失败：%v", err)
-					}
+					major, requestErr := service.GetInspectionMajor(org.Id)
+					if len(major) == 0 {
+						QualityeList, err := service.FindQualityByOrgId(org.Id)
+						if len(QualityeList) == 0 {
+							err = service.BatchInsertQualityControl(org.Id)
+						} else {
+							utils.ErrorLog("字段批量插入失败：%v", err)
+						}
 
-					InspectionList, err := service.FindeInspectionByOrgId(org.Id)
-					if len(InspectionList) == 0 {
-						err = service.BatchInspectionConfiguration(org.Id)
+						InspectionList, err := service.FindeInspectionByOrgId(org.Id)
+						if len(InspectionList) == 0 {
+							err = service.BatchInspectionConfiguration(org.Id)
+						} else {
+							utils.ErrorLog("字段批量插入失败：%v", err)
+						}
 					} else {
-						utils.ErrorLog("字段批量插入失败：%v", err)
+						utils.ErrorLog("字段批量插入失败：%v", requestErr)
 					}
+
 				}
 
 				this.ServeSuccessJSON(map[string]interface{}{

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -383,19 +383,25 @@ func (this *MobileRegistController) CreateOrg() {
 			}
 
 			if org.Id > 0 {
-				QualityeList, err := service.FindQualityByOrgId(org.Id)
-				if len(QualityeList) == 0 {
-					err = service.BatchInsertQualityControl(org.Id)
-				} else {
-					utils.ErrorLog("字段批量插入失败：%v", err)
-				}
+				major, requestErr := service.GetInspectionMajor(org.Id)
+				if len(major) == 0 {
+					QualityeList, err := service.FindQualityByOrgId(org.Id)
+					if len(QualityeList) == 0 {
+						err = service.BatchInsertQualityControl(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败：%v", err)
+					}
 
-				InspectionList, err := service.FindeInspectionByOrgId(org.Id)
-				if len(InspectionList) == 0 {
-					err = service.BatchInspectionConfiguration(org.Id)
+					InspectionList, err := service.FindeInspectionByOrgId(org.Id)
+					if len(InspectionList) == 0 {
+						err = service.BatchInspectionConfiguration(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败：%v", err)
+					}
 				} else {
-					utils.ErrorLog("字段批量插入失败：%v", err)
+					utils.ErrorLog("字段批量插入失败：%v", requestErr)
 				}
+
 			}
 
 			this.ServeSuccessJSON(map[string]interface{}{

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -86,7 +86,7 @@ func (this *NewCommonApiController) GetMobileTotalSexCount() {
 
 func (this *NewCommonApiController) GetMobileTotalInfectiousCout() {
 	startime, _ := this.GetInt64("startime")
-	fmt.Println("startime", startime)
+	//	fmt.Println("startime", startime)
 	endtime, _ := this.GetInt64("endtime")
 	fmt.Println("endtime", endtime)
 	adminUser := this.GetMobileAdminUserInfo()
@@ -143,15 +143,16 @@ func (this *NewCommonApiController) GetMobileTotalDialysisCount() {
 	total := service.GetPatientTotalCount(orgid)
 	fmt.Println("total", total)
 	//获取该机构下的所有病人数据
-	patients, err := service.GetTotalDialysisAgeCount(orgid)
+	ageData, err := service.GetDialysisAgeData(orgid)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":    total,
-		"patients": patients,
-		"nowtime":  nowtime,
+		"total":   total,
+		"ageData": ageData,
+		"nowtime": nowtime,
 	})
 }
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -294,6 +294,16 @@ func (this *NewDialysisApiController) SavePatient() {
 		fmt.Print("报错", err)
 		patient, err := service.GetLastOldPatient(orgid)
 		fmt.Print("病人ID", patient.ID)
+		//添加转归
+		patientLapseto := models.PatientLapseto{
+			LapsetoType: lapseto,
+			LapsetoTime: time.Now().Unix(),
+			CreatedTime: time.Now().Unix(),
+			Status:      1,
+			PatientId:   patient.ID,
+		}
+		err = service.AddPatientLapseto(&patientLapseto)
+		fmt.Println("添加转归失败", err)
 		err = service.AddContagions(patient.ID, patient.CreatedTime, patient.UpdatedTime, ids)
 		fmt.Println("添加传染病失败", err)
 
@@ -1324,7 +1334,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		//查询号透析号是否相同
 		thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis, id)
 		if thisPatientother.ID > 0 && thisPatientother.ID != patient.BloodId {
-			fmt.Println("进来没有---------------------------------")
+			fmt.Println("进来没有")
 			returnData := make(map[string]interface{}, 0)
 			returnData["msg"] = "透析号码已存在"
 			this.ServeSuccessJSON(returnData)
@@ -1351,6 +1361,13 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			IsInfectious:      is_infectious,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
+		patientLapseto := models.PatientLapseto{
+			LapsetoType: lapseto,
+			LapsetoTime: time.Now().Unix(),
+			UpdatedTime: time.Now().Unix(),
+		}
+		err = service.UpdatePatientLapseto(patient.BloodId, patientLapseto)
+		fmt.Println("编辑转归失败", err)
 		patientsNew := models.XtPatientsNew{
 			ID:                id,
 			Name:              name,

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -296,19 +296,25 @@ func (this *NewLoginApiController) LoginByCs() {
 			}
 
 			if org.Id > 0 {
-				QualityeList, err := service.FindQualityByOrgId(org.Id)
-				if len(QualityeList) == 0 {
-					err = service.BatchInsertQualityControl(org.Id)
-				} else {
-					utils.ErrorLog("字段批量插入失败0：%v", err)
-				}
+				major, requestErr := service.GetInspectionMajor(org.Id)
+				if len(major) == 0 {
+					QualityeList, err := service.FindQualityByOrgId(org.Id)
+					if len(QualityeList) == 0 {
+						err = service.BatchInsertQualityControl(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败0：%v", err)
+					}
 
-				InspectionList, err := service.FindeInspectionByOrgId(org.Id)
-				if len(InspectionList) == 0 {
-					err = service.BatchInspectionConfiguration(org.Id)
+					InspectionList, err := service.FindeInspectionByOrgId(org.Id)
+					if len(InspectionList) == 0 {
+						err = service.BatchInspectionConfiguration(org.Id)
+					} else {
+						utils.ErrorLog("字段批量插入失败0：%v", err)
+					}
 				} else {
-					utils.ErrorLog("字段批量插入失败0：%v", err)
+					utils.ErrorLog("字段批量插入失败0：%v", requestErr)
 				}
+
 			}
 
 			this.ServeSuccessJSON(map[string]interface{}{

controllers/sign_weigh_api_controller.go

@@ -509,6 +509,7 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 	weight_before, _ := c.GetFloat("weight_before", 0)
 	dry_weight, _ := c.GetFloat("dry_weight", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
+	fmt.Println("温度========================", temperature)
 	pulse_frequency, _ := c.GetFloat("pulse_frequency", 0)
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
@@ -534,6 +535,7 @@ func (c *SignWeighAPIController) UpdateSignweight() {
 		service.SaveDislysisiBefore(&predialysisevaluation)
 	} else if errcode == nil {
 		fmt.Println("bbbbbbbbb")
+		fmt.Println("predialysisevaluation", predialysisevaluation)
 		service.UpdataDislysisiBefore(&predialysisevaluation, patientID, adminUserInfo.CurrentOrgId, dateTimeStam)
 	} else {
 		service.UpdataDislysisiBefore(&predialysisevaluation, patientID, adminUserInfo.CurrentOrgId, dateTimeStam)

controllers/verify_login_controller.go

@@ -166,16 +166,21 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				}
 			}
 
-			QualityeList, err := service.FindQualityByOrgId(curOrg.Id)
-			if len(QualityeList) == 0 {
-				err = service.BatchInsertQualityControl(curOrg.Id)
-			} else {
-				utils.ErrorLog("字段批量插入失败：%v", err)
-			}
+			major, err := service.GetInspectionMajor(curOrg.Id)
+			if len(major) == 0 {
+				QualityeList, err := service.FindQualityByOrgId(curOrg.Id)
+				if len(QualityeList) == 0 {
+					err = service.BatchInsertQualityControl(curOrg.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 
-			InspectionList, err := service.FindeInspectionByOrgId(curOrg.Id)
-			if len(InspectionList) == 0 {
-				err = service.BatchInspectionConfiguration(curOrg.Id)
+				InspectionList, err := service.FindeInspectionByOrgId(curOrg.Id)
+				if len(InspectionList) == 0 {
+					err = service.BatchInspectionConfiguration(curOrg.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 			} else {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}

service/common_service.go

@@ -277,66 +277,17 @@ func GetTotalDialysisAgeCount(orgid int64) (patients []*models.XtPatients, err e
 }
 
 func GetDialysisAgeData(orgID int64) (counts []*models.DialysisAgePieDataStruct, err error) {
-	loc, _ := time.LoadLocation("Local")
-	nowTime := time.Now()
-	nowDay := nowTime.Format("2006-01-02")
-	dayTime, err := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
-	fmt.Println("datTime", dayTime)
-	if err != nil {
-		return
-	}
-	oneYearPoint := dayTime.AddDate(-12, 0, 0).Unix()
-
-	fiveYearPoint := dayTime.AddDate(-36, 0, 0).Unix()
-
-	tenYearPoint := dayTime.AddDate(-60, 0, 0).Unix()
-
-	twentyYearPoint := dayTime.AddDate(-61, 0, 0).Unix()
-
-	db := readDb.Table("xt_patients").Where("status=1")
-	countSQL := "SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(" +
-		"SELECT " +
-		"CASE " +
-		" WHEN first_dialysis_date<>0 AND first_dialysis_date>? THEN '1'" +
-		" WHEN first_dialysis_date<>0 AND first_dialysis_date>? && first_dialysis_date<=? THEN '2'" +
-		" WHEN first_dialysis_date<>0 AND first_dialysis_date>? && first_dialysis_date<=? THEN '3'" +
-		" WHEN first_dialysis_date<>0 AND first_dialysis_date>? && first_dialysis_date<=? THEN '4'" +
-		" WHEN first_dialysis_date<>0 AND first_dialysis_date<=? THEN '5'" +
-		" ELSE '0'" +
-		"END AS nnd FROM xt_patients WHERE status=1"
-	countParams := make([]interface{}, 0)
-	countParams = append(countParams, oneYearPoint)
-	countParams = append(countParams, fiveYearPoint)
-	countParams = append(countParams, oneYearPoint)
-	countParams = append(countParams, tenYearPoint)
-	countParams = append(countParams, fiveYearPoint)
-	countParams = append(countParams, twentyYearPoint)
-	countParams = append(countParams, tenYearPoint)
-	countParams = append(countParams, twentyYearPoint)
 
-	if orgID > 0 {
-		db = db.Where("user_org_id=?", orgID)
-		countSQL += " AND user_org_id=?"
-		countParams = append(countParams, orgID)
-	}
-
-	countSQL += ")a GROUP BY nnd"
-	err = readDb.Raw(countSQL, countParams...).Scan(&counts).Error
+	readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+	SELECT
+	CASE
+	WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) >= 0 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 12 THEN '1'
+  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '2'
+  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '3'
+  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
+  END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1)a GROUP BY nnd`, orgID).Scan(&counts)
 	return
 
-	//readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
-	// SELECT
-	// CASE
-	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) >= 0
-	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 12 THEN '0~12' WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12
-	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '12~36' WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36
-	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '36~60' WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60
-	//  ELSE '150'
-	// END
-	// AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1
-	// )a GROUP BY nnd`, orgID).Scan(&counts)
-	//return
-
 }
 
 func GetCurentOrgPatients(orgid int64) (patients []*models.XtPatients, err error) {
@@ -728,7 +679,7 @@ func GetNormDataByOrgId(orgid int64) (standard []*models.QualityControlStandard,
 func GetNormData(orgid int64) (standard []*models.QualityControlStandard, err error) {
 
 	db := XTReadDB().Table("xt_quality_control_standard as x").Where("x.status =1")
-	if orgid > 0 {
+	if orgid >= 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
 	table := XTReadDB().Table("xt_inspection_reference as s")

service/patientmanage_service.go

@@ -139,6 +139,12 @@ func GetLastOldPatient(orgid int64) (models.Patients, error) {
 	return patients, err
 }
 
+func AddPatientLapseto(lapseto *models.PatientLapseto) error {
+
+	err := XTWriteDB().Create(&lapseto).Error
+	return err
+}
+
 func AddContagions(patienid int64, createdtime int64, updatedtime int64, contagions []int64) (err error) {
 	utx := writeDb.Begin()
 	if len(contagions) > 0 {

service/sign_weigh_service.go

@@ -234,7 +234,7 @@ func SaveDislysisiBefore(pre *models.PredialysisEvaluation) error {
 
 func UpdataDislysisiBefore(pre *models.PredialysisEvaluation, patientId int64, orgId int64, datatime int64) error {
 	writeDb.Model(pre).Where("patient_id=? and user_org_id=? and assessment_date =?", patientId, orgId, datatime).Update(map[string]interface{}{"weight_before": pre.WeightBefore,
-		"dry_weight": pre.DryWeight, "temperature": pre.DryWeight, "pulse_frequency": pre.PulseFrequency, "systolic_blood_pressure": pre.SystolicBloodPressure, "diastolic_blood_pressure": pre.DiastolicBloodPressure, "status": 1})
+		"dry_weight": pre.DryWeight, "temperature": pre.Temperature, "pulse_frequency": pre.PulseFrequency, "systolic_blood_pressure": pre.SystolicBloodPressure, "diastolic_blood_pressure": pre.DiastolicBloodPressure, "status": 1})
 	return err
 }