9月2日

controllers/data_api_controller.go

@@ -1411,16 +1411,18 @@ func (this *DataApiController) ModifyTemplateName() {
 func (this *DataApiController) ModifyFiledIsShow() {
 	id, _ := this.GetInt64("id", 0)
 	is_show, _ := this.GetInt("is_show", 0)
+	is_write, _ := this.GetInt("is_write", 0)
 	adminUserInfo := this.GetAdminUserInfo()
-	err := service.ShowFiledConfig(adminUserInfo.CurrentOrgId, is_show, id)
+	err := service.ShowFiledConfig(adminUserInfo.CurrentOrgId, is_show, is_write, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	} else {
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"id":      id,
-			"is_show": is_show,
+			"id":       id,
+			"is_show":  is_show,
+			"is_write": is_write,
 		})
 	}
 }

controllers/dialysis_api_controller.go

@@ -1448,6 +1448,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	blood_pressure_during_dialysis := c.GetString("blood_pressure_during_dialysis")
 	urea_befor := c.GetString("urea_befor")
 	suction := c.GetString("suction")
+	weight_befor_remake := c.GetString("weight_befor_remake")
+
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1516,6 +1518,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		BloodPressureDuringDialysis:    blood_pressure_during_dialysis,
 		UreaBefor:                      urea_befor,
 		Suction:                        suction,
+		WeightBeforRemake:              weight_befor_remake,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/dialysis_record_api_controller.go

@@ -1259,6 +1259,13 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		//长沙南雅
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
+			//获取最后一条透析处方数据
+			prescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+			evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+			tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration
+		}
 		if adminUserInfo.CurrentOrgId == 10101 {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 		} else {
@@ -1348,72 +1355,72 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	//evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
-	//if evaluation.SystolicBloodPressure == 0 {
-	//	evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
-	//
-	//	pre := models.PredialysisEvaluation{
-	//		SystolicBloodPressure: evaluation.SystolicBloodPressure,
-	//	}
-	//	fmt.Println("prew", pre)
-	//	getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//if evaluation.DiastolicBloodPressure == 0 {
-	//	evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
-	//	pres := models.PredialysisEvaluation{
-	//		DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
-	//	}
-	//	getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//if evaluation.PulseFrequency == 0 {
-	//	evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
-	//	press := models.PredialysisEvaluation{
-	//		PulseFrequency: evaluation.PulseFrequency,
-	//	}
-	//	getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//
-	//if evaluation.Temperature == 0 {
-	//	evaluation.Temperature = fmonitorRecords.Temperature
-	//	press := models.PredialysisEvaluation{
-	//		Temperature: evaluation.Temperature,
-	//	}
-	//	getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 {
+		fmt.Println("进来2332233333333333333333333333333333333我的")
+		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+		if evaluation.SystolicBloodPressure == 0 {
+			pre := models.PredialysisEvaluation{
+				SystolicBloodPressure: fmonitorRecords.SystolicBloodPressure,
+			}
+			fmt.Println("prew", pre)
+			getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+		if evaluation.DiastolicBloodPressure == 0 {
+			pres := models.PredialysisEvaluation{
+				DiastolicBloodPressure: fmonitorRecords.DiastolicBloodPressure,
+			}
+			getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+		if evaluation.PulseFrequency == 0 {
+			evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
+			press := models.PredialysisEvaluation{
+				PulseFrequency: evaluation.PulseFrequency,
+			}
+			getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+
+		if evaluation.Temperature == 0 {
+			evaluation.Temperature = fmonitorRecords.Temperature
+			press := models.PredialysisEvaluation{
+				Temperature: evaluation.Temperature,
+			}
+			getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+	}
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -412,6 +412,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	go func() {
 		doctorAdvices, _ = service.MobileGetDoctorAdvicesByGroups(adminInfo.Org.Id, patientID, date.Unix())
+
 		ch <- struct{}{}
 	}()
 
@@ -573,7 +574,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	if is_advice_open.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
-
+	fmt.Println("doctorAdvices23344334344433434334343434wode", doctorAdvices)
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -1756,6 +1757,14 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.UserOrgId = adminUserInfo.Org.Id
 	}
 
+	//长沙南雅
+	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10340 {
+		//获取最后一条透析处方数据
+		prescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
+		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
+		tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration
+	}
+
 	if dialysisOrder.Stage == 1 {
 		temp_time := (float64(endDate.Unix()) - float64(dialysisOrder.StartTime)) / 3600
 		value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", temp_time), 64)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2740,6 +2740,11 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.Suction = suction
 	}
+	if dataBody["weight_befor_remake"] != nil && reflect.TypeOf(dataBody["weight_befor_remake"]).String() == "string" {
+		weight_befor_remake := dataBody["weight_befor_remake"].(string)
+
+		evaluation.WeightBeforRemake = weight_befor_remake
+	}
 	return
 }
 
@@ -3357,7 +3362,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 	//临时医嘱
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
-
+	fmt.Println("DoctorAdvice3223323323232323223323323223332232332wode", DoctorAdvice)
 	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	config, err := service.GetHisDoctorConfig(adminUserInfo.Org.Id)
 

models/data_models.go

@@ -152,6 +152,7 @@ type FiledConfig struct {
 	CreateTime  int64  `gorm:"column:create_time" json:"create_time"`
 	UpdateTime  int64  `gorm:"column:update_time" json:"update_time"`
 	SysModule   int64  `gorm:"column:sys_module" json:"sys_module" form:"sys_module"`
+	IsWrite     int64  `gorm:"column:is_write" json:"is_write" form:"is_write"`
 }
 
 func (FiledConfig) TableName() string {

models/device_models.go

@@ -107,9 +107,9 @@ type DeviceZone struct {
 	OrgID      int64  `gorm:"column:org_id" json:"-"`
 	Name       string `json:"name"`
 	Type       int    `json:"type"`
-	Status     int8   `json:"-"`
 	CreateTime int64  `gorm:"column:ctime" json:"-"`
 	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
 }
 
 func (DeviceZone) TableName() string {

models/dialysis.go

@@ -320,6 +320,7 @@ type PredialysisEvaluation struct {
 	BloodPressureDuringDialysis    string  `gorm:"column:blood_pressure_during_dialysis" json:"blood_pressure_during_dialysis" form:"blood_pressure_during_dialysis"`
 	UreaBefor                      string  `gorm:"column:urea_befor" json:"urea_befor" form:"urea_befor"`
 	Suction                        string  `gorm:"column:suction" json:"suction" form:"suction"`
+	WeightBeforRemake              string  `gorm:"column:weight_befor_remake" json:"weight_befor_remake" form:"weight_befor_remake"`
 }
 
 func (PredialysisEvaluation) TableName() string {