Browse Source

字段添加

XMLWAN 4 years ago
parent
commit
585168c9c0

+ 18 - 2
controllers/dialysis_api_controller.go View File

@@ -137,7 +137,8 @@ func (c *DialysisApiController) PostPrescription() {
137 137
 	tubing_hemodialysis, _ := c.GetInt64("tubing_hemodialysis", 0)
138 138
 	safe_package, _ := c.GetInt64("package", 0)
139 139
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
140
-
140
+	preImpules, _ := c.GetFloat("pre_impulse", 0)
141
+	fmt.Println("========================================================", preImpules)
141 142
 	// var prescription_doctor int64
142 143
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
143 144
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -214,6 +215,7 @@ func (c *DialysisApiController) PostPrescription() {
214 215
 		TubingHemodialysis:         tubing_hemodialysis,
215 216
 		Package:                    safe_package,
216 217
 		ALiquid:                    a_liquid,
218
+		PreImpulse:                 preImpules,
217 219
 	}
218 220
 
219 221
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -3073,7 +3075,11 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
3073 3075
 	assessment.BloodFlow = data.BloodFlow
3074 3076
 	assessment.SealingFluidDispose = data.SealingFluidDispose
3075 3077
 	assessment.SealingFluidSpecial = data.SealingFluidSpecial
3076
-
3078
+	assessment.DosageOfAnticoagulants = data.DosageOfAnticoagulants
3079
+	assessment.SupineSystolicBloodPressure = data.SupineSystolicBloodPressure
3080
+	assessment.SettingPressure = data.SettingPressure
3081
+	assessment.SupineDiastolicBloodPressure = data.SupineDiastolicBloodPressure
3082
+	assessment.DiastolicPressure = data.DiastolicPressure
3077 3083
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
3078 3084
 
3079 3085
 	if assessment.ID > 0 {
@@ -3190,6 +3196,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3190 3196
 	machine_type := c.GetString("machine_type")
3191 3197
 	puncture_needle := c.GetString("puncture_needle")
3192 3198
 	humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
3199
+	phinholing := c.GetString("pinholing")
3193 3200
 
3194 3201
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
3195 3202
 		DialysisCount:                  dialysis_count,
@@ -3241,6 +3248,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
3241 3248
 		MachineType:                    machine_type,
3242 3249
 		PunctureNeedle:                 puncture_needle,
3243 3250
 		HumorExcessiveSymptom:          humor_excessive_symptom,
3251
+		Phinholing:                     phinholing,
3244 3252
 	}
3245 3253
 
3246 3254
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -4282,6 +4290,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
4282 4290
 	timeLayout := "2006-01-02"
4283 4291
 	loc, _ := time.LoadLocation("Local")
4284 4292
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", xtdate+" 00:00:00", loc)
4293
+
4285 4294
 	if err != nil {
4286 4295
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4287 4296
 		return
@@ -4382,6 +4391,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
4382 4391
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
4383 4392
 	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
4384 4393
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
4394
+
4395
+	//获取当前日期月份的第一天
4396
+	firstmonth := service.GetFirstDateOfMonth(theTime)
4397
+	firstMonthDate := firstmonth.Unix()
4398
+	//获取当前月份的病人透析次数
4399
+	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.CurrentOrgId)
4385 4400
 	c.ServeSuccessJSON(map[string]interface{}{
4386 4401
 		"xtdate":                    xtdate,
4387 4402
 		"users":                     adminUser,
@@ -4411,6 +4426,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
4411 4426
 		"predialysName":             predialysName,
4412 4427
 		"FinishNuse":                FinishNuse,
4413 4428
 		"lastPredialysisEvaluation": lastPredialysisEvaluation,
4429
+		"dialysiscount":             dialysiscount,
4414 4430
 	})
4415 4431
 
4416 4432
 }

+ 10 - 7
controllers/dialysis_record_api_controller.go View File

@@ -396,6 +396,7 @@ type EditMonitorParamObject struct {
396 396
 	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
397 397
 	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
398 398
 	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
399
+	Urr                       string  `gorm:"column:urr" json:"urr" form:"urr"`
399 400
 }
