9月2日

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9529
-runmode = dev
+httpport = 9531
+runmode =prod
 #dev/prod
 
 #

controllers/dialysis_api_controller.go

@@ -71,6 +71,8 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/schedule/getorderdoctoradvice", &DialysisApiController{}, "Get:GetOrderDoctorAdvice")
 
+	beego.Router("/api/getinitprintdateone", &DialysisApiController{}, "Get:GetInitPrintDataOne")
+
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -1411,7 +1413,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	internal_fistula_other := c.GetString("internal_fistula_other")
 	blood_access_internal_fistula := c.GetString("blood_access_internal_fistula")
 
-	breathing_rate, _ := c.GetFloat("breathing_rate", 0)
+	//breathing_rate, _ := c.GetFloat("breathing_rate", 0)
+	breathing_rate := c.GetString("breathing_rate")
 
 	is_infect, _ := c.GetInt64("is_infect", 0)
 	exposed, _ := c.GetFloat("exposed", 0)
@@ -2387,7 +2390,8 @@ 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)
+	breathing_rated := c.GetString("breathing_rated")
 	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)
@@ -4141,3 +4145,33 @@ func (c *DialysisApiController) GetInitPrintData() {
 		return
 	}
 }
+
+func (c *DialysisApiController) GetInitPrintDataOne() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	start_time := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTime = theTime.Unix()
+	}
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetInitPrintData(patient_id, theStartTime, orgId)
+	assessmentAfterDislysis, _ := service.GetLastWeightAfter(patient_id, theStartTime, orgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":                    list,
+			"assessmentAfterDislysis": assessmentAfterDislysis,
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/dialysis_record_api_controller.go

@@ -497,7 +497,7 @@ type EditMonitorParamObject struct {
 	SystolicBP                  float64 `json:"systolic_bp"`
 	DiastolicBP                 float64 `json:"diastolic_bp"`
 	PulseFrequency              float64 `json:"pulse_frequency"`
-	BreathingRated              float64 `json:"breathing_rated"`
+	BreathingRated              string  `json:"breathing_rated"`
 	BloodFlowVolume             float64 `json:"blood_flow_volume"`
 	VenousPressure              float64 `json:"venous_pressure"`
 	VenousPressureType          int64   `json:"venous_pressure_type"`
@@ -1085,6 +1085,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				record.SystolicBloodPressure = befor.SystolicBloodPressure
 				record.DiastolicBloodPressure = befor.DiastolicBloodPressure
 				record.BreathingRate = befor.BreathingRate
+
 				record.PulseFrequency = befor.PulseFrequency
 				record.Temperature = befor.Temperature
 			}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -992,7 +992,8 @@ 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)
+	breathing_rate := c.GetString("breathing_rate")
 	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)
@@ -2351,6 +2352,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		if errcode == nil {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+
 			record.BreathingRate = befor.BreathingRate
 			record.PulseFrequency = befor.PulseFrequency
 			record.Temperature = befor.Temperature

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -62,7 +62,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	fmt.Println(operateTime)
 
 	pulseFrequency, _ := this.GetFloat("pulse_frequency")
-	breathingRated, _ := this.GetFloat("breathing_rated")
+	//breathingRated, _ := this.GetFloat("breathing_rated")
+	breathingRated := this.GetString("breathing_rated")
 	systolicBP, _ := this.GetFloat("systolic_bp")
 	diastolicBP, _ := this.GetFloat("diastolic_bp")
 	BPType, _ := this.GetInt("bp_type")
@@ -239,7 +240,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 		operateTime = 0
 	}
 	pulseFrequency, _ := this.GetFloat("pulse_frequency")
-	breathingRated, _ := this.GetFloat("breathing_rated")
+	//breathingRated, _ := this.GetFloat("breathing_rated")
+	breathingRated := this.GetString("breathing_rated")
 	systolicBP, _ := this.GetFloat("systolic_bp")
 	diastolicBP, _ := this.GetFloat("diastolic_bp")
 	BPType, _ := this.GetInt("bp_type")

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2457,7 +2457,7 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 	}
 
 	if dataBody["breathing_rate"] != nil && reflect.TypeOf(dataBody["breathing_rate"]).String() == "string" {
-		breathingRate, _ := strconv.ParseFloat(dataBody["breathing_rate"].(string), 64)
+		breathingRate := dataBody["breathing_rate"].(string)
 		evaluation.BreathingRate = breathingRate
 	}
 

