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

controllers/device_api_controller.go

@@ -1145,7 +1145,7 @@ func (this *DeviceAPIController) GetAllMachineInfo() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
 	addmahcer, total, err := service.GetAllMachineInfo(page, limit, searchKey, zoneid, equipmentid, statusid, orgid)
-	//fmt.Println("err------------------------------------------------------", err)
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "查询设备失败")
 		return

controllers/dialysis_api_controller.go

@@ -137,7 +137,8 @@ func (c *DialysisApiController) PostPrescription() {
 	tubing_hemodialysis, _ := c.GetInt64("tubing_hemodialysis", 0)
 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
-
+	preImpules, _ := c.GetFloat("pre_impulse", 0)
+	fmt.Println("========================================================", preImpules)
 	// var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -214,6 +215,7 @@ func (c *DialysisApiController) PostPrescription() {
 		TubingHemodialysis:         tubing_hemodialysis,
 		Package:                    safe_package,
 		ALiquid:                    a_liquid,
+		PreImpulse:                 preImpules,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -3018,7 +3020,6 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	}
 
 	assessment, _ := service.FindAssessmentAfterDislysisById(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
-
 	assessment.DialysisOrderId = data.DialysisOrderId
 	assessment.Evaluator = adminUserInfo.AdminUser.Id
 	assessment.Status = 1
@@ -3073,7 +3074,12 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.BloodFlow = data.BloodFlow
 	assessment.SealingFluidDispose = data.SealingFluidDispose
 	assessment.SealingFluidSpecial = data.SealingFluidSpecial
-
+	assessment.DosageOfAnticoagulants = data.DosageOfAnticoagulants
+	assessment.SupineSystolicBloodPressure = data.SupineSystolicBloodPressure
+	assessment.SettingPressure = data.SettingPressure
+	assessment.SupineDiastolicBloodPressure = data.SupineDiastolicBloodPressure
+	assessment.DiastolicPressure = data.DiastolicPressure
+	assessment.AdditionalWeight = data.AdditionalWeight
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -3190,6 +3196,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	machine_type := c.GetString("machine_type")
 	puncture_needle := c.GetString("puncture_needle")
 	humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
+	phinholing := c.GetString("pinholing")
 
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
@@ -3241,6 +3248,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		MachineType:                    machine_type,
 		PunctureNeedle:                 puncture_needle,
 		HumorExcessiveSymptom:          humor_excessive_symptom,
+		Phinholing:                     phinholing,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -4282,6 +4290,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", xtdate+" 00:00:00", loc)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -4382,6 +4391,12 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
 	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
+
+	//获取当前日期月份的第一天
+	firstmonth := service.GetFirstDateOfMonth(theTime)
+	firstMonthDate := firstmonth.Unix()
+	//获取当前月份的病人透析次数
+	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"xtdate":                    xtdate,
 		"users":                     adminUser,
@@ -4411,6 +4426,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 		"predialysName":             predialysName,
 		"FinishNuse":                FinishNuse,
 		"lastPredialysisEvaluation": lastPredialysisEvaluation,
+		"dialysiscount":             dialysiscount,
 	})
 
 }

controllers/dialysis_record_api_controller.go

