添加字段

controllers/dialysis_api_controller.go

 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 
-	var prescription_doctor int64
+	// var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
 	//	}
 	//}
 
-	if appRole.UserType == 2 || appRole.UserType == 1 {
-		prescription_doctor = appRole.AdminUserId
-	} else {
-		prescription_doctor = 0
-	}
+	
 
 	prescription := models.DialysisPrescription{
 		UserOrgId:                 adminUserInfo.CurrentOrgId,
 		DialysateTemperature:       dialysate_temperature,
 		Conductivity:               conductivity,
 		Remark:                     remark,
-		PrescriptionDoctor:         prescription_doctor,
 		Status:                     1,
 		CreatedTime:                time.Now().Unix(),
 		UpdatedTime:                time.Now().Unix(),
 		ALiquid:                    a_liquid,
 	}
 
+	if appRole.UserType == 2 || appRole.UserType == 1 {
+		prescription.PrescriptionDoctor = appRole.AdminUserId
+	}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if dialysisPrescription.ID == 0 { //新增
 		if mode_id > 0 {
 	assessment.CvcA = data.CvcA
 	assessment.CvcV = data.CvcV
 	assessment.Channel = data.Channel
+	assessment.ReturnBlood = data.ReturnBlood
+	assessment.RehydrationVolume = data.RehydrationVolume
+	assessment.DialysisDuring = data.DialysisDuring
+	assessment.StrokeVolume = data.StrokeVolume
+	assessment.BloodFlow = data.BloodFlow
+	assessment.SealingFluidDispose = data.SealingFluidDispose
+	assessment.SealingFluidSpecial = data.SealingFluidSpecial
+
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	ductus_arantii_other := c.GetString("ductus_arantii_other")
 	machine_type := c.GetString("machine_type")
 	puncture_needle := c.GetString("puncture_needle")
+	humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
 
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		DuctusArantiiOther:             ductus_arantii_other,
 		MachineType:                    machine_type,
 		PunctureNeedle:                 puncture_needle,
+		HumorExcessiveSymptom:			humor_excessive_symptom,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/mobile_api_controllers/dialysis_api_controller.go

 	cvc_a, _ := c.GetFloat("cvc_a", 0)
 	cvc_v, _ := c.GetFloat("cvc_v", 0)
 	channels, _ := c.GetInt64("channel", 0)
+	return_blood,_ := c.GetInt64("return_blood", 0)
+	rehydration_volume,_ := c.GetInt64("rehydration_volume", 0)
+	dialysis_during,_ := c.GetInt64("dialysis_during", 0)
+	stroke_volume,_ := c.GetInt64("stroke_volume", 0)
+	blood_flow,_ := c.GetInt64("blood_flow", 0)
+	sealing_fluid_dispose,_ := c.GetInt64("sealing_fluid_dispose", 0)
+	sealing_fluid_special := c.GetString("sealing_fluid_special")
 
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		CvcA:                         cvc_a,
 		CvcV:                         cvc_v,
 		Channel:                      channels,
+		ReturnBlood:				  return_blood,
+		RehydrationVolume: 			  rehydration_volume,
+		DialysisDuring:			  	  dialysis_during,
+		StrokeVolume:				  stroke_volume,
+		BloodFlow:					  blood_flow,
+		SealingFluidDispose:		  sealing_fluid_dispose,
+		SealingFluidSpecial:		  sealing_fluid_special,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	calcium, _ := c.GetFloat("calcium", 0)
 	bicarbonate, _ := c.GetFloat("bicarbonate", 0)
 	glucose, _ := c.GetFloat("glucose", 0)
-	prescription_doctor, _ := c.GetInt64("prescription_doctor", 0)
+	// prescription_doctor, _ := c.GetInt64("prescription_doctor", 0)
 
 	// dry_weight, _ := c.GetFloat("dry_weight", 0)
 	dialysate_flow, _ := c.GetFloat("dialysate_flow", 0)
 		// DryWeight:                 dry_weight,
 		DialysateFlow:              dialysate_flow,
 		DialysateTemperature:       dialysate_temperature,
-		PrescriptionDoctor:         prescription_doctor,
+		// PrescriptionDoctor:         prescription_doctor,
 		ReplacementTotal:           replacement_total,
 		Conductivity:               conductivity,
 		Remark:                     remark,
 		//	//service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 		//}
 		if appRole.UserType == 2 || appRole.UserType == 1 {
-			prescription_doctor = adminUserInfo.AdminUser.Id
-		} else {
-			prescription_doctor = 0
-		}
+			prescription.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+		} 
 
 		prescription.Creater = adminUserInfo.AdminUser.Id
 		err := service.AddSigleRecord(&prescription)

controllers/mobile_api_controllers/patient_api_controller.go

 
 	code := predialysisEvaluationFormData(&evaluation, c.Ctx.Input.RequestBody)
 
+
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
 		return
 		evaluation.PunctureNeedle = punctureNeedle
 	}
 
+	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "float64" {
+		humor_excessive_symptom := int64(dataBody["humor_excessive_symptom"].(float64))
+		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
+	}
+
 	return
 }
 