400 401
 
401 402
 // /api/dislysis/monitor/edit [post]
@@ -497,13 +498,14 @@ func (this *DialysisRecordAPIController) EditMonitor() {
497 498
 			MonitoringNurse:           adminUserInfo.AdminUser.Id,
498 499
 			Conductivity:              monitorParam.Conductivity,
499 500
 			DisplacementFlowQuantity:  monitorParam.DisplacementFlowQuantity,
500
-			Status:                1,
501
-			CreatedTime:           time.Now().Unix(),
502
-			UpdatedTime:           time.Now().Unix(),
503
-			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
504
-			Creator:               adminUserInfo.AdminUser.Id,
505
-			Heparin:               monitorParam.Heparin,
506
-			DialysateFlow:         monitorParam.DialysateFlow,
501
+			Status:                    1,
502
+			CreatedTime:               time.Now().Unix(),
503
+			UpdatedTime:               time.Now().Unix(),
504
+			BloodOxygenSaturation:     monitorParam.BloodOxygenSaturation,
505
+			Creator:                   adminUserInfo.AdminUser.Id,
506
+			Heparin:                   monitorParam.Heparin,
507
+			DialysateFlow:             monitorParam.DialysateFlow,
508
+			Urr:                       monitorParam.Urr,
507 509
 		}
508 510
 		createErr := service.CreateMonitor(&monitor)
509 511
 		if createErr != nil {
@@ -568,6 +570,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
568 570
 		monitor.BloodOxygenSaturation = monitorParam.BloodOxygenSaturation
569 571
 		monitor.Heparin = monitorParam.Heparin
570 572
 		monitor.DialysateFlow = monitorParam.DialysateFlow
573
+		monitor.Urr = monitorParam.Urr
571 574
 		updateErr := service.UpdateMonitor(monitor)
572 575
 		if updateErr != nil {
573 576
 			this.ErrorLog("修改透析监测记录失败:%v", updateErr)

+ 13 - 2
controllers/mobile_api_controllers/dialysis_api_controller.go View File

@@ -806,7 +806,11 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
806 806
 	blood_flow, _ := c.GetInt64("blood_flow", 0)
807 807
 	sealing_fluid_dispose, _ := c.GetInt64("sealing_fluid_dispose", 0)
808 808
 	sealing_fluid_special := c.GetString("sealing_fluid_special")
809
-
809
+	dosage_of_anticoagulants, _ := c.GetFloat("dosage_of_anticoagulants")
810
+	supine_systolic_blood_pressure := c.GetString("supine_systolic_blood_pressure")
811
+	setting_pressure := c.GetString("setting_pressure")
812
+	supine_diastolic_blood_pressure := c.GetString("supine_diastolic_blood_pressure")
813
+	diastolic_pressure := c.GetString("diastolic_pressure")
810 814
 	if id <= 0 {
811 815
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
812 816
 		return
@@ -893,6 +897,11 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
893 897
 		BloodFlow:                    blood_flow,
894 898
 		SealingFluidDispose:          sealing_fluid_dispose,
895 899
 		SealingFluidSpecial:          sealing_fluid_special,
900
+		DosageOfAnticoagulants:       dosage_of_anticoagulants,
901
+		SupineDiastolicBloodPressure: supine_diastolic_blood_pressure,
902
+		SupineSystolicBloodPressure:  supine_systolic_blood_pressure,
903
+		SettingPressure:              setting_pressure,
904
+		DiastolicPressure:            diastolic_pressure,
896 905
 	}
897 906
 
898 907
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -1022,7 +1031,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
1022 1031
 	tubing_hemodialysis, _ := c.GetInt64("tubing_hemodialysis", 0)
1023 1032
 	safe_package, _ := c.GetInt64("package", 0)
1024 1033
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
1025
-
1034
+	pre_impulse, parseDateErr := c.GetFloat("pre_impulse", 0)
1035
+	fmt.Println("预冲量====", pre_impulse)
1026 1036
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
1027 1037
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
1028 1038
 	//
@@ -1102,6 +1112,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
1102 1112
 		Package:                    safe_package,
1103 1113
 		ALiquid:                    a_liquid,
1104 1114
 		TargetKtv:                  target_ktv,
1115
+		PreImpulse:                 pre_impulse,
1105 1116
 	}
1106 1117
 
1107 1118
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)