controllers/sign_weigh_api_controller.go

@@ -356,7 +356,8 @@ func (c *SignWeighAPIController) SaveData() {
 	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)
+	breathing_rate := c.GetString("breathing_rate")
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 
@@ -383,7 +384,8 @@ 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)
+	breathing_rate := c.GetString("breathing_rate")
 	systolic_blood_pressure, _ := c.GetFloat("systolic_blood_pressure", 0)
 	diastolic_blood_pressure, _ := c.GetFloat("diastolic_blood_pressure", 0)
 

models/common_models.go

@@ -511,7 +511,7 @@ type XTMonitoringRecord 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/device_models.go

@@ -810,7 +810,7 @@ type XtAssessmentAfterDislysis struct {
 	DialysisOrderId                 int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
 	Temperature                     float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
 	PulseFrequency                  float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
-	BreathingRate                   float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
+	BreathingRate                   string  `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
 	SystolicBloodPressure           float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
 	DiastolicBloodPressure          float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
 	BloodPressureType               int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`

models/dialysis.go

@@ -242,7 +242,7 @@ type PredialysisEvaluation 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"`
@@ -556,7 +556,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"`
@@ -704,7 +704,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/patient_models.go

@@ -1362,7 +1362,7 @@ type XtAssessmentBeforeDislysis struct {
 	DialysisOrderId                int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
 	Temperature                    float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
 	PulseFrequency                 float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
-	BreathingRate                  float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
+	BreathingRate                  string  `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
 	SystolicBloodPressure          float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
 	DiastolicBloodPressure         float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
 	BloodPressureType              int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`

service/dialysis_service.go

@@ -1304,7 +1304,7 @@ func UpdateAssessmentAfterDate(patient_id int64, org_id int64, date int64, actua
 	err = writeDb.Model(&models.AssessmentAfterDislysis{}).Where("status =1 AND user_org_id = ? AND patient_id = ? AND assessment_date = ?", org_id, patient_id, date).Updates(map[string]interface{}{"actual_treatment_hour": actual_treatment_hour, "actual_treatment_minute": actual_treatment_minute}).Error
 	return
 }
-func UpdateAssessmentAfterDateOne(patient_id int64, org_id int64, date int64, actual_treatment_hour int64, actual_treatment_minute int64, BreathingRate float64) (err error) {
+func UpdateAssessmentAfterDateOne(patient_id int64, org_id int64, date int64, actual_treatment_hour int64, actual_treatment_minute int64, BreathingRate string) (err error) {
 	err = writeDb.Model(&models.AssessmentAfterDislysis{}).Where("status =1 AND user_org_id = ? AND patient_id = ? AND assessment_date = ?", org_id, patient_id, date).Updates(map[string]interface{}{"actual_treatment_hour": actual_treatment_hour, "actual_treatment_minute": actual_treatment_minute, "breathing_rate": BreathingRate}).Error
 	return
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -226,7 +226,7 @@ type AssessmentBeforeDislysisVM struct {
 	AssessmentDate                 int64   `gorm:"column:assessment_date" json:"assessment_date"`
 	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"`
@@ -300,7 +300,7 @@ type AssessmentAfterDislysisVM struct {
 	AssessmentDate                  int64   `gorm:"column:assessment_date" json:"assessment_date"`
 	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"`
@@ -382,7 +382,7 @@ type XtAssessmentAfterDislysisVM struct {
 	AssessmentDate                  int64   `gorm:"column:assessment_date" json:"assessment_date"`
 	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"`
@@ -511,7 +511,7 @@ type MonitoringRecordVM struct {
 	MonitoringDate              int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
 	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_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"`

service/statistics_service/index_models.go

@@ -108,7 +108,7 @@ type VMMonitoringRecord struct {
 	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
 	OperateTime            int64   `gorm:"column:operate_time" json:"operate_time" form:"operate_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"`
 	Temperature            float64 `gorm:"column:temperature" json:"temperature"`
 	BloodFlowVolume        float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
 	VenousPressure         float64 `gorm:"column:venous_pressure" json:"venous_pressure"`