@@ -396,6 +396,8 @@ type EditMonitorParamObject struct {
 	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"`
+	Urr                       string  `gorm:"column:urr" json:"urr" form:"urr"`
+	BloodSugar                float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -497,13 +499,15 @@ 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,
-			DialysateFlow:         monitorParam.DialysateFlow,
+			Status:                    1,
+			CreatedTime:               time.Now().Unix(),
+			UpdatedTime:               time.Now().Unix(),
+			BloodOxygenSaturation:     monitorParam.BloodOxygenSaturation,
+			Creator:                   adminUserInfo.AdminUser.Id,
+			Heparin:                   monitorParam.Heparin,
+			DialysateFlow:             monitorParam.DialysateFlow,
+			Urr:                       monitorParam.Urr,
+			BloodSugar:                monitorParam.BloodSugar,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -568,6 +572,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.BloodOxygenSaturation = monitorParam.BloodOxygenSaturation
 		monitor.Heparin = monitorParam.Heparin
 		monitor.DialysateFlow = monitorParam.DialysateFlow
+		monitor.Urr = monitorParam.Urr
+		monitor.BloodSugar = monitorParam.BloodSugar
 		updateErr := service.UpdateMonitor(monitor)
 		if updateErr != nil {
 			this.ErrorLog("修改透析监测记录失败:%v", updateErr)

controllers/manage_api_controller.go

@@ -94,6 +94,7 @@ func ManageRouters() {
 	beego.Router("/api/manage/deleteimages", &MachineApiController{}, "delete:DeleteImages")
 	beego.Router("/api/manage/getusermachtotalcount", &MachineApiController{}, "Get:GetUserMachTotalCount")
 	beego.Router("/api/manage/getusertotalcount", &MachineApiController{}, "Get:GetUserTotalCount")
+	beego.Router("/api/manage/deletemanagement", &MachineApiController{}, "Get:DeleteManagement")
 
 }
 
@@ -210,7 +211,7 @@ func (this *MachineApiController) SaveManageInfo() {
 		DeviceName:          device_name,
 		ManufactureFactory:  manufacture_factory,
 		ServiceManufacturer: service_manufacturer,
-		UnitType:            unit_type,
+		UnitType:            unittype,
 		UseSection:          use_section,
 		SectionNumber:       section_number,
 		BuyDate:             buydate,
@@ -294,8 +295,8 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	//fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	//fmt.Println("维修厂家", service_manufacturer)
-	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
+	unit_type := int64(dataBody["unit_type"].(float64))
+	//unit_type := strconv.FormatInt(unittype, 10)
 	fmt.Println("设备型号", unit_type)
 
 	use_section := dataBody["use_section"].(string)
@@ -435,8 +436,8 @@ func (this *MachineApiController) UpdateMachinetwo() {
 	//fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	//fmt.Println("维修厂家", service_manufacturer)
-	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
+	unit_type := int64(dataBody["unit_type"].(float64))
+	//unit_type := strconv.FormatInt(unittype, 10)
 	//fmt.Println("设备型号", unit_type)
 	use_section := dataBody["use_section"].(string)
 	//fmt.Println("使用科室", use_section)
@@ -568,7 +569,7 @@ func (this *MachineApiController) Updatemacheinetwo() {
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	//fmt.Println("维修厂家", service_manufacturer)
 	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
+	//unit_type := strconv.FormatInt(unittype, 10)
 	//fmt.Println("设备型号", unit_type)
 	use_section := dataBody["use_section"].(string)
 	//fmt.Println("使用科室", use_section)
@@ -635,7 +636,7 @@ func (this *MachineApiController) Updatemacheinetwo() {
 		DeviceName:          device_name,
 		ManufactureFactory:  manufacture_factory,
 		ServiceManufacturer: service_manufacturer,
-		UnitType:            unit_type,
+		UnitType:            unittype,
 		UseSection:          use_section,
 		SectionNumber:       section_number,
 		BuyDate:             buydate,
@@ -2651,9 +2652,9 @@ func (this *MachineApiController) SaveManageinfoTwo() {
 	fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	fmt.Println("维修厂家", service_manufacturer)
-	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
-	fmt.Println("设备型号", unit_type)
+	unit_type := int64(dataBody["unit_type"].(float64))
+	//unit_type := strconv.FormatInt(unittype, 10)
+	//fmt.Println("设备型号", unit_type)
 	use_section := dataBody["use_section"].(string)
 	fmt.Println("使用科室", use_section)
 	section_number := dataBody["section_number"].(string)
@@ -3116,3 +3117,16 @@ func (this *MachineApiController) GetUserTotalCount() {
 		"addmacher": addmacher,
 	})
 }
+
+func (this *MachineApiController) DeleteManagement() {
+	id, _ := this.GetInt64("id")
+	_, err := service.DeleteEquit(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -806,7 +806,11 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	blood_flow, _ := c.GetInt64("blood_flow", 0)
 	sealing_fluid_dispose, _ := c.GetInt64("sealing_fluid_dispose", 0)
 	sealing_fluid_special := c.GetString("sealing_fluid_special")
-
+	dosage_of_anticoagulants, _ := c.GetFloat("dosage_of_anticoagulants")
+	supine_systolic_blood_pressure := c.GetString("supine_systolic_blood_pressure")
+	setting_pressure := c.GetString("setting_pressure")
+	supine_diastolic_blood_pressure := c.GetString("supine_diastolic_blood_pressure")
+	diastolic_pressure := c.GetString("diastolic_pressure")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -893,6 +897,11 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		BloodFlow:                    blood_flow,
 		SealingFluidDispose:          sealing_fluid_dispose,
 		SealingFluidSpecial:          sealing_fluid_special,
+		DosageOfAnticoagulants:       dosage_of_anticoagulants,
+		SupineDiastolicBloodPressure: supine_diastolic_blood_pressure,
+		SupineSystolicBloodPressure:  supine_systolic_blood_pressure,
+		SettingPressure:              setting_pressure,
+		DiastolicPressure:            diastolic_pressure,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -1022,7 +1031,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	tubing_hemodialysis, _ := c.GetInt64("tubing_hemodialysis", 0)
 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
-
+	pre_impulse, parseDateErr := c.GetFloat("pre_impulse", 0)
+	fmt.Println("预冲量====", pre_impulse)
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
@@ -1102,6 +1112,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		Package:                    safe_package,
 		ALiquid:                    a_liquid,
 		TargetKtv:                  target_ktv,
+		PreImpulse:                 pre_impulse,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -67,11 +67,11 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	BPType, _ := this.GetInt("bp_type")
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
 	venousPressure, _ := this.GetFloat("venous_pressure")
-	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
+	venousPressureType, _ := this.GetInt64("venous_pressure_type", 1)
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
-	arterialPressureType, _ := this.GetInt64("arterial_pressure_type",1)
-	transmembranePressure, _ := this.GetFloat("transmembrane_pressure",0)
-	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
+	arterialPressureType, _ := this.GetInt64("arterial_pressure_type", 1)
+	transmembranePressure, _ := this.GetFloat("transmembrane_pressure", 0)
+	transmembranePressureType, _ := this.GetInt64("transmembrane_pressure_type", 1)
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -89,7 +89,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	monitoringNurse, _ := this.GetInt64("monitoring_nurse")
 	heparin, _ := this.GetFloat("heparin")
 	dialysate_flow, _ := this.GetFloat("dialysate_flow")
-
+	urr := this.GetString("urr")
+	blood_sugar, _ := this.GetFloat("blood_sugar")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -142,6 +143,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		Modify:                    0,
 		Heparin:                   heparin,
 		DialysateFlow:             dialysate_flow,
+		Urr:                       urr,
+		BloodSugar:                blood_sugar,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -211,11 +214,11 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	BPType, _ := this.GetInt("bp_type")
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
 	venousPressure, _ := this.GetFloat("venous_pressure")
-	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
+	venousPressureType, _ := this.GetInt64("venous_pressure_type", 1)
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
-	arterialPressureType, _ := this.GetInt64("arterial_pressure",1)
+	arterialPressureType, _ := this.GetInt64("arterial_pressure", 1)
 	transmembranePressure, _ := this.GetFloat("transmembrane_pressure")
-	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
+	transmembranePressureType, _ := this.GetInt64("transmembrane_pressure_type", 1)
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -233,7 +236,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	displacement_flow_quantity, _ := this.GetFloat("displacement_flow_quantity")
 	heparin, _ := this.GetFloat("heparin")
 	dialysate_flow, _ := this.GetFloat("dialysate_flow")
-
+	urr := this.GetString("urr")
+	blood_sugar, _ := this.GetFloat("blood_sugar")
 	adminInfo := this.GetMobileAdminUserInfo()
 
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
@@ -281,7 +285,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.Modify = adminInfo.AdminUser.Id
 	monitor.Heparin = heparin
 	monitor.DialysateFlow = dialysate_flow
-
+	monitor.Urr = urr
+	monitor.BloodSugar = blood_sugar
 	err = service.UpdateMonitor(monitor)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorUpdate)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1660,6 +1660,10 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
 	}
 
+	if dataBody["pinholing"] != nil && reflect.TypeOf(dataBody["pinholing"]).String() == "string" {
+		pinholing := dataBody["pinholing"].(string)
+		evaluation.Phinholing = pinholing
+	}
 	return
 }
 
@@ -2098,7 +2102,9 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		return
 	}
 	xttime := theTime.Unix()
-
+	//获取当前日期月份的第一天
+	firstmonth := service.GetFirstDateOfMonth(theTime)
+	firstMonthDate := firstmonth.Unix()
 	operatorIDs := make([]int64, 0)
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
@@ -2165,6 +2171,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	operators, err := service.GetAllStarfEs(adminUserInfo.Org.Id)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+
+	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"users":                   adminUser,
 		"patientInfo":             patientInfo,
@@ -2179,6 +2187,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		"operators":               operators,
 		"org_template_info":       templateInfo,
 		"check":                   check,
+		"dialysiscount":           dialysiscount,
 	})
 
 }

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -153,6 +153,7 @@ func (this *CommonApiController) SaveConfiguration() {
 				RangeType:       checktype,
 				RangeValue:      rangvalue,
 				CreatedTime:     time.Now().Unix(),
+				IsStatus:        1,
 			}
 			fmt.Println(standard)
 			err = service.SaveInspection(&standard)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -578,6 +578,7 @@ func (this *NewDialysisApiController) GetPatientDetail() {
 	id, _ := this.GetInt64("id")
 	//获取病人详情信息
 	detail, err := service.GetPatientDetailTwo(id)
+
 	//获取传染病详情
 	diseases := service.GetPatientDiseasesTwo(detail.BloodId)
 	//获取慢病传染病
@@ -1257,8 +1258,8 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 	fmt.Print("透析号", dialysis)
 	patientsoure := int64(dataBody["patientsoure"].(float64))
 	fmt.Print("患者来源", patientsoure)
-	//lapseto := int64(dataBody["lapseto"].(float64))
-	//fmt.Print("留置状态", lapseto)
+	lapseto := int64(dataBody["lapseto"].(float64))
+	fmt.Print("留置状态", lapseto)
 	contagions := dataBody["resultTwo"].([]interface{})
 	fmt.Print("传染病", contagions)
 	ids := make([]int64, 0)
@@ -1372,6 +1373,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Avatar:            avatar,
 			IdCardNo:          idCard,
 			IsInfectious:      is_infectious,
+			Lapseto:           lapseto,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
 		//patientLapseto := models.PatientLapseto{
@@ -1399,6 +1401,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Avatar:            avatar,
 			IdCardNo:          idCard,
 			IsInfectious:      is_infectious,
+			Lapseto:           lapseto,
 		}
 		err = service.UpdateXtPatientNew(patientsNew, id)
 		if err != nil {

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -37,29 +37,61 @@ func (this *NewManageApiController) GetDisInfectionTime() {
 	scheduletype, _ := this.GetInt64("schedule_type")
 	scheduleweek, _ := this.GetInt64("schedule_week")
 	fmt.Println(scheduleweek)
-	//查询改设备是否有消毒计划
-	plan, err := service.GetDisInfectionTime(orgid, bedid, scheduletype, scheduleweek)
+	scheduledate, _ := this.GetInt64("schedule_date")
+
+	//根据床位号获取设备型号
+	unitType, _ := service.GetUnitType(bedid, orgid)
+	//查询使用登记最后一条消毒记录
+	infomation, err := service.GetLaseDeviceInfomation(orgid, bedid, scheduledate, scheduletype)
+	fmt.Println("infomation========", infomation)
+	fmt.Println("err-------", err)
 	if err == gorm.ErrRecordNotFound {
-		//去查询使用登记最后一条数据
-		infomation, err := service.GetLaseDeviceInfomation(orgid, bedid)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			return
+		//查询改设备是否有消毒计划
+		plan, errcode := service.GetDisInfectionTime(orgid, unitType.UnitType, scheduletype, scheduleweek)
+		//如果没有消毒计划，去查询该设备的上次消毒时间
+		if errcode == gorm.ErrRecordNotFound {
+			infor, errco := service.GetLaseDeviceInfomationTwo(orgid, bedid, scheduletype)
+			if errco != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"plan": infor.LongTime,
+			})
+		} else if errcode == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"plan": plan.DisinfecTime,
+			})
 		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"plan": infomation.LongTime,