+ 11 - 10
controllers/mobile_api_controllers/dialysis_api_controller_extend.go View File

@@ -67,11 +67,11 @@ func (this *DialysisAPIController) AddMonitorRecord() {
67 67
 	BPType, _ := this.GetInt("bp_type")
68 68
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
69 69
 	venousPressure, _ := this.GetFloat("venous_pressure")
70
-	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
70
+	venousPressureType, _ := this.GetInt64("venous_pressure_type", 1)
71 71
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
72
-	arterialPressureType, _ := this.GetInt64("arterial_pressure_type",1)
73
-	transmembranePressure, _ := this.GetFloat("transmembrane_pressure",0)
74
-	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
72
+	arterialPressureType, _ := this.GetInt64("arterial_pressure_type", 1)
73
+	transmembranePressure, _ := this.GetFloat("transmembrane_pressure", 0)
74
+	transmembranePressureType, _ := this.GetInt64("transmembrane_pressure_type", 1)
75 75
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
76 76
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
77 77
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -89,7 +89,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
89 89
 	monitoringNurse, _ := this.GetInt64("monitoring_nurse")
90 90
 	heparin, _ := this.GetFloat("heparin")
91 91
 	dialysate_flow, _ := this.GetFloat("dialysate_flow")
92
-
92
+	urr := this.GetString("urr")
93 93
 	adminInfo := this.GetMobileAdminUserInfo()
94 94
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
95 95
 	if getPatientErr != nil {
@@ -142,6 +142,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
142 142
 		Modify:                    0,
143 143
 		Heparin:                   heparin,
144 144
 		DialysateFlow:             dialysate_flow,
145
+		Urr:                       urr,
145 146
 	}
146 147
 
147 148
 	err := service.CreateMonitor(&record)
@@ -211,11 +212,11 @@ func (this *DialysisAPIController) EditMonitorRecord() {
211 212
 	BPType, _ := this.GetInt("bp_type")
212 213
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
213 214
 	venousPressure, _ := this.GetFloat("venous_pressure")
214
-	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
215
+	venousPressureType, _ := this.GetInt64("venous_pressure_type", 1)
215 216
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
216
-	arterialPressureType, _ := this.GetInt64("arterial_pressure",1)
217
+	arterialPressureType, _ := this.GetInt64("arterial_pressure", 1)
217 218
 	transmembranePressure, _ := this.GetFloat("transmembrane_pressure")
218
-	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
219
+	transmembranePressureType, _ := this.GetInt64("transmembrane_pressure_type", 1)
219 220
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
220 221
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
221 222
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -233,7 +234,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
233 234
 	displacement_flow_quantity, _ := this.GetFloat("displacement_flow_quantity")
234 235
 	heparin, _ := this.GetFloat("heparin")
235 236
 	dialysate_flow, _ := this.GetFloat("dialysate_flow")
236
-
237
+	urr := this.GetString("urr")
237 238
 	adminInfo := this.GetMobileAdminUserInfo()
238 239
 
239 240
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
@@ -281,7 +282,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
281 282
 	monitor.Modify = adminInfo.AdminUser.Id
282 283
 	monitor.Heparin = heparin
283 284
 	monitor.DialysateFlow = dialysate_flow
284
-
285
+	monitor.Urr = urr
285 286
 	err = service.UpdateMonitor(monitor)
286 287
 	if err != nil {
287 288
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorUpdate)

+ 4 - 0
controllers/mobile_api_controllers/patient_api_controller.go View File

@@ -1660,6 +1660,10 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
1660 1660
 		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
1661 1661
 	}
1662 1662
 
1663
+	if dataBody["pinholing"] != nil && reflect.TypeOf(dataBody["pinholing"]).String() == "string" {
1664
+		pinholing := dataBody["pinholing"].(string)
1665
+		evaluation.Phinholing = pinholing
1666
+	}
1663 1667
 	return
1664 1668
 }