controllers/schedule_api_controller.go

 					err_log := models.ExportErrLog{
 						LogType:    2,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该患者",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
 		errLogs, _ := service.FindSchedualExportLog(this.GetAdminUserInfo().CurrentOrgId, export_time)
 
 		if len(schedules) > 0 {
-			schedule_date := this.GetString("date")
+			schedule_date := time.Now().Format("2006-01-02")
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 			clear_schedule_date := date.Unix() //根据日期去清除，该日期以及未来的排班数据
 			err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 					err_log := models.ExportErrLog{
 						LogType:   2,
 						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+						ErrMsg: "当前日期(" + time.Now().Format("2006-01-02") + " " + GetWeekString(time.Now().Weekday().String()) +
 							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 					err_log := models.ExportErrLog{
 						LogType:   2,
 						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+						ErrMsg: "当前日期(" + time.Now().Format("2006-01-02") + " " + GetWeekString(time.Now().Weekday().String()) +
 							")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 				err_log := models.ExportErrLog{
 					LogType:   2,
 					UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg: "当前日期(" + this.GetString("date") + " " + GetWeekString(time.Now().Weekday().String()) +
+					ErrMsg: "当前日期(" + time.Now().Format("2006-01-02") + " " + GetWeekString(time.Now().Weekday().String()) +
 						")及以前的排班数据" + strconv.FormatInt(int64(failed_total), 10) + "条，不执行导入",
 					Status:     1,
 					CreateTime: time.Now().Unix(),
 						LogType:   3,
 						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
 						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
-						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该患者",
 
 						Status:     1,
 						CreateTime: time.Now().Unix(),

models/dialysis.go

 	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other"`
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other"`
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other"`
+	HumorExcessiveSymptom		   int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
 }
 
 func (PredialysisEvaluation) TableName() string {
 	DialysisIntakesUnit             int64   `gorm:"column:dialysis_intakes_unit" json:"dialysis_intakes_unit"`
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
 	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
+	ReturnBlood                     int64   `gorm:"column:return_blood" json:"return_blood" form:"return_blood"`
+	RehydrationVolume               int64   `gorm:"column:rehydration_volume" json:"rehydration_volume" form:"rehydration_volume"`
+	DialysisDuring               	int64   `gorm:"column:dialysis_during" json:"dialysis_during" form:"dialysis_during"`
+	StrokeVolume               		int64   `gorm:"column:stroke_volume" json:"stroke_volume" form:"stroke_volume"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
+	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`
+	SealingFluidDispose             int64   `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
+	SealingFluidSpecial             string  `gorm:"column:sealing_fluid_special" json:"sealing_fluid_special" form:"sealing_fluid_special"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

service/dialysis_service.go

 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentMode", "status = 1").
 		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("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {

数据变更脚本.sql

 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','3','humor_excessive_symptom','体液过多症状','1',NULL,NULL,'0');
 
 
+--2020-06-19 author 张保健 --
+--透后评估添加回血字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_after_dislysis`     ADD COLUMN `return_blood` INT(8) DEFAULT '0' NULL COMMENT '回血' AFTER `channel`;
+--显示配置里添加回血--
+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','5','return_blood','回血','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','5','return_blood','回血','1',NULL,NULL,'0');
+
+--透后评估添加补液量字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_after_dislysis`     ADD COLUMN `rehydration_volume` INT(8) DEFAULT '0' NULL COMMENT '补液量' AFTER `return_blood`;
+--显示配置里添加补液量--
+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','5','rehydration_volume','补液量','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','5','rehydration_volume','补液量','1',NULL,NULL,'0');
+
+--透后评估添加透析中进食字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_after_dislysis`     ADD COLUMN `dialysis_during` INT(8) DEFAULT '0' NULL COMMENT '透析中进食' AFTER `rehydration_volume`;
+--显示配置里添加透析中进食--
+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','5','dialysis_during','透析中进食','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','5','dialysis_during','透析中进食','1',NULL,NULL,'0');
+
+--透后评估添加出量字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_after_dislysis`     ADD COLUMN `stroke_volume` INT(8) DEFAULT '0' NULL COMMENT '出量' AFTER `dialysis_during`;
+--显示配置里添加出量--
+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','5','stroke_volume','出量','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','5','stroke_volume','出量','1',NULL,NULL,'0');
+
+
+--2020-06-22 author 张保健 --
+--透后评估添加血流量字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_after_dislysis`     ADD COLUMN `blood_flow` TINYINT(3) DEFAULT '0' NULL COMMENT '血流量' AFTER `stroke_volume`;
+--数据字典表里添加血流量--
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '0','hemodialysis','0','血流量','blood_flow','0','2020-06-17 16:56:00','2020-06-17 16:56:00','0','1',NULL,'0',NULL,NULL,'0');
+--数据字典表里添加血流量配置项，parent_id为上条语句的id--
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '2006','hemodialysis','0','充足',NULL,'1','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',NULL,NULL,'0');
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '2006','hemodialysis','0','一般',NULL,'2','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',NULL,NULL,'0');
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '2006','hemodialysis','0','差',NULL,'3','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',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 ( '0','5','blood_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','5','blood_flow','血流量','1',NULL,NULL,'0');
+
+
+--2020-06-23 author 张保健 --
+--透后评估添加封管液配置和封管液特殊字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_after_dislysis`     ADD COLUMN `sealing_fluid_dispose` TINYINT(3) DEFAULT '0' NULL COMMENT '封管液配置' AFTER `blood_flow`,     ADD COLUMN `sealing_fluid_special` VARCHAR(100) NULL COMMENT '封管液特殊' AFTER `sealing_fluid_dispose`;
+
+--数据字典表里添加封管液配置--
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '0','hemodialysis','0','封管液配置','sealing_fluid_dispose','0','2020-06-17 16:56:00','2020-06-17 16:56:00','0','1',NULL,'0',NULL,NULL,'0');
+--数据字典表里添加体液过多症状配置项，parent_id为上条语句的id--
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '2010','hemodialysis','0','常规（肝素/NS）1:1',NULL,'1','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',NULL,NULL,'0');
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '2010','hemodialysis','0','特殊',NULL,'2','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',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 ( '0','5','sealing_fluid_dispose','封管液配置','2',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 ( '0','5','sealing_fluid_special','封管液特殊','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','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');