添加字段

controllers/base_api_controller.go

@@ -147,9 +147,6 @@ func (this *BaseAuthAPIController) Prepare() {
 					//获取该角色的所有权限
 					for _, items := range userRolePurviewsArr {
 						id, _ := strconv.ParseInt(items, 10, 64)
-						fmt.Println(id)
-						fmt.Println(item.ID)
-
 						if id == item.ID {
 							isPermission = true
 						}
@@ -213,9 +210,6 @@ func (this *BaseAuthAPIController) Prepare() {
 					//获取该角色的所有权限
 					for _, items := range userRolePurviewsArr {
 						id, _ := strconv.ParseInt(items, 10, 64)
-						fmt.Println(id)
-						fmt.Println(item.ID)
-
 						if id == item.ID {
 							isPermission = true
 						}

controllers/dialysis_api_controller.go

@@ -3960,6 +3960,7 @@ func (c *DialysisApiController) CreateMonitor() {
 	displacement_flow_quantity, _ := c.GetFloat("displacement_flow_quantity", 0)
 
 	heparin, _ := c.GetFloat("heparin", 0)
+	dialysate_flow, _ := c.GetFloat("dialysate_flow", 0)
 
 	ktv, _ := c.GetFloat("ktv", 0)
 	symptom := c.GetString("symptom")
@@ -4017,6 +4018,7 @@ func (c *DialysisApiController) CreateMonitor() {
 		Conductivity:              conductivity,
 		DisplacementFlowQuantity:  displacement_flow_quantity,
 		Heparin:                   heparin,
+		DialysateFlow:             dialysate_flow,
 	}
 
 	err := service.CreateMonitor(&monitorRecord)
@@ -4308,6 +4310,9 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	if AssessmentAfterDislysis.Modifier > 0 {
 		operatorIDs = append(operatorIDs, AssessmentAfterDislysis.Modifier)
 	}
+	//上次透前评估
+	lastPredialysisEvaluation, _ := service.GetLastTimePredialysisEvaluation(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	
 	//透析处方
 	dialysisPrescription, _ := service.FindPatientPrescribeWidyDevideById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	if dialysisPrescription.PrescriptionDoctor > 0 {
@@ -4398,6 +4403,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 		"assessmentAfterDislysis": assessmentAfterDislysis,
 		"predialysName":           predialysName,
 		"FinishNuse":              FinishNuse,
+		"lastPredialysisEvaluation": lastPredialysisEvaluation,
 	})
 
 }

controllers/dialysis_record_api_controller.go

@@ -392,6 +392,7 @@ type EditMonitorParamObject struct {
 	DisplacementFlowQuantity float64 `json:"displacement_flow_quantity"`
 	BloodOxygenSaturation    string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
 	Heparin                  float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow            float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -490,12 +491,13 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringNurse:          adminUserInfo.AdminUser.Id,
 			Conductivity:             monitorParam.Conductivity,
 			DisplacementFlowQuantity: monitorParam.DisplacementFlowQuantity,
-			Status:                1,
-			CreatedTime:           time.Now().Unix(),
-			UpdatedTime:           time.Now().Unix(),
-			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
-			Creator:               adminUserInfo.AdminUser.Id,
-			Heparin:               monitorParam.Heparin,
+			Status:                	  1,
+			CreatedTime:           	  time.Now().Unix(),
+			UpdatedTime:              time.Now().Unix(),
+			BloodOxygenSaturation:    monitorParam.BloodOxygenSaturation,
+			Creator:                  adminUserInfo.AdminUser.Id,
+			Heparin:                  monitorParam.Heparin,
+			DialysateFlow:            monitorParam.DialysateFlow,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -556,6 +558,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.Modify = adminUserInfo.AdminUser.Id
 		monitor.BloodOxygenSaturation = monitorParam.BloodOxygenSaturation
 		monitor.Heparin = monitorParam.Heparin
+		monitor.DialysateFlow = monitorParam.DialysateFlow
 		updateErr := service.UpdateMonitor(monitor)
 		if updateErr != nil {
 			this.ErrorLog("修改透析监测记录失败:%v", updateErr)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -196,7 +196,11 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 			// 获取干体重，先从干体重配置里去读，如果没有，则读取上一次透前评估的干体重
 			weight, err := service.FindLastDryWeightAdjust(adminUserInfo.Org.Id, id)
 			if err == gorm.ErrRecordNotFound {
-				evaluation.DryWeight = lastPredialysisEvaluation.DryWeight
+				if lastPredialysisEvaluation != nil {
+					evaluation.DryWeight = lastPredialysisEvaluation.DryWeight
+				} else {
+					evaluation.DryWeight = 0
+				}
 			} else {
 				evaluation.DryWeight = weight.DryWeight
 			}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -87,6 +87,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	result := this.GetString("result")
 	monitoringNurse, _ := this.GetInt64("monitoring_nurse")
 	heparin, _ := this.GetFloat("heparin")
+	dialysate_flow, _ := this.GetFloat("dialysate_flow")
 
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
@@ -138,6 +139,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		Creator:                   adminInfo.AdminUser.Id,
 		Modify:                    0,
 		Heparin:                   heparin,
+		DialysateFlow:             dialysate_flow,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -227,6 +229,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	conductivity, _ := this.GetFloat("conductivity")
 	displacement_flow_quantity, _ := this.GetFloat("displacement_flow_quantity")
 	heparin, _ := this.GetFloat("heparin")
+	dialysate_flow, _ := this.GetFloat("dialysate_flow")
 
 	adminInfo := this.GetMobileAdminUserInfo()
 
@@ -283,6 +286,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.BloodOxygenSaturation = blood_oxygen_saturation
 	monitor.Modify = adminInfo.AdminUser.Id
 	monitor.Heparin = heparin
+	monitor.DialysateFlow = dialysate_flow
 
 	err = service.UpdateMonitor(monitor)
 	if err != nil {

models/dialysis.go

@@ -148,6 +148,7 @@ type SchedualPatient2 struct {
 	CreatedTime             int64            `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime             int64            `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	DialysisSchedule        DialysisSchedule `gorm:"ForeignKey:PatientId"`
+	InfectiousDiseases      []InfectiousDiseases `gorm:"ForeignKey:PatientId"`
 	Age                     int64            `gorm:"column:age" json:"age"`
 	IsOpenRemind            int64            `gorm:"column:is_open_remind" json:"is_open_remind"`
 	DialysisAge             int64            `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
@@ -279,6 +280,8 @@ type PredialysisEvaluationList struct {
 	AssessmentDate              int64   `gorm:"column:assessment_date" json:"assessment_date"`
 	DialysisOrderId             int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
 	DryWeight                   float64 `gorm:"column:dry_weight" json:"dry_weight"`
+	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	WeightAfterLastTransparency float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency"`
 	WeighingWay                 string  `gorm:"column:weighing_way" json:"weighing_way"`
 	WeighingBefore              float64 `gorm:"column:weighing_before" json:"weighing_before"`
@@ -286,6 +289,7 @@ type PredialysisEvaluationList struct {
 	WeightBefore                float64 `gorm:"column:weight_before" json:"weight_before"`
 	Evaluator                   int64   `gorm:"column:evaluator" json:"evaluator"`
 	Creater                     int64   `gorm:"column:creater" json:"creater"`
+	CreatedTime					int64	`gorm:"column:created_time" json:"created_time"`
 }
 
 func (PredialysisEvaluationList) TableName() string {
@@ -655,6 +659,7 @@ type MonitoringRecord struct {
 	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
 	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
 }
 
 func (MonitoringRecord) TableName() string {

service/dialysis_service.go

@@ -612,6 +612,7 @@ func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSchedule
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
+		Preload("TreatmentSummary", "status = 1 AND user_org_id = ?", orgID).
 		// Preload("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {

service/mobile_dialysis_service.go

@@ -91,6 +91,7 @@ type MDialysisScheduleVM struct {
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
+	TreatmentSummary 		 *models.TreatmentSummary 		   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 	Advices                  []*models.DoctorAdvice            `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
 }
 

service/patient_service.go

@@ -139,7 +139,7 @@ func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient mode
 		return db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
-	}).Where("user_org_id=? and dialysis_no = ? and status=1", orgID, no).First(&patient).Error
+	}).Preload("InfectiousDiseases","status = 1").Where("user_org_id=? and dialysis_no = ? and status=1", orgID, no).First(&patient).Error
 	return
 }
 

数据变更脚本.sql

@@ -74,3 +74,21 @@ INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_nam
 --添加显示封管液配置和封管液特殊的机构 org_id为要显示的机构--
 INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '13','5','sealing_fluid_dispose','封管液配置','1',NULL,NULL,'0');
 INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '13','5','sealing_fluid_special','封管液特殊','1',NULL,NULL,'0');
+
+--2020-06-28 author 张保健 --
+--透中监测添加透析液流量字段--
+ALTER TABLE `sgj_xt`.`xt_monitoring_record`     ADD COLUMN `dialysate_flow` DECIMAL(10,2) DEFAULT '0.00' NULL COMMENT '透析液流量(ml/min)' AFTER `heparin`;
+--显示配置里添加出量--
+INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '0','4','dialysate_flow','透析液流量','2',NULL,NULL,'0');
+--添加显示出量的机构 org_id为要显示的机构--
+INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '13','4','dialysate_flow','透析液流量','1',NULL,NULL,'0');
+
+
+
+
+
+
+
+
+
+