-		})
 	} else if err == nil {
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			return
-		}
 		this.ServeSuccessJSON(map[string]interface{}{
-			"plan": plan.DisinfecTime,
+			"plan":       infomation.LongTime,
+			"infomation": infomation,
 		})
-	} else {
-
 	}
+	//查询改设备是否有消毒计划
+	//plan, err := service.GetDisInfectionTime(orgid, bedid, scheduletype, scheduleweek)
+	//if err == gorm.ErrRecordNotFound {
+	//	//去查询使用登记最后一条数据
+	//	infomation, err := service.GetLaseDeviceInfomation(orgid, bedid)
+	//	if err != nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"plan": infomation.LongTime,
+	//	})
+	//} else if err == nil {
+	//	if err != nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"plan": plan.DisinfecTime,
+	//	})
+	//} else {
+	//
+	//}
 
 }
 
@@ -99,9 +131,9 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 	fmt.Println("透析减少", dislysis.WeightLoss)
 	//			//根据床位号获取设备id
 	addmacher, _ := service.GetEquimentIDTwo(bedid, orgid)
-	unitype, _ := strconv.ParseInt(addmacher.UnitType, 10, 64)
-	fmt.Println(unitype)
-	plan, errplan := service.GetDisinfectionTwo(unitype, scheduletype, orgid)
+	//unitype, _ := strconv.ParseInt(addmacher.UnitType, 10, 64)
+	//fmt.Println(unitype)
+	plan, errplan := service.GetDisinfectionTwo(addmacher.UnitType, scheduletype, orgid)
 	//counts, errplan := service.GetUserTotalCount(orgid, bedid)
 	//var usertoal  int64
 	//fmt.Println(usertoal)
