Merge branch 'master' of http://git.shengws.com/csx/XT_New into 20200710_xt_api_new_branch

controllers/base_api_controller.go

@@ -4,6 +4,8 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 
+	//"XT_New/models"
+
 	//"XT_New/models"
 	"XT_New/service"
 	"fmt"
@@ -97,6 +99,7 @@ func (this *BaseAuthAPIController) Prepare() {
 
 		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		//this.StopRun()
+
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
@@ -136,9 +139,9 @@ func (this *BaseAuthAPIController) Prepare() {
 			allPermission, _ := service.GetAllFunctionPurview()
 
 			for _, item := range allPermission {
-				fmt.Println(len(strings.Split(item.Urlfor, ",")))
+				// fmt.Println(len(strings.Split(item.Urlfor, ",")))
 
-				fmt.Println(strings.Split(item.Urlfor, ","))
+				// fmt.Println(strings.Split(item.Urlfor, ","))
 				//fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 
 				//判断当前路由是否在权限路由列表里面
@@ -147,9 +150,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
 						}
@@ -204,8 +204,8 @@ func (this *BaseAuthAPIController) Prepare() {
 			allPermission, _ := service.GetAllFunctionPurview()
 
 			for _, item := range allPermission {
-				fmt.Println(strings.Split(item.Urlfor, ",")[2])
-				fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+				// fmt.Println(strings.Split(item.Urlfor, ",")[2])
+				// fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[2] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {
@@ -213,9 +213,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/data_api_controller.go

@@ -69,27 +69,20 @@ func (c *DataApiController) CreateConfig() {
 	var dataconfig models.Dataconfig
 	var resultConfig models.ConfigViewModel
 	code := configFormData(&dataconfig, c.Ctx.Input.RequestBody)
-	fmt.Println("code----------", code)
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
 		return
 	}
 	// 验证关键字段的值是否重复
-	// if (dataconfig.Module == "education" || dataconfig.Module == "summary") {
-	// 	thisConfig,_:=service.FindConfigByTitle(dataconfig.Module, dataconfig.FieldName,dataconfig.OrgId)
-	// 	if thisConfig.ID >0 {
-	// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
-	// 		return
-	// 	}
-	// } else {
-	// 	thisConfig,_:=service.FindConfigByFieldname(dataconfig.Module, dataconfig.FieldName,dataconfig.OrgId)
-	// 	if thisConfig.ID >0 {
-	// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
-	// 		return
-	// 	}
-	// }
-	// fieldValue:=service.GetChildValue(dataconfig.Module, dataconfig.ParentId)
-	// dataconfig.Value = fieldValue+1
+
+	thisConfig, _ := service.FindConfigByTitle(dataconfig.Module, dataconfig.FieldName, adminUserInfo.CurrentOrgId)
+	if thisConfig.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
+		return
+	}
+
+	fieldValue := service.GetChildValue(dataconfig.Module, dataconfig.ParentId, adminUserInfo.CurrentOrgId)
+	dataconfig.Value = fieldValue + 1
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)

controllers/dialysis_api_controller.go

@@ -138,7 +138,7 @@ func (c *DialysisApiController) PostPrescription() {
 	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)
 
@@ -155,12 +155,6 @@ func (c *DialysisApiController) PostPrescription() {
 	//	}
 	//}
 
-	if appRole.UserType == 2 || appRole.UserType == 1 {
-		prescription_doctor = appRole.AdminUserId
-	} else {
-		prescription_doctor = 0
-	}
-
 	prescription := models.DialysisPrescription{
 		UserOrgId:                 adminUserInfo.CurrentOrgId,
 		PatientId:                 patient,
@@ -190,7 +184,6 @@ func (c *DialysisApiController) PostPrescription() {
 		DialysateTemperature:       dialysate_temperature,
 		Conductivity:               conductivity,
 		Remark:                     remark,
-		PrescriptionDoctor:         prescription_doctor,
 		Status:                     1,
 		CreatedTime:                time.Now().Unix(),
 		UpdatedTime:                time.Now().Unix(),
@@ -223,6 +216,10 @@ func (c *DialysisApiController) PostPrescription() {
 		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 {
@@ -3069,6 +3066,13 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	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)
 
@@ -3183,6 +3187,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	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,
@@ -3233,6 +3238,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		DuctusArantiiOther:             ductus_arantii_other,
 		MachineType:                    machine_type,
 		PunctureNeedle:                 puncture_needle,
+		HumorExcessiveSymptom:          humor_excessive_symptom,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -3308,6 +3314,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		var mode_id int64
 		if schedual != nil {
 			dialysisPrescribe, _ = service.MobileGetDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, patient, recordDate.Unix(), schedual.ModeId)
+			if dialysisPrescribe == nil {
+				dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+			}
 			lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
 			// 获取透析模版
 			dialysisSolution, _ = service.MobileGetDialysisSolutionByModeId(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
@@ -3948,6 +3957,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")
@@ -4005,6 +4015,7 @@ func (c *DialysisApiController) CreateMonitor() {
 		Conductivity:              conductivity,
 		DisplacementFlowQuantity:  displacement_flow_quantity,
 		Heparin:                   heparin,
+		DialysateFlow:             dialysate_flow,
 	}
 
 	err := service.CreateMonitor(&monitorRecord)
@@ -4296,6 +4307,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 {
@@ -4358,34 +4372,35 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"xtdate":                  xtdate,
-		"users":                   adminUser,
-		"patientInfo":             patientInfo,
-		"PredialysisEvaluation":   PredialysisEvaluation,
-		"AssessmentAfterDislysis": AssessmentAfterDislysis,
-		"dialysisPrescription":    dialysisPrescription,
-		"advices":                 DoctorAdvice,
-		"monitors":                Record,
-		"summary":                 TreatmentSummary,
-		"receiverTreatmentAccess": receiverTreatmentAccess,
-		"dialysisOrder":           dialysisOrder,
-		"operators":               operators,
-		"org_template_info":       templateInfo,
-		"check":                   check,
-		"schedule":                schedule,
-		"dialysisway":             dialysisway,
-		"order":                   order,
-		"doctorAdvice":            doctorAdvice,
-		"doctor":                  doctor,
-		"nurse":                   nurse,
-		"doctorAdevieInfo":        doctorAdevieInfo,
-		"total":                   total,
-		"startNuse":               startNuse,
-		"DoctorName":              DoctorName,
-		"monitor":                 monitor,
-		"assessmentAfterDislysis": assessmentAfterDislysis,
-		"predialysName":           predialysName,
-		"FinishNuse":              FinishNuse,
+		"xtdate":                    xtdate,
+		"users":                     adminUser,
+		"patientInfo":               patientInfo,
+		"PredialysisEvaluation":     PredialysisEvaluation,
+		"AssessmentAfterDislysis":   AssessmentAfterDislysis,
+		"dialysisPrescription":      dialysisPrescription,
+		"advices":                   DoctorAdvice,
+		"monitors":                  Record,
+		"summary":                   TreatmentSummary,
+		"receiverTreatmentAccess":   receiverTreatmentAccess,
+		"dialysisOrder":             dialysisOrder,
+		"operators":                 operators,
+		"org_template_info":         templateInfo,
+		"check":                     check,
+		"schedule":                  schedule,
+		"dialysisway":               dialysisway,
+		"order":                     order,
+		"doctorAdvice":              doctorAdvice,
+		"doctor":                    doctor,
+		"nurse":                     nurse,
+		"doctorAdevieInfo":          doctorAdevieInfo,
+		"total":                     total,
+		"startNuse":                 startNuse,
+		"DoctorName":                DoctorName,
+		"monitor":                   monitor,
+		"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]
@@ -496,6 +497,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			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.go

@@ -799,6 +799,13 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	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)
@@ -879,6 +886,13 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		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)
@@ -973,7 +987,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	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)
@@ -1052,9 +1066,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		Bicarbonate:               bicarbonate,
 		Glucose:                   glucose,
 		// DryWeight:                 dry_weight,
-		DialysateFlow:              dialysate_flow,
-		DialysateTemperature:       dialysate_temperature,
-		PrescriptionDoctor:         prescription_doctor,
+		DialysateFlow:        dialysate_flow,
+		DialysateTemperature: dialysate_temperature,
+		// PrescriptionDoctor:         prescription_doctor,
 		ReplacementTotal:           replacement_total,
 		Conductivity:               conductivity,
 		Remark:                     remark,
@@ -1096,9 +1110,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//	//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

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 {

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -135,8 +135,8 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			allPermission, _ := service.GetAllFunctionPurview()
 
 			for _, item := range allPermission {
-				fmt.Println(strings.Split(item.Urlfor, ",")[0])
-				fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+				// fmt.Println(strings.Split(item.Urlfor, ",")[0])
+				// fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1652,6 +1652,11 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		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/patient_api_controller.go

@@ -252,29 +252,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                    adminUserInfo.CurrentOrgId,
-		UserId:                       0,
-		Avatar:                       patients.Avatar,
-		PatientType:                  patients.PatientType,
-		DialysisNo:                   patients.DialysisNo,
-		AdmissionNumber:              patients.AdmissionNumber,
-		Source:                       patients.Source,
-		Lapseto:                      patients.Lapseto,
-		PartitionId:                  patients.PartitionId,
-		BedId:                        patients.BedId,
-		Name:                         patients.Name,
-		Alias:                        patients.Alias,
-		Gender:                       patients.Gender,
-		MaritalStatus:                patients.MaritalStatus,
-		IdCardNo:                     patients.IdCardNo,
-		Birthday:                     patients.Birthday,
-		ReimbursementWayId:           patients.ReimbursementWayId,
-		HealthCareType:               patients.HealthCareType,
-		HealthCareNo:                 patients.HealthCareNo,
-		HealthCareDueDate:            patients.HealthCareDueDate,
-		Height:                       patients.Height,
-		BloodType:                    patients.BloodType,
-		Rh:                           patients.Rh,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		UserId:             0,
+		Avatar:             patients.Avatar,
+		PatientType:        patients.PatientType,
+		DialysisNo:         patients.DialysisNo,
+		AdmissionNumber:    patients.AdmissionNumber,
+		Source:             patients.Source,
+		Lapseto:            patients.Lapseto,
+		PartitionId:        patients.PartitionId,
+		BedId:              patients.BedId,
+		Name:               patients.Name,
+		Alias:              patients.Alias,
+		Gender:             patients.Gender,
+		MaritalStatus:      patients.MaritalStatus,
+		IdCardNo:           patients.IdCardNo,
+		Birthday:           patients.Birthday,
+		ReimbursementWayId: patients.ReimbursementWayId,
+		HealthCareType:     patients.HealthCareType,
+		HealthCareNo:       patients.HealthCareNo,
+		HealthCareDueDate:  patients.HealthCareDueDate,
+		Height:             patients.Height,
+		BloodType:          patients.BloodType,
+		Rh:                 patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -320,28 +320,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
-		IsInfectious:                 patients.IsInfectious,
-		RemindCycle:                  patients.RemindCycle,
-		ResponseResult:               patients.ResponseResult,
-		IsOpenRemind:                 patients.IsOpenRemind,
-		FirstTreatmentDate:           patients.FirstTreatmentDate,
-		DialysisAge:                  patients.DialysisAge,
-		ExpenseKind:                  patients.ExpenseKind,
-		TellPhone:                    patients.TellPhone,
-		ContactName:                  patients.ContactName,
-		BloodPatients:                1,
-		SlowPatients:                 0,
-		MemberPatients:               0,
-		EcommerPatients:              "",
-		BloodId:                      patients.ID,
-		SlowId:                       0,
-		MemberId:                     0,
-		MemberFistdate:               0,
-		MemberPatienttype:            0,
-		MemberTreatement:             0,
-		EquitmentId:                  "",
-		UserSysBeforeCount:           patient.UserSysBeforeCount,
+		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
+		IsInfectious:             patients.IsInfectious,
+		RemindCycle:              patients.RemindCycle,
+		ResponseResult:           patients.ResponseResult,
+		IsOpenRemind:             patients.IsOpenRemind,
+		FirstTreatmentDate:       patients.FirstTreatmentDate,
+		DialysisAge:              patients.DialysisAge,
+		ExpenseKind:              patients.ExpenseKind,
+		TellPhone:                patients.TellPhone,
+		ContactName:              patients.ContactName,
+		BloodPatients:            1,
+		SlowPatients:             0,
+		MemberPatients:           0,
+		EcommerPatients:          "",
+		BloodId:                  patients.ID,
+		SlowId:                   0,
+		MemberId:                 0,
+		MemberFistdate:           0,
+		MemberPatienttype:        0,
+		MemberTreatement:         0,
+		EquitmentId:              "",
+		UserSysBeforeCount:       patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -480,28 +480,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:                 patient.UserOrgId,
-		UserId:                    patient.UserId,
-		Avatar:                    patient.Avatar,
-		PatientType:               patient.PatientType,
-		DialysisNo:                patient.DialysisNo,
-		AdmissionNumber:           patient.AdmissionNumber,
-		Source:                    patient.Source,
-		PartitionId:               patient.PartitionId,
-		BedId:                     patient.BedId,
-		Name:                      patient.Name,
-		Alias:                     patient.Alias,
-		Gender:                    patient.Gender,
-		MaritalStatus:             patient.MaritalStatus,
-		IdCardNo:                  patient.IdCardNo,
-		Birthday:                  patient.Birthday,
-		ReimbursementWayId:        patient.ReimbursementWayId,
-		HealthCareType:            patient.HealthCareType,
-		HealthCareNo:              patient.HealthCareNo,
-		HealthCareDueDate:         patient.HealthCareDueDate,
-		Height:                    patient.Height,
-		BloodType:                 patient.BloodType,
-		Rh:                        patient.Rh,
+		UserOrgId:          patient.UserOrgId,
+		UserId:             patient.UserId,
+		Avatar:             patient.Avatar,
+		PatientType:        patient.PatientType,
+		DialysisNo:         patient.DialysisNo,
+		AdmissionNumber:    patient.AdmissionNumber,
+		Source:             patient.Source,
+		PartitionId:        patient.PartitionId,
+		BedId:              patient.BedId,
+		Name:               patient.Name,
+		Alias:              patient.Alias,
+		Gender:             patient.Gender,
+		MaritalStatus:      patient.MaritalStatus,
+		IdCardNo:           patient.IdCardNo,
+		Birthday:           patient.Birthday,
+		ReimbursementWayId: patient.ReimbursementWayId,
+		HealthCareType:     patient.HealthCareType,
+		HealthCareNo:       patient.HealthCareNo,
+		HealthCareDueDate:  patient.HealthCareDueDate,
+		Height:             patient.Height,
+		BloodType:          patient.BloodType,
+		Rh:                 patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -543,17 +543,17 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
-		IsInfectious:              patient.IsInfectious,
-		RemindCycle:               patient.RemindCycle,
-		ResponseResult:            patient.ResponseResult,
-		IsOpenRemind:              patient.IsOpenRemind,
-		FirstTreatmentDate:        patient.FirstTreatmentDate,
-		DialysisAge:               patient.DialysisAge,
-		ExpenseKind:               patient.ExpenseKind,
-		TellPhone:                 patient.TellPhone,
-		ContactName:               patient.ContactName,
-		UpdatedTime:               time.Now().Unix(),
+		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
+		IsInfectious:             patient.IsInfectious,
+		RemindCycle:              patient.RemindCycle,
+		ResponseResult:           patient.ResponseResult,
+		IsOpenRemind:             patient.IsOpenRemind,
+		FirstTreatmentDate:       patient.FirstTreatmentDate,
+		DialysisAge:              patient.DialysisAge,
+		ExpenseKind:              patient.ExpenseKind,
+		TellPhone:                patient.TellPhone,
+		ContactName:              patient.ContactName,
+		UpdatedTime:              time.Now().Unix(),
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -628,7 +628,6 @@ func (c *PatientApiController) EditPatient() {
 
 func (c *PatientApiController) EditLapseto() {
 	id, _ := c.GetInt64("id", 0)
-	fmt.Println("id===========", id)
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -3497,7 +3496,7 @@ func (c *PatientApiController) ExportPatients() {
 
 					//需要判断该号码是否已经在系统内存在了，存在了则生成一条导入错误日志
 					count := service.FindPatientPhoneIsExist(phone, c.GetAdminUserInfo().CurrentOrgId)
-					if count > 1 {
+					if count >= 1 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
 							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
@@ -3555,7 +3554,7 @@ func (c *PatientApiController) ExportPatients() {
 					//	}
 					//}
 					count := service.FindPatientIdCardNoIsExist(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
-					if count > 1 {
+					if count >= 1 {
 						//if tempPatient != nil && tempPatient.ID > 0 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
@@ -3807,6 +3806,7 @@ func (c *PatientApiController) ExportPatients() {
 			patient.CreatedTime = time.Now().Unix()
 			patient.UpdatedTime = time.Now().Unix()
 			patient.Status = 1
+			patient.Avatar = "https://images.shengws.com/201809182128111.png"
 			patient.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
 			patient.IsExcelExport = 1
 			patient.PatientType = 1

models/dialysis.go

@@ -83,79 +83,80 @@ func (SchedualPatient) TableName() string {
 }
 
 type SchedualPatient2 struct {
-	ID                      int64            `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId               int64            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	UserId                  int64            `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	PatientType             int64            `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	Avatar                  string           `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	DialysisNo              string           `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	AdmissionNumber         string           `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
-	Source                  int64            `gorm:"column:source" json:"source" form:"source"`
-	Lapseto                 int64            `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	PartitionId             int64            `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId                   int64            `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	Name                    string           `gorm:"column:name" json:"name" form:"name"`
-	Alias                   string           `gorm:"column:alias" json:"alias" form:"alias"`
-	Gender                  int64            `gorm:"column:gender" json:"gender" form:"gender"`
-	Nation                  string           `gorm:"column:nation" json:"nation" form:"nation"`
-	NativePlace             string           `gorm:"column:native_place" json:"native_place" form:"native_place"`
-	MaritalStatus           int64            `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
-	IdCardNo                string           `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Birthday                int64            `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	ReimbursementWayId      int64            `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
-	HealthCareType          int64            `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
-	HealthCareNo            string           `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
-	HealthCareDueDate       int64            `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
-	Height                  int64            `gorm:"column:height" json:"height" form:"height"`
-	BloodType               int64            `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
-	Rh                      int64            `gorm:"column:rh" json:"rh" form:"rh"`
-	HealthCareDueAlertDate  int64            `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
-	EducationLevel          int64            `gorm:"column:education_level" json:"education_level" form:"education_level"`
-	Profession              int64            `gorm:"column:profession" json:"profession" form:"profession"`
-	Phone                   string           `gorm:"column:phone" json:"phone" form:"phone"`
-	HomeTelephone           string           `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
-	RelativePhone           string           `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
-	RelativeRelations       string           `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
-	HomeAddress             string           `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	WorkUnit                string           `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
-	UnitAddress             string           `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
-	Children                int64            `gorm:"column:children" json:"children" form:"children"`
-	ReceivingDate           int64            `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
-	IsHospitalFirstDialysis int64            `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
-	FirstDialysisDate       int64            `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
-	FirstDialysisHospital   string           `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
-	InductionPeriod         int64            `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
-	InitialDialysis         int64            `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
-	TotalDialysis           int64            `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
-	AttendingDoctorId       int64            `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
-	HeadNurseId             int64            `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
-	Evaluate                string           `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
-	Diagnose                string           `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
-	Remark                  string           `gorm:"column:remark" json:"remark" form:"remark"`
-	RegistrarsId            int64            `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
-	Registrars              string           `gorm:"column:registrars" json:"registrars" form:"registrars"`
-	QrCode                  string           `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
-	BindingState            int64            `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
-	PatientComplains        string           `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
-	PresentHistory          string           `gorm:"column:present_history" json:"present_history"`     // 现病史
-	PastHistory             string           `gorm:"column:past_history" json:"past_history"`           // 既往史
-	Temperature             float64          `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
-	Pulse                   int64            `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
-	Respiratory             int64            `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
-	SBP                     int64            `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
-	DBP                     int64            `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
-	Status                  int64            `gorm:"column:status" json:"status" form:"status"`
-	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"`
-	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"`
-	ExpenseKind             int64            `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
-	TellPhone               string           `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
-	FirstTreatmentDate      int64            `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
-	ContactName             string           `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
-	UserSysBeforeCount      int64            `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	ID                      int64                `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId               int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId                  int64                `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	PatientType             int64                `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	Avatar                  string               `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	DialysisNo              string               `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber         string               `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                  int64                `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                 int64                `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId             int64                `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                   int64                `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                    string               `gorm:"column:name" json:"name" form:"name"`
+	Alias                   string               `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                  int64                `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                  string               `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace             string               `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	MaritalStatus           int64                `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo                string               `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                int64                `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ReimbursementWayId      int64                `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	HealthCareType          int64                `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo            string               `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	HealthCareDueDate       int64                `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
+	Height                  int64                `gorm:"column:height" json:"height" form:"height"`
+	BloodType               int64                `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                      int64                `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate  int64                `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	EducationLevel          int64                `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession              int64                `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                   string               `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone           string               `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone           string               `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations       string               `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress             string               `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                string               `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress             string               `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                int64                `gorm:"column:children" json:"children" form:"children"`
+	ReceivingDate           int64                `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis int64                `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate       int64                `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital   string               `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	InductionPeriod         int64                `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
+	InitialDialysis         int64                `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
+	TotalDialysis           int64                `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	AttendingDoctorId       int64                `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId             int64                `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Evaluate                string               `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                string               `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                  string               `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId            int64                `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars              string               `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode                  string               `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState            int64                `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	PatientComplains        string               `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory          string               `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory             string               `gorm:"column:past_history" json:"past_history"`           // 既往史
+	Temperature             float64              `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
+	Pulse                   int64                `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
+	Respiratory             int64                `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
+	SBP                     int64                `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
+	DBP                     int64                `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
+	Status                  int64                `gorm:"column:status" json:"status" form:"status"`
+	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"`
+	ExpenseKind             int64                `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone               string               `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate      int64                `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	ContactName             string               `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	UserSysBeforeCount      int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (SchedualPatient2) TableName() string {
@@ -265,6 +266,7 @@ type PredialysisEvaluation struct {
 	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 {
@@ -278,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"`
@@ -285,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 {
@@ -550,7 +555,14 @@ type AssessmentAfterDislysis struct {
 	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 {
@@ -647,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

@@ -610,6 +610,9 @@ func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSchedule
 		// 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("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

@@ -89,8 +89,9 @@ type MDialysisScheduleVM struct {
 	DeviceZone               *models.DeviceZone                `gorm:"ForeignKey:PartitionId" json:"device_zone"`
 	TreatmentMode            *models.TreatmentMode             `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
 	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"`
+	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
+	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
+	TreatmentSummary         *models.TreatmentSummary          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
 	Advices                  []*models.DoctorAdvice            `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
 }
 
@@ -113,6 +114,7 @@ type MSchedualPatientVMList struct {
 	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	UserId             int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
 	PatientType        int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo         string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	Avatar             string `gorm:"column:avatar" json:"avatar" form:"avatar"`
 	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
 	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`

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
 }
 
@@ -329,7 +329,7 @@ func UpdatePatient(patient *models.Patients, contagions []int64, diseases []int6
 		utx.Rollback()
 		return
 	}
-	if len(contagions) > 0 {
+	if len(contagions) > 0 && patient.IsInfectious == 2 {
 		thisSQL := "INSERT INTO xt_patients_infectious_diseases (patient_id, disease_id, status, created_time, updated_time) VALUES "
 		insertParams := make([]string, 0)
 		insertData := make([]interface{}, 0)

service/patientmanage_service.go

@@ -1050,7 +1050,7 @@ func GetInspectionDetail(patientid int64, date int64, orgid int64, projectid int
 	if projectid > 0 {
 		db = db.Where("x.project_id = ?", projectid)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id ").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
 	return inspection, err
 }
 
@@ -1444,3 +1444,9 @@ func SaveNameTwo(id int64, orgid int64, role *models.SgjUserAdminRole) error {
 	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =? and org_id = ?", id, orgid).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func AddPatientLapseto(lapseto *models.PatientLapseto) error {
+
+	err := XTWriteDB().Create(&lapseto).Error
+	return err
+}

数据变更脚本.sql

@@ -0,0 +1,94 @@
+--2020-06-17 author 张保健 --
+--透前评估添加体液过多症状字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_before_dislysis`     ADD COLUMN `humor_excessive_symptom` SMALLINT(2) DEFAULT '0' NULL COMMENT '体液过多症状' AFTER `dialysis_intakes_unit`;
+--数据字典表里添加体液过多症状--
+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','体液过多症状','humor_excessive_symptom','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 ( '1997','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 ( '1997','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 ( '1997','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_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 ( '1997','hemodialysis','0','下肢水肿+++',NULL,'4','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','3','humor_excessive_symptom','体液过多症状','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 ( '9883','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');
+
+--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');
+
+
+
+
+
+
+
+
+
+