1665 1669
 

+ 7 - 0
models/dialysis.go View File

@@ -267,6 +267,7 @@ type PredialysisEvaluation struct {
267 267
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other"`
268 268
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other"`
269 269
 	HumorExcessiveSymptom          int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
270
+	Phinholing                     string  `gorm:"column:pinholing" json:"pinholing" form:"pinholing"`
270 271
 }
271 272
 
272 273
 func (PredialysisEvaluation) TableName() string {
@@ -555,6 +556,11 @@ type AssessmentAfterDislysis struct {
555 556
 	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`
556 557
 	SealingFluidDispose             int64   `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
557 558
 	SealingFluidSpecial             string  `gorm:"column:sealing_fluid_special" json:"sealing_fluid_special" form:"sealing_fluid_special"`
559
+	DosageOfAnticoagulants          float64 `gorm:"column:dosage_of_anticoagulants" json:"dosage_of_anticoagulants" form:"dosage_of_anticoagulants"`
560
+	SupineSystolicBloodPressure     string  `gorm:"column:supine_systolic_blood_pressure" json:"supine_systolic_blood_pressure" form:"supine_systolic_blood_pressure"`
561
+	SettingPressure                 string  `gorm:"column:setting_pressure" json:"setting_pressure" form:"setting_pressure"`
562
+	SupineDiastolicBloodPressure    string  `gorm:"column:supine_diastolic_blood_pressure" json:"supine_diastolic_blood_pressure" form:"supine_diastolic_blood_pressure"`
563
+	DiastolicPressure               string  `gorm:"column:diastolic_pressure" json:"diastolic_pressure" form:"diastolic_pressure"`
558 564
 }
559 565
 
560 566
 func (AssessmentAfterDislysis) TableName() string {
@@ -653,6 +659,7 @@ type MonitoringRecord struct {
653 659
 	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
654 660
 	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
655 661
 	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
662
+	Urr                       string  `gorm:"column:urr" json:"urr"`
656 663
 }
657 664
 
658 665
 func (MonitoringRecord) TableName() string {

+ 1 - 0
models/patient_models.go View File

@@ -220,6 +220,7 @@ type DialysisPrescription struct {
220 220
 	Package                    int64         `gorm:"column:package" json:"package"`
221 221
 	ALiquid                    int64         `gorm:"column:a_liquid" json:"a_liquid"`
222 222
 	UserAdminRole              UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
223
+	PreImpulse                 float64       `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
223 224
 }
224 225
 
225 226
 func (DialysisPrescription) TableName() string {

+ 15 - 0
service/mobile_dialysis_service.go View File

@@ -1265,3 +1265,18 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
1265 1265
 	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
1266 1266
 	return
1267 1267
 }
1268
+
1269
+func GetFirstDateOfMonth(d time.Time) time.Time {
1270
+	d = d.AddDate(0, 0, -d.Day()+1)
1271
+	return GetZeroTime(d)
1272
+}
1273
+
1274
+func GetZeroTime(d time.Time) time.Time {
1275
+	return time.Date(d.Year(), d.Month(), d.Day(), 0, 0, 0, 0, d.Location())
1276
+}
1277
+
1278
+func GetDialysisCountByPatientId(startime int64, endtime int64, patientid int64, orgid int64) (order []*models.BloodDialysisOrderCount, err error) {
1279
+	db := XTReadDB().Table("xt_dialysis_order as o")
1280
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule AS x ON x.patient_id = o.patient_id   where o.status = 1 and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ? and x.schedule_date = o.dialysis_date and x.status = 1 and o.patient_id = ?", startime, endtime, orgid, patientid).Scan(&order).Group("o.patient_id").Error
1281
+	return order, err
1282
+}