@@ -164,11 +196,20 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 				"information": information,
 			})
 		} else if errcode == nil {
+			information := models.DeviceInformation{
+				DisinfecStartime: startdateunix,
+				DisinfecEndtime:  enddateunix,
+				LongTime:         strconv.FormatInt(disinfectime, 10),
+			}
 
-			returnData := make(map[string]interface{}, 0)
-			returnData["msstatus"] = "1"
-			this.ServeSuccessJSON(returnData)
-			return
+			errcode := service.UpdateInformation(&information, scheduledate, bedid, scheduletype)
+			if errcode != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"information": information,
+			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			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)
@@ -461,7 +461,6 @@ func (c *PatientApiController) EditPatient() {
 	patient.UpdatedTime = time.Now().Unix()
 	patient.IsInfectious = is_infectious
 	patient.RemindCycle = remind_cycle
-
 	err := service.UpdatePatient(&patient, contagions, diseases)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
@@ -480,28 +479,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 +542,18 @@ 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(),
+		BloodPatients:             1,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)

models/device_models.go

@@ -205,6 +205,7 @@ type DeviceAddmachers struct {
 	BedId               int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
 	DeviceMode          string `gorm:"column:device_mode" json:"device_mode" form:"device_mode"`
 	Number              string `gorm:"column:number" json:"number" form:"number"`
+	EquimentId          int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
 }
 
 type DeviceAddmacher struct {
@@ -215,7 +216,7 @@ type DeviceAddmacher struct {
 	DeviceName          string `gorm:"column:device_name" json:"device_name" form:"device_name"`
 	ManufactureFactory  string `gorm:"column:manufacture_factory" json:"manufacture_factory" form:"manufacture_factory"`
 	ServiceManufacturer string `gorm:"column:service_manufacturer" json:"service_manufacturer" form:"service_manufacturer"`
-	UnitType            string `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
+	UnitType            int64  `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
 	UseSection          string `gorm:"column:use_section" json:"use_section" form:"use_section"`
 	SectionNumber       string `gorm:"column:section_number" json:"section_number" form:"section_number"`
 	BuyDate             int64  `gorm:"column:buy_date" json:"buy_date" form:"buy_date"`

models/dialysis.go

@@ -267,6 +267,7 @@ type PredialysisEvaluation struct {
 	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"`
+	Phinholing                     string  `gorm:"column:pinholing" json:"pinholing" form:"pinholing"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -555,6 +556,11 @@ type AssessmentAfterDislysis struct {
 	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"`
+	DosageOfAnticoagulants          float64 `gorm:"column:dosage_of_anticoagulants" json:"dosage_of_anticoagulants" form:"dosage_of_anticoagulants"`
+	SupineSystolicBloodPressure     string  `gorm:"column:supine_systolic_blood_pressure" json:"supine_systolic_blood_pressure" form:"supine_systolic_blood_pressure"`
+	SettingPressure                 string  `gorm:"column:setting_pressure" json:"setting_pressure" form:"setting_pressure"`
+	SupineDiastolicBloodPressure    string  `gorm:"column:supine_diastolic_blood_pressure" json:"supine_diastolic_blood_pressure" form:"supine_diastolic_blood_pressure"`
+	DiastolicPressure               string  `gorm:"column:diastolic_pressure" json:"diastolic_pressure" form:"diastolic_pressure"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
@@ -653,6 +659,8 @@ type MonitoringRecord struct {
 	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"`
+	Urr                       string  `gorm:"column:urr" json:"urr"`
+	BloodSugar                float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
 }
 
 func (MonitoringRecord) TableName() string {

models/patient_models.go

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

service/auto_create_week_disinfection.go

@@ -82,14 +82,14 @@ func AutoCreateWeekDisinfectionJob() {
 				fmt.Print("透析时长", dislysis.ActualTreatmentHour+'h'+dislysis.ActualTreatmentMinute+'m'+'i'+'n')
 				//			//根据床位号获取设备id
 				addmacher, _ := GetEquimentID(schedules.BedId, it.UserOrgId)
-				unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
+				//unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
 				fmt.Println(" 设备id", addmacher.ID)
 				//根据设备id获取设备类型
 				//equimentname, _ := GetAddmacher(addmacher.ID, it.UserOrgId)
 
 				fmt.Println("班次", it.SchedualType)
 				//查看该设备是否有消毒计划，无怎返回,有则添加
-				plan, errplan := GetDisinfection(unitype, it.SchedualType, it.UserOrgId)
+				plan, errplan := GetDisinfection(addmacher.UnitType, it.SchedualType, it.UserOrgId)
 				fmt.Print("plan", plan)
 				fmt.Println("错误是什么", errplan)
 				if errplan == gorm.ErrRecordNotFound {
@@ -211,10 +211,10 @@ func GetInfor(patientid int64, timenow int64, orgid int64, class int64) (*models
 	return &pre, nil
 }
 
-func GetDisinfection(equitType int64, enquitType int64, orgID int64) (*models.DevicePlan, error) {
+func GetDisinfection(equitType int64, scheduleType int64, orgID int64) (*models.DevicePlan, error) {
 	var plan models.DevicePlan
 	var err error
-	err = readUserDb.Model(&plan).Where("device_type = ? AND classtime = ? AND user_org_id = ? AND status = 1", equitType, enquitType, orgID).Find(&plan).Error
+	err = readUserDb.Model(&plan).Where("device_type = ? AND classtime = ? AND user_org_id = ? AND status = 1", equitType, scheduleType, orgID).Find(&plan).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}

service/auto_create_week_plan.go

@@ -77,14 +77,14 @@ func AutoCreateWeekPlanJob() {
 				fmt.Println("透后", err)
 				//			//根据床位号获取设备id
 				addmacher, _ := GetEquimentID(schedules.BedId, it.UserOrgId)
-				unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
+				//unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
 				fmt.Println(" 设备id", addmacher.ID)
 				//根据设备id获取设备类型
 				//equimentname, _ := GetAddmacher(addmacher.ID, it.UserOrgId)
 
 				fmt.Println("班次", it.SchedualType)
 				//查看该设备是否有消毒计划，无怎返回,有则添加
-				plan, errplan := GetDisinfection(unitype, it.SchedualType, it.UserOrgId)
+				plan, errplan := GetDisinfection(addmacher.UnitType, it.SchedualType, it.UserOrgId)
 				fmt.Print("plan", plan)
 				fmt.Println("错误", errplan)
 				if errplan == gorm.ErrRecordNotFound {

service/device_service.go

@@ -623,9 +623,10 @@ func GetAllMachineInfo(page int64, limit int64, keyword string, zoneid int64, eq
 	table := XTReadDB().Table("xt_device_zone as x")
 	d := readUserDb.Table("xt_device_mode as m")
 	d2 := XTReadDB().Table("xt_device_number as n")
+	d3 := XTReadDB().Table("xt_device_information as i")
 	fmt.Print("d", d)
 	fmt.Println("table", table)
-	fmt.Print("d2", d2)
+	fmt.Print("d2", d2, d3)
 	if orgid > 0 {
 		db = db.Where("a.user_org_id = ?", orgid)
 	}
@@ -646,8 +647,8 @@ func GetAllMachineInfo(page int64, limit int64, keyword string, zoneid int64, eq
 
 	offset := (page - 1) * limit
 
-	err = db.Order("a.ctime asc").Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.bed_id,x.name,m.device_mode,n.number").Count(&total).
-		Joins("Left JOIN xt_device_mode as m on m.id = a.unit_type ").Joins("left join sgj_xt.xt_device_number as n on n.id = a.bed_id").Joins("Left JOIN sgj_xt.xt_device_zone as x On x.id = n.zone_id").Offset(offset).Limit(limit).Scan(&addmahcer).Error
+	err = db.Group("a.id").Order("a.ctime asc").Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.bed_id,x.name,m.device_mode,n.number,i.equiment_id").Count(&total).
+		Joins("Left JOIN xt_device_mode as m on m.id = a.unit_type ").Joins("left join sgj_xt.xt_device_number as n on n.id = a.bed_id").Joins("Left JOIN sgj_xt.xt_device_zone as x On x.id = n.zone_id").Joins("left join xt_device_information as i on i.bed_number = a.bed_id").Offset(offset).Limit(limit).Scan(&addmahcer).Error
 
 	if err != nil {
 

service/manage_service.go

@@ -1138,9 +1138,9 @@ func GetUserTotal(orgid int64, id int64) (models.DeviceAddmacher, error) {
 	return addmacher, err
 }
 
-func GetDisInfectionTime(orgid int64, bedid int64, scheduletype int64, scheduleweek int64) (*models.DevicePlan, error) {
+func GetDisInfectionTime(orgid int64, unitype int64, scheduletype int64, scheduleweek int64) (*models.DevicePlan, error) {
 	plan := models.DevicePlan{}
-	err = UserReadDB().Model(&plan).Where("user_org_id = ? and bed_id = ? and classtime = ? and time = ? and status = 1", orgid, bedid, scheduletype, scheduleweek).Find(&plan).Error
+	err = UserReadDB().Model(&plan).Where("user_org_id = ? and device_type = ? and classtime = ? and time = ? and status = 1", orgid, unitype, scheduletype, scheduleweek).Find(&plan).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -1150,10 +1150,29 @@ func GetDisInfectionTime(orgid int64, bedid int64, scheduletype int64, schedulew
 	return &plan, nil
 }
 
-func GetLaseDeviceInfomation(orgid int64, bedid int64) (models.DeviceInformation, error) {
+func GetUnitType(bedid int64, orgid int64) (models.DeviceAddmacher, error) {
+
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Model(&addmacher).Where("bed_id = ? and user_org_id = ? and status = 1", bedid, orgid).Find(&addmacher).Error
+	return addmacher, err
+}
+
+func GetLaseDeviceInfomation(orgid int64, bedid int64, date int64, scheduletype int64) (*models.DeviceInformation, error) {
 
 	information := models.DeviceInformation{}
-	err := UserReadDB().Model(&information).Where("bed_number = ? and user_org_id =? and status = 1", bedid, orgid).Last(&information).Error
+	err := UserReadDB().Model(&information).Where("bed_number = ? and user_org_id =? and status = 1 and date = ? and class = ? ", bedid, orgid, date, scheduletype).Find(&information).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &information, nil
+}
+
+func GetLaseDeviceInfomationTwo(orgid int64, bedid int64, scheduletype int64) (models.DeviceInformation, error) {
+	information := models.DeviceInformation{}
+	err = UserReadDB().Model(&information).Where("bed_number= ? and user_org_id = ? and status = 1 and class = ?", bedid, orgid, scheduletype).Last(&information).Error
 	return information, err
 }
 
@@ -1205,3 +1224,15 @@ func CreateInformationTwo(information *models.DeviceInformation) error {
 	err := UserWriteDB().Create(&information).Error
 	return err
 }
+
+func UpdateInformation(information *models.DeviceInformation, scheduledate int64, bedid int64, scheduletype int64) error {
+
+	err := UserWriteDB().Model(&information).Where("date = ? and bed_number = ? and class = ?", scheduledate, bedid, scheduletype).Updates(map[string]interface{}{"long_time": information.LongTime, "disinfec_startime": information.DisinfecStartime, "disinfec_endtime": information.DisinfecEndtime}).Error
+	return err
+}
+
+func DeleteEquit(id int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := UserWriteDB().Model(&addmacher).Where("id=?", id).Updates(map[string]interface{}{"status": 0}).Error
+	return addmacher, err
+}

service/mobile_dialysis_service.go

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

数据变更脚本.sql

@@ -93,7 +93,26 @@ ALTER TABLE `test_xt`.`xt_monitoring_record`     ADD COLUMN `arterial_pressure_t
 ALTER TABLE `sgj_xt`.`xt_monitoring_record`     CHANGE `transmembrane_pressure_unit` `transmembrane_pressure_type` SMALLINT(2) DEFAULT '1' NOT NULL COMMENT '跨膜压类型 1：mmHg 2：kpa';
 
 
-
-
+--2020-08-15 author 马文强 --
+--数据字典表里添加针眼--
+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','针眼','pinholing','0','2020-08-15 16:56:00','2020-08-15 16:56: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 ( '9886','3','pinholing','针眼','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 ( '9886','1','pre_impulse','预冲量','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 ( '9886','5','dosage_of_ anticoagulants','实际抗凝剂用量','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 ( '9886','5','supine_systolic_blood_pressure','卧位收缩压','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 ( '9886','5','setting_pressure','坐位收缩压','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 ( '9886','5','supine_diastolic_blood_pressure','卧位舒张压','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 ( '9886','5','diastolic_pressure','坐位舒张压','1',NULL,NULL,'0');
+--显示配置中添加urr--
+INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '9886','4','URR','URR','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 ( '9886','4','blood_sugar','血糖','1',NULL,NULL,'0');