1

conf/app.conf

@@ -143,7 +143,7 @@ aliquid = 83
 [dev]
 mobile_token_expiration_second = 3600
 httpdomain = http://new_mobile.xt.api.sgjyun.com
-sso_domain = http://testsso.sgjyun.com
+sso_domain = http://localhost:8081
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
@@ -215,26 +215,26 @@ writesgjpatientmysqlname = sgj_patient
 
 
 #redishost = 120.77.235.13
-redishost = 112.74.16.180
-# redishost = localhost
+#redishost = 112.74.16.180
+redishost = localhost
 redisport = 6379
 redispasswrod = 123456
 redisdb = 0
 
 
-        niprocart =  63
-        jms = 58
-        fistula_needle_set = 65
-        fistula_needle_set_16 = 64
-        hemoperfusion = 55
-        dialyser_sterilised = 12
-        filtryzer = 53
-                dialyzers = 8
-                injector = 81
-                bloodlines = 42
-        tubingHemodialysis = 30
-        package = 82
-        aliquid = 83
+niprocart =  63
+jms = 58
+fistula_needle_set = 65
+fistula_needle_set_16 = 64
+hemoperfusion = 55
+dialyser_sterilised = 12
+filtryzer = 53
+dialyzers = 8
+injector = 81
+bloodlines = 42
+tubingHemodialysis = 30
+package = 82
+aliquid = 83
 
 #niprocart =  83
 #jms = 80

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 12
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

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
@@ -1194,7 +1194,7 @@ func (this *DeviceAPIController) GetMachineDetail() {
 	orgid := adminUserInfo.CurrentOrgId
 	fmt.Println("orgid", orgid)
 	addmacher, err := service.GetMachineDetail(id, orgid)
-	fmt.Print("err--------------------------------------------", err)
+	fmt.Print("err", err)
 	warning, err := service.GetTimeWarning(id, orgid)
 	germ, err := service.GetTimeLast(id, orgid)
 	clean, err := service.GetTimeLastData(id, orgid)

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)
@@ -1231,7 +1237,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				if out.ID > 0 {
 
 					if prescription.Niprocart > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, niprocart, prescription.Niprocart, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, niprocart, prescription.Niprocart, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1291,7 +1297,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Jms > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, jms, prescription.Jms, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, jms, prescription.Jms, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1353,7 +1359,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set, prescription.FistulaNeedleSet, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set, prescription.FistulaNeedleSet, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1415,7 +1421,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet16 > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1476,7 +1482,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Hemoperfusion > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, hemoperfusion, prescription.Hemoperfusion, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, hemoperfusion, prescription.Hemoperfusion, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1537,7 +1543,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.DialyserSterilised > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyser_sterilised, prescription.DialyserSterilised, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyser_sterilised, prescription.DialyserSterilised, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1599,7 +1605,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Filtryzer > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, filtryzer, prescription.Filtryzer, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, filtryzer, prescription.Filtryzer, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1661,7 +1667,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Dialyzers > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyzers, prescription.Dialyzers, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyzers, prescription.Dialyzers, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1723,7 +1729,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Injector > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, injector, prescription.Injector, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, injector, prescription.Injector, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1785,7 +1791,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Bloodlines > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, bloodlines, prescription.Bloodlines, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, bloodlines, prescription.Bloodlines, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1847,7 +1853,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.TubingHemodialysis > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, tubingHemodialysis, prescription.TubingHemodialysis, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, tubingHemodialysis, prescription.TubingHemodialysis, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1909,7 +1915,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Package > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, safe_package, prescription.Package, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, safe_package, prescription.Package, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1971,7 +1977,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.ALiquid > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, aliquid, prescription.ALiquid, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, aliquid, prescription.ALiquid, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -2342,7 +2348,6 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		tempassessmentAfterDislysis.InternalFistula = lastAssessmentAfterDislysis.InternalFistula
 		tempassessmentAfterDislysis.Catheter = lastAssessmentAfterDislysis.Catheter
 		tempassessmentAfterDislysis.Complication = lastAssessmentAfterDislysis.Complication
-		tempassessmentAfterDislysis.Remark = lastAssessmentAfterDislysis.Remark
 		tempassessmentAfterDislysis.DialysisIntakes = lastAssessmentAfterDislysis.DialysisIntakes
 		tempassessmentAfterDislysis.DialysisIntakesFeed = lastAssessmentAfterDislysis.DialysisIntakesFeed
 		tempassessmentAfterDislysis.DialysisIntakesTransfusion = lastAssessmentAfterDislysis.DialysisIntakesTransfusion

controllers/manage_api_controller.go

@@ -92,6 +92,10 @@ func ManageRouters() {
 	beego.Router("/api/manage/selectbed", &MachineApiController{}, "get:SelectBed")
 	beego.Router("/api/manage/getime", &MachineApiController{}, "get:GetTimeData")
 	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")
+
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -207,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,
@@ -291,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)
@@ -432,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)
@@ -565,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)
@@ -632,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,
@@ -2210,10 +2214,15 @@ func (this *MachineApiController) GetRepair() {
 }
 
 func (this *MachineApiController) EditUser() {
+	adminUser := this.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
 	patientid, _ := this.GetInt64("patientid")
 	device, err := service.GetUserInformation(id)
+	//获取初次使用记录
+	macher, err := service.GetUserTotalByMacher(device.EquimentId)
+	count, err := service.GetUserTotalCount(orgId, device.BedNumber)
 	patients, err := service.GetPatientInfoMation(patientid)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
@@ -2222,6 +2231,8 @@ func (this *MachineApiController) EditUser() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"device":   device,
 		"patients": patients,
+		"count":    count,
+		"macher":   macher,
 	})
 }
 
@@ -2641,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)
@@ -3067,7 +3078,49 @@ func (this *MachineApiController) GetTimeData() {
 func (this *MachineApiController) DeleteImages() {
 	id, _ := this.GetInt64("id")
 	err := service.DeleteImages(id)
-	fmt.Print("err========", err)
+	fmt.Print("err", err)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *MachineApiController) GetUserMachTotalCount() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgid := adminUserInfo.CurrentOrgId
+	count, err := service.GetUserMachTotalCount(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"count": count,
+	})
+}
+
+func (this *MachineApiController) GetUserTotalCount() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgid := adminUserInfo.CurrentOrgId
+	id, _ := this.GetInt64("id")
+	count, err := service.GetUserTotalCount(orgid, id)
+	addmacher, err := service.GetUserTotal(orgid, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"count":     count,
+		"addmacher": addmacher,
+	})
+}
+
+func (this *MachineApiController) DeleteManagement() {
+	id, _ := this.GetInt64("id")
+	_, err := service.DeleteEquit(id)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
 		return

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -332,7 +332,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 {
+	if template.TemplateId == 22 || template.TemplateId == 17 {
 		dewater_amount = dewater_amount * 1000
 	}
 
@@ -949,11 +949,11 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"dialysistype": dialysistype,
-		"patient":      dialysisinfo,
-		"schedule":     sc,
-		"dryweight":    dry_weight,
-		"after_dry_weight":    after_dry_weight,
+		"dialysistype":     dialysistype,
+		"patient":          dialysisinfo,
+		"schedule":         sc,
+		"dryweight":        dry_weight,
+		"after_dry_weight": after_dry_weight,
 	})
 	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)
@@ -2421,7 +2432,6 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.InternalFistula = lastAssessmentAfterDislysis.InternalFistula
 		tempassessmentAfterDislysis.Catheter = lastAssessmentAfterDislysis.Catheter
 		tempassessmentAfterDislysis.Complication = lastAssessmentAfterDislysis.Complication
-		tempassessmentAfterDislysis.Remark = lastAssessmentAfterDislysis.Remark
 		tempassessmentAfterDislysis.DialysisIntakes = lastAssessmentAfterDislysis.DialysisIntakes
 		tempassessmentAfterDislysis.DialysisIntakesFeed = lastAssessmentAfterDislysis.DialysisIntakesFeed
 		tempassessmentAfterDislysis.DialysisIntakesTransfusion = lastAssessmentAfterDislysis.DialysisIntakesTransfusion
@@ -2800,7 +2810,6 @@ func (this *DialysisAPIController) StartDialysis() {
 		hemoperfusion, _ := beego.AppConfig.Int64("hemoperfusion")
 		dialyser_sterilised, _ := beego.AppConfig.Int64("dialyser_sterilised")
 		filtryzer, _ := beego.AppConfig.Int64("filtryzer")
-
 		dialyzers, _ := beego.AppConfig.Int64("dialyzers")
 		injector, _ := beego.AppConfig.Int64("injector")
 		bloodlines, _ := beego.AppConfig.Int64("bloodlines")
@@ -3299,7 +3308,6 @@ func (this *DialysisAPIController) StartDialysis() {
 						}
 
 					}
-
 					if prescription.ALiquid > 0 {
 						warehouseOutInfo := &models.WarehouseOutInfo{
 							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -3344,7 +3352,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				if out.ID > 0 {
 
 					if prescription.Niprocart > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, niprocart, prescription.Niprocart, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, niprocart, prescription.Niprocart, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3404,7 +3412,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Jms > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, jms, prescription.Jms, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, jms, prescription.Jms, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3466,7 +3474,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set, prescription.FistulaNeedleSet, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set, prescription.FistulaNeedleSet, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3528,7 +3536,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet16 > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3589,7 +3597,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Hemoperfusion > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, hemoperfusion, prescription.Hemoperfusion, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, hemoperfusion, prescription.Hemoperfusion, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3650,7 +3658,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.DialyserSterilised > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyser_sterilised, prescription.DialyserSterilised, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyser_sterilised, prescription.DialyserSterilised, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3712,7 +3720,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Filtryzer > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, filtryzer, prescription.Filtryzer, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, filtryzer, prescription.Filtryzer, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3774,7 +3782,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Dialyzers > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyzers, prescription.Dialyzers, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyzers, prescription.Dialyzers, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3836,7 +3844,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Injector > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, injector, prescription.Injector, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, injector, prescription.Injector, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3898,7 +3906,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Bloodlines > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, bloodlines, prescription.Bloodlines, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, bloodlines, prescription.Bloodlines, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3960,7 +3968,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.TubingHemodialysis > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, tubingHemodialysis, prescription.TubingHemodialysis, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, tubingHemodialysis, prescription.TubingHemodialysis, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -4022,7 +4030,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Package > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, safe_package, prescription.Package, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, safe_package, prescription.Package, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -4084,7 +4092,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.ALiquid > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, aliquid, prescription.ALiquid, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, aliquid, prescription.ALiquid, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -4381,7 +4389,6 @@ func (c *DialysisAPIController) PostSolution() {
 				if order.ID > 0 {
 					if dialysisPrescription.Niprocart != niprocart {
 						//不一致，先将原有的商品订单数量进行减一的操作，并将原有使用记录进行修改商品信息(根据上机的日期和商品类型id，商品id)
-
 						//1.用上机透析日期查出当天的订单
 						_, out := service.FindStockOutOrderNumberByTime(order.DialysisDate, adminUserInfo.Org.Id)
 						//_, out := service.FindOldOrderInfoByGoodId(order.StartTime, adminUserInfo.Org.Id)
@@ -4811,8 +4818,6 @@ func (c *DialysisAPIController) PostSolution() {
 
 						//不一致，先将原有的商品订单数量进行减一的操作，并将原有使用记录进行修改商品信息(根据上机的日期和商品类型id，商品id)
 						service.UpdateOrderCount(dialyser_sterilised_good_type_id, dialysisPrescription.DialyserSterilised, out.WarehouseOutOrderNumber, adminUserInfo.Org.Id)
-						//_, out := service.FindOrderInfoByGoodId(dialyser_sterilised_good_type_id, dialysisPrescription.DialyserSterilised, order.StartTime, adminUserInfo.Org.Id)
-						//_, out := service.FindOrderInfoByGoodId(order.StartTime, adminUserInfo.Org.Id)
 
 						//判断前端更改后的商品id的出库记录在数据库中是否存在
 						err, newOut := service.FindOrderInfoByGoodId(dialyser_sterilised_good_type_id, dialyser_sterilised, out.WarehouseOutOrderNumber, adminUserInfo.Org.Id)
@@ -6384,3 +6389,29 @@ func (c *DialysisAPIController) GetPatientId() {
 		"patient": patientId,
 	})
 }
+
+func (this *DialysisAPIController) GetDialysisSchedule() {
+	schedualDate := this.GetString("date")
+	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
+	if parseDateErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgID := adminInfo.Org.Id
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
+	scheduals, _ := service.MobileGetDialysisScheduals(orgID, date.Unix(), 0)
+	if len(scheduals) > 0 {
+		//缓存数据
+		scheduals_json, err := json.Marshal(scheduals)
+		if err == nil {
+			redis.Set(key, scheduals_json, time.Second*30)
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"scheduals": scheduals,
+	})
+
+}

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/login_api_controller.go

@@ -32,8 +32,8 @@ func (this *LoginAPIController) LoginByPwd() {
 		return
 	}
 	ip := utils.GetIP(this.Ctx.Request)
-	ssoDomain := beego.AppConfig.String("sso_domain")
-	//ssoDomain := "http://localhost:8091"
+	//ssoDomain := beego.AppConfig.String("sso_domain")
+	ssoDomain := "http://localhost:8091"
 	api := ssoDomain + "/m/login/pwd"
 	values := make(url.Values)
 	values.Set("mobile", mobile)

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -114,4 +114,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/patient/search", &PatientApiController{}, "Get:GetSearchPatient")
 
+	beego.Router("/m/api/dialysis/schedule", &DialysisAPIController{}, "Get:GetDialysisSchedule")
+
 }

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)
@@ -219,7 +220,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid": vid,
+			"vid":                 vid,
 		})
 	} else {
 		itemId, err := service.GetIdByItemId(detail.InspectionMinor, orgId)
@@ -229,7 +230,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid": itemId.ID,
+			"vid":                 itemId.ID,
 		})
 	}
 
@@ -1877,156 +1878,156 @@ func (this *CommonApiController) GetMonthBloodList() {
 	//统计收缩压
 	if bloodtype == -1 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marchlist, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marchlist":    marchlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 
 	//统计舒张压
 	if bloodtype == -2 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marchlist, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marchlist":    marchlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/utils"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"time"
 )
 
@@ -522,29 +523,27 @@ func (this *NewCommonApiController) GetMobileFirstQuarter() {
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
 	//获取收缩压数据
-	_, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
+	systolic, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
 	//统计收缩压合格的数据
-	systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
+	//systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
 
 	//获取舒张压数据
-	_, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
+	diastolic, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
 	//获取合格舒张压数据
-	diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
-	normData, _ := service.GetNormData(orgid)
+	//diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
+	normData, _ := service.GetNormDataByOrgId(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"count":          count,
-		"countwo":        countwo,
-		"systolic":       systolic,
-		"systolicTotal":  systolicTotal,
-		"sysstandTotal":  sysstandTotal,
-		"diastolic":      diastolic,
-		"diastotal":      diastotal,
-		"diasstandtotal": diasstandtotal,
-		"normData":       normData,
+		"count":         count,
+		"countwo":       countwo,
+		"systolic":      systolic,
+		"systolicTotal": systolicTotal,
+		"diastolic":     diastolic,
+		"diastotal":     diastotal,
+		"normData":      normData,
 	})
 }
 
@@ -1029,47 +1028,47 @@ func (this *NewCommonApiController) GetMoblieBloodList() {
 	fmt.Println("第四季度", fourQuarterEndStrUnix)
 	if bloodType == -1 {
 		//统计收缩压第一季度的总数
-		_, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		firstlist, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
 		//统计收缩压第一季合格的总数
-		_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
 		//统计第二季收缩压总数
-		_, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		secondelist, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
 		//第二季度合格总数
-		_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
 		//统计第三季收缩压总数
-		_, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		threelist, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
 		//第三季度合格数
-		_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
 		//第四季度总数
-		_, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		fourlist, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		//第四季度合格总数
-		_, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//_, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"firstTotal":        firstTotal,
-			"firstStandTotal":   firstStandTotal,
-			"secondeTotal":      secondeTotal,
-			"secondeStandTotal": secondeStandTotal,
-			"threeTotal":        threeTotal,
-			"threeStandTotal":   threeStandTotal,
-			"fourTotal":         fourTotal,
-			"fourStandTotal":    fourStandTotal,
+			"firstTotal":   firstTotal,
+			"firstlist":    firstlist,
+			"secondeTotal": secondeTotal,
+			"secondelist":  secondelist,
+			"threeTotal":   threeTotal,
+			"threelist":    threelist,
+			"fourTotal":    fourTotal,
+			"fourlist":     fourlist,
 		})
 	}
 	if bloodType == -2 {
 		//统计舒张压第一季度的总数
-		_, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
-		_, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
-		_, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
-		_, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
-		_, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
-		_, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
-		_, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
-		_, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		firstlist, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//_, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		secondelist, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//_, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		threelist, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//_, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		fourlist, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//_, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1077,14 +1076,14 @@ func (this *NewCommonApiController) GetMoblieBloodList() {
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"firstTotal":        firstTotal,
-			"firstStandTotal":   firstStandTotal,
-			"secondeTotal":      secondeTotal,
-			"secondeStandTotal": secondeStandTotal,
-			"threeTotal":        threeTotal,
-			"threeStandTotal":   threeStandTotal,
-			"fourTotal":         fourTotal,
-			"fourStandTotal":    fourStandTotal,
+			"firstTotal":   firstTotal,
+			"firstlist":    firstlist,
+			"secondeTotal": secondeTotal,
+			"secondelist":  secondelist,
+			"threeTotal":   threeTotal,
+			"threelist":    threelist,
+			"fourTotal":    fourTotal,
+			"fourlist":     fourlist,
 		})
 	}
 }
@@ -1231,156 +1230,156 @@ func (this *NewCommonApiController) GetBloodMonthList() {
 	//统计收缩压
 	if bloodtype == -1 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marlist, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marlist":      marlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 
 	//统计舒张压
 	if bloodtype == -2 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marlist, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marlist":      marlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 }
@@ -1946,15 +1945,37 @@ func (this *NewCommonApiController) GetSystolicBloodStand() {
 	fmt.Println(endtimeUnix)
 
 	//获取数据
-	recordList, err := service.GetDiastolicStand(orgId, startimeUnix, endtimeUnix)
+	//recordList, err := service.GetDiastolicStand(orgId, startimeUnix, endtimeUnix,page,limit)
 	bloodPressure, err := service.GetDefaultBloodPressure(orgId)
+	var sysMin string
+	var sysLarge string
+	var diaMin string
+	var diaLarge string
+	for index, value := range bloodPressure {
+		fmt.Println("index", index)
+		if value.InspectionMajor == 0 && value.InspectionMinor == -1 {
+			sysMin = value.MinRange
+			sysLarge = value.LargeRange
+		}
+		if value.InspectionMajor == 0 && value.InspectionMinor == -2 {
+			diaMin = value.MinRange
+			diaLarge = value.LargeRange
+		}
+	}
+	sysmin, err := strconv.ParseInt(sysMin, 10, 64)
+	syslarge, err := strconv.ParseInt(sysLarge, 10, 64)
+	diamin, err := strconv.ParseInt(diaMin, 10, 64)
+	dialarge, err := strconv.ParseInt(diaLarge, 10, 64)
+	recordtwo, err := service.TotalSysStandCountTwo(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge)
+	record, err := service.TotalSysStandCount(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge, page, limit)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"recordList":    recordList,
+		"record":        record,
 		"bloodPressure": bloodPressure,
+		"recordtwo":     recordtwo,
 	})
 }
 
@@ -1981,3 +2002,58 @@ func (this *NewCommonApiController) GetMobileIdsList() {
 		"vlist": vlist,
 	})
 }
+
+func (this *NewCommonApiController) GetSystolicBloodNoStand() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgId := adminUser.Org.Id
+	fmt.Println("orgID", orgId)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime := this.GetString("startime")
+	endtime := this.GetString("endtime")
+	limit, _ := this.GetInt64("limit")
+	fmt.Println("limit", limit)
+	page, _ := this.GetInt64("page")
+	fmt.Println("page", page)
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startimeUnix := startTimes.Unix()
+	fmt.Println(startimeUnix)
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
+	endtimeUnix := endtimes.Unix()
+	fmt.Println(endtimeUnix)
+
+	//获取数据
+	//recordList, err := service.GetDiastolicStand(orgId, startimeUnix, endtimeUnix,page,limit)
+	bloodPressure, err := service.GetDefaultBloodPressure(orgId)
+	var sysMin string
+	var sysLarge string
+	var diaMin string
+	var diaLarge string
+	for index, value := range bloodPressure {
+		fmt.Println("index", index)
+		if value.InspectionMajor == 0 && value.InspectionMinor == -1 {
+			sysMin = value.MinRange
+			sysLarge = value.LargeRange
+		}
+		if value.InspectionMajor == 0 && value.InspectionMinor == -2 {
+			diaMin = value.MinRange
+			diaLarge = value.LargeRange
+		}
+	}
+	sysmin, err := strconv.ParseInt(sysMin, 10, 64)
+	syslarge, err := strconv.ParseInt(sysLarge, 10, 64)
+	diamin, err := strconv.ParseInt(diaMin, 10, 64)
+	dialarge, err := strconv.ParseInt(diaLarge, 10, 64)
+
+	recoredtwo, err := service.TotalSysNoStandCountTwo(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge)
+	record, err := service.TotalSysNoStandCount(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"record":        record,
+		"bloodPressure": bloodPressure,
+		"recoredtwo":    recoredtwo,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -41,4 +41,5 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/gettargestanddetail", &NewCommonApiController{}, "Get:GetTargetStandDetail")
 	beego.Router("/m/api/getsystolicbloodstand", &NewCommonApiController{}, "Get:GetSystolicBloodStand")
 	beego.Router("/m/api/getmobileidslist", &NewCommonApiController{}, "post:GetMobileIdsList")
+	beego.Router("/m/api/getsystolicbloodnostand", &NewCommonApiController{}, "Get:GetSystolicBloodNoStand")
 }

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

@@ -0,0 +1,218 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/controllers/mobile_api_controllers"
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"fmt"
+	"github.com/jinzhu/gorm"
+	"strconv"
+	"time"
+)
+
+type NewManageApiController struct {
+	mobile_api_controllers.MobileBaseAPIAuthController
+}
+
+func (this *NewManageApiController) GetEquitAutoInfo() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	remander, err := service.GetRemanderData(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"remander": remander,
+	})
+}
+
+func (this *NewManageApiController) GetDisInfectionTime() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	bedid, _ := this.GetInt64("bed_id")
+	scheduletype, _ := this.GetInt64("schedule_type")
+	scheduleweek, _ := this.GetInt64("schedule_week")
+	fmt.Println(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 {
+		//查询改设备是否有消毒计划
+		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,
+			})
+		}
+	} else if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"plan":       infomation.LongTime,
+			"infomation": infomation,
+		})
+	}
+	//查询改设备是否有消毒计划
+	//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 {
+	//
+	//}
+
+}
+
+func (this *NewManageApiController) SaveDisInfectionInfo() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	bedid, _ := this.GetInt64("bed_id")
+	start_time := this.GetString("start_time")
+	startdate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", start_time)
+	startdateunix := startdate.Unix()
+	disinfectime, _ := this.GetInt64("disinfec_time")
+	endtime := this.GetString("end_time")
+	enddate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endtime)
+	enddateunix := enddate.Unix()
+	scheduledate, _ := this.GetInt64("schedule_date")
+	zoneid, _ := this.GetInt64("zone_id")
+	patientid, _ := this.GetInt64("patient_id")
+	modeid, _ := this.GetInt64("mode_id")
+	scheduletype, _ := this.GetInt64("schedule_type")
+
+	//查询病人信息
+	patients, _ := service.GetPatientInfoMation(patientid)
+	var con = ""
+	if patients.IsInfectious == 0 {
+		con = ""
+	}
+	if patients.IsInfectious == 1 {
+		con = "无"
+	}
+	if patients.IsInfectious == 2 {
+		con = "有"
+	}
+	//查询病人上机信息
+	order, _ := service.GetPatientOrderInfo(scheduledate, patientid, orgid)
+	//查询病人今日透后评估数据
+	dislysis, _ := service.GetAssessmentAfterDissDataTwo(patientid, orgid, scheduledate)
+	fmt.Println("透析减少", dislysis.WeightLoss)
+	//			//根据床位号获取设备id
+	addmacher, _ := service.GetEquimentIDTwo(bedid, 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)
+	//for index, count := range counts {
+	//   if(index == 0){
+	//      usertoal = count.Total
+	//   }
+	//}
+	//usertotalint, errplan := strconv.ParseInt(addmacher.UserTotal, 10, 64)
+	//var total = usertoal + usertotalint
+	//totals := strconv.FormatInt(total, 10)
+	if errplan == gorm.ErrRecordNotFound {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msstatus"] = "2"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		_, errcode := service.GetInforTwo(patientid, scheduledate, orgid, scheduletype)
+		if errcode == gorm.ErrRecordNotFound {
+			information := models.DeviceInformation{
+				Date:                  scheduledate,
+				Zone:                  zoneid,
+				Class:                 scheduletype,
+				BedNumber:             bedid,
+				PatientId:             patientid,
+				DialysisMode:          modeid,
+				LongTime:              strconv.FormatInt(disinfectime, 10),
+				Disinfection:          1,
+				DialysisConcentration: 1,
+				DisinfectionStatus:    1,
+				Move:                  1,
+				UserOrgId:             orgid,
+				DisinfectType:         plan.Way,
+				DisinfectantType:      plan.MachineDisinfectant,
+				FluidPath:             plan.DisinfectanWay, //液路消毒方式
+				Disinfectant:          plan.Disinfectant,
+				Ctime:                 time.Now().Unix(),
+				Status:                1,
+				SignName:              order.FinishNurse,
+				EquimentId:            addmacher.ID,
+				DisinfectionResidue:   2,
+				Bed:                   addmacher.BedNumber,
+				StartTime:             order.StartTime,
+				EndTime:               order.EndTime,
+				Contagion:             con,
+				WeightLoss:            dislysis.WeightLoss,
+				Hyperfiltratio:        dislysis.ActualUltrafiltration,
+				DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
+				MachineRun:            1,
+				DisinfecStartime:      startdateunix,
+				DisinfecEndtime:       enddateunix,
+			}
+			err := service.CreateInformationTwo(&information)
+			fmt.Println("报错", err)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"information": information,
+			})
+		} else if errcode == nil {
+			information := models.DeviceInformation{
+				DisinfecStartime: startdateunix,
+				DisinfecEndtime:  enddateunix,
+				LongTime:         strconv.FormatInt(disinfectime, 10),
+			}
+
+			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/new_mobile_api_controllers/new_manage_api_router.go

@@ -0,0 +1,10 @@
+package new_mobile_api_controllers
+
+import "github.com/astaxie/beego"
+
+func NewManageApiControllersRegisterRouters() {
+
+	beego.Router("m/api/getequitautoinfo", &NewManageApiController{}, "Get:GetEquitAutoInfo")
+	beego.Router("m/api/getdisinfection", &NewManageApiController{}, "Get:GetDisInfectionTime")
+	beego.Router("/m/api/savedisinfectioninfo", &NewManageApiController{}, "Get:SaveDisInfectionInfo")
+}

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)
@@ -3801,7 +3801,6 @@ func (c *PatientApiController) ExportPatients() {
 				patient.DryWeight = dry_weights
 
 			}
-
 			patient.CreatedTime = time.Now().Unix()
 			patient.UpdatedTime = time.Now().Unix()
 			patient.Status = 1

controllers/schedule_api_controller.go

@@ -645,11 +645,108 @@ func (this *ScheduleApiController) UrgentScheduleData() {
 
 func (this *ScheduleApiController) SearchSchedulePatients() {
 	keywords := this.GetString("keywords")
-	adminUserInfo := this.GetAdminUserInfo()
-	list, _ := service.GetSchedualPatientsByKeywords(keywords, adminUserInfo.CurrentOrgId)
-	this.ServeSuccessJSON(map[string]interface{}{
-		"schdules": list,
-	})
+	week_type, _ := this.GetInt64("week_type", 0)
+
+	thisTime1 := time.Now()
+	thisTime2 := time.Now()
+
+	thisTime1 = thisTime1.AddDate(0, 0, 7)
+	thisTime2 = thisTime2.AddDate(0, 0, 14)
+
+	var start_time string
+	var end_time string
+
+	switch week_type {
+	case 1:
+
+		adminUserInfo := this.GetAdminUserInfo()
+		list, _ := service.GetSchedualPatientsByKeywords(keywords, adminUserInfo.CurrentOrgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schdules": list,
+		})
+
+		break
+	case 2:
+		days := make([]string, 0)
+
+		weekDay1 := int(thisTime1.Weekday())
+		if weekDay1 == 0 {
+			weekDay1 = 7
+		}
+		weekEnd1 := 7 - weekDay1
+		weekStart1 := weekEnd1 - 6
+		for index := weekStart1; index <= weekEnd1; index++ {
+			theDay := thisTime1.AddDate(0, 0, index)
+			days = append(days, theDay.Format("2006-01-02"))
+			if index == 0 {
+				start_time = theDay.Format("2006-01-02")
+			}
+
+			end_time = theDay.Format("2006-01-02")
+		}
+
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+
+		var theStartTime int64
+		if len(start_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+			theStartTime = theTime.Unix()
+		}
+		var theEndtTime int64
+		if len(end_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+			theEndtTime = theTime.Unix()
+		}
+
+		adminUserInfo := this.GetAdminUserInfo()
+		list, _ := service.GetSchedualPatientsByKeywordsAndWeek(keywords, adminUserInfo.CurrentOrgId, theStartTime, theEndtTime)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schdules": list,
+		})
+
+		break
+	case 3:
+		days := make([]string, 0)
+
+		weekDay2 := int(thisTime2.Weekday())
+		if weekDay2 == 0 {
+			weekDay2 = 7
+		}
+		weekEnd2 := 7 - weekDay2
+		weekStart2 := weekEnd2 - 6
+		for index := weekStart2; index <= weekEnd2; index++ {
+			theDay := thisTime2.AddDate(0, 0, index)
+			days = append(days, theDay.Format("2006-01-02"))
+			if index == 0 {
+				start_time = theDay.Format("2006-01-02")
+			}
+
+			end_time = theDay.Format("2006-01-02")
+		}
+
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+
+		var theStartTime int64
+		if len(start_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+			theStartTime = theTime.Unix()
+		}
+		var theEndtTime int64
+		if len(end_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+			theEndtTime = theTime.Unix()
+		}
+
+		adminUserInfo := this.GetAdminUserInfo()
+		list, _ := service.GetSchedualPatientsByKeywordsAndWeek(keywords, adminUserInfo.CurrentOrgId, theStartTime, theEndtTime)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schdules": list,
+		})
+
+		break
+	}
 
 }
 

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"`
@@ -869,3 +870,13 @@ func (DeviceMode) TableName() string {
 
 	return "xt_device_mode"
 }
+
+type VmDeviceInformation struct {
+	Total     int64
+	BedNumber int64 `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+}
+
+func (VmDeviceInformation) TableName() string {
+
+	return "xt_device_information"
+}

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 {

routers/router.go

@@ -35,7 +35,7 @@ func init() {
 	controllers.ScheduleApiRegistRouters()
 	controllers.SignWeighAPIControllerRegistRouters()
 	controllers.InvoiceApiRegistRouters()
-	//controllers.StockApiRegistRouters()
+	controllers.StockApiRegistRouters()
 	controllers.StockGoodApiRegistRouters()
 	controllers.StockManagerApiRegistRouters()
 	controllers.PatientScheduleTemplateAPIControllerRegistRouters()
@@ -59,6 +59,7 @@ func init() {
 	//admin_api.AdminAPIControllersRegisterRouters()
 	new_m_api.CommonApiControllersRegisterRouters()
 	new_m_api.NewCommonApiControllersRegisterRouters()
+	new_m_api.NewManageApiControllersRegisterRouters()
 	controllers.ManageRouters()
 	//controllers.PatientRouters()
 }

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/common_service.go

@@ -3214,10 +3214,11 @@ func GetStandList(orgid int64, startime int64, endtime int64, limit int64, page
 	return inspection, err
 }
 
-func GetDiastolicStand(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecords, err error) {
+func GetDiastolicStand(orgid int64, startime int64, endtime int64, page int64, limit int64) (record []*models.XTMonitoringRecords, err error) {
 
 	db := XTReadDB().Table("xt_monitoring_record as x")
-	err = db.Select("x.id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and (x.systolic_blood_pressure <> 0 or x.diastolic_blood_pressure)", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Scan(&record).Error
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0 and x.diastolic_blood_pressure <> 0)", orgid, startime, endtime).Offset(offset).Limit(limit).Group("x.monitoring_date,x.patient_id").Scan(&record).Error
 	return record, err
 }
 
@@ -3226,3 +3227,93 @@ func GetInspectionMoninList(id int64, orgid int64, patientid int64) (models.XtIn
 	err = XTReadDB().Model(&inspection).Where("item_id=? and org_id = ? and status = 1 and patient_id = ?", id, orgid, patientid).Last(&inspection).Error
 	return inspection, err
 }
+
+func TotalSysStandCountTwo(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	if sysmin > 0 {
+		db = db.Where(" x.systolic_blood_pressure>=?", sysmin)
+	}
+	if syslarge > 0 {
+		db = db.Where("x.systolic_blood_pressure<=?", syslarge)
+	}
+	if diamin > 0 {
+		db = db.Where(" x.diastolic_blood_pressure>=?", diamin)
+	}
+	if dialarge > 0 {
+		db = db.Where("x.diastolic_blood_pressure<=?", dialarge)
+	}
+	err = db.Select("x.id,x.user_org_id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.status = 1").Group("x.monitoring_date,x.patient_id").Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}
+
+func TotalSysStandCount(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64, page int64, limit int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	if sysmin > 0 {
+		db = db.Where(" x.systolic_blood_pressure>=?", sysmin)
+	}
+	if syslarge > 0 {
+		db = db.Where("x.systolic_blood_pressure<=?", syslarge)
+	}
+	if diamin > 0 {
+		db = db.Where(" x.diastolic_blood_pressure>=?", diamin)
+	}
+	if dialarge > 0 {
+		db = db.Where("x.diastolic_blood_pressure<=?", dialarge)
+	}
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.user_org_id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.status = 1").Group("x.monitoring_date,x.patient_id").Offset(offset).Limit(limit).Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}
+
+func TotalSysNoStandCountTwo(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	err = db.Select("x.id,x.user_org_id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.status = 1 and(x.systolic_blood_pressure<=? or x.systolic_blood_pressure>=?) or (x.diastolic_blood_pressure<=? or x.diastolic_blood_pressure>=?)", sysmin, syslarge, diamin, dialarge).Group("x.monitoring_date,x.patient_id").Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}
+
+func TotalSysNoStandCount(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64, page int64, limit int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.user_org_id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.status = 1 and(x.systolic_blood_pressure<=? or x.systolic_blood_pressure>=?) or (x.diastolic_blood_pressure<=? or x.diastolic_blood_pressure>=?)", sysmin, syslarge, diamin, dialarge).Group("x.monitoring_date,x.patient_id").Offset(offset).Limit(limit).Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}

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

@@ -1112,3 +1112,127 @@ func GetOrgs(id int64) (roles []*models.SgjUserAdminRole, err error) {
 
 	return roles, err
 }
+
+func GetUserMachTotalCount(orgid int64) (vm []*models.VmDeviceInformation, err error) {
+
+	err = UserReadDB().Raw("SELECT x.bed_number,count(*) as total  FROM xt_device_information  as x WHERE user_org_id = ? and `status` = 1 GROUP BY x.bed_number ", orgid).Scan(&vm).Error
+	return vm, err
+}
+
+func GetUserTotalByMacher(id int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Model(&addmacher).Where("id=? and status = 1", id).Find(&addmacher).Error
+	return addmacher, err
+}
+
+func GetUserTotalCount(orgid int64, bedid int64) (vm []*models.VmDeviceInformation, err error) {
+
+	err = UserReadDB().Raw("SELECT x.bed_number,count(*) as total  FROM xt_device_information  as x WHERE user_org_id = ? and `status` = 1 and bed_number= ? GROUP BY x.bed_number ", orgid, bedid).Scan(&vm).Error
+	return vm, err
+
+}
+
+func GetUserTotal(orgid int64, id int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Model(&addmacher).Where("user_org_id = ? and bed_id = ? and status = 1", orgid, id).Find(&addmacher).Error
+	return addmacher, err
+}
+
+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 device_type = ? and classtime = ? and time = ? and status = 1", orgid, unitype, scheduletype, scheduleweek).Find(&plan).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &plan, nil
+}
+
+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 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
+}
+
+func GetAssessmentAfterDissDataTwo(patientid int64, orgID int64, timenow int64) (models.XtAssessmentAfterDislysis, error) {
+	dislysis := models.XtAssessmentAfterDislysis{}
+	err := XTReadDB().Where("patient_id = ? AND user_org_id = ? AND assessment_date = ?", patientid, orgID, timenow).Find(&dislysis).Error
+	return dislysis, err
+}
+
+func GetEquimentIDTwo(bedId int64, orgID int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := readUserDb.Model(&addmacher).Where("bed_id = ? AND user_org_id = ? AND status = ?", bedId, orgID, 1).Find(&addmacher).Error
+	return addmacher, err
+}
+
+func GetDisinfectionTwo(equitType int64, enquitType 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
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &plan, nil
+}
+
+func GetInforTwo(patientid int64, timenow int64, orgid int64, class int64) (*models.DeviceInformation, error) {
+	var pre models.DeviceInformation
+	var err error
+	err = readUserDb.Model(&pre).Where("patient_id = ? AND date = ? AND user_org_id = ? AND class = ? AND status = 1", patientid, timenow, orgid, class).Find(&pre).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &pre, nil
+}
+
+func GetPatientOrderInfo(schduledate int64, patientid int64, orgid int64) (models.XtDialysisOrder, error) {
+	order := models.XtDialysisOrder{}
+	err := XTReadDB().Model(&order).Where("dialysis_date = ? and patient_id = ? and user_org_id = ? and status = 1", schduledate, patientid, orgid).Find(&order).Error
+	return order, err
+}
+
+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

@@ -94,6 +94,7 @@ type MDialysisScheduleVM struct {
 	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
 	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date"`
 	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week"`
 	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
 	Status       int64 `gorm:"column:status" json:"status"`
 
@@ -1264,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
+}

service/patient_service.go

@@ -291,7 +291,7 @@ func CreatePatientsNew(patientsNew *models.XtPatientsNew) error {
 
 func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto) (err error) {
 	utx := writeDb.Begin()
-	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"Lapseto": patient.Lapseto}).Error
+	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto}).Error
 	//err = utx.Model(&models.PatientLapseto{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto_type": patient.Lapseto, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		utx.Rollback()

service/schedule_service.go

@@ -213,6 +213,23 @@ func GetPrinitWeekSchedules(orgID int64, start, end int64) ([]*WeekSchedulePrint
 // 	return nil
 // }
 
+func GetSchedualPatientsByKeywordsAndWeek(keywords string, org_id int64, start_time int64, end_time int64) (schedule []*models.Schedule, err error) {
+	likeKey := "%" + keywords + "%"
+	err = readDb.
+		Table("xt_schedule as s").
+		Preload("PatientInfectiousDiseases", "status = 1 ").
+		Preload("DeviceZone", "status = 1 ").
+		Preload("DeviceNumber", "status = 1 ").
+		Preload("TreatmentMode", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).
+		Where("s.user_org_id=? and s.schedule_date >= ? and s.schedule_date <= ? and s.status=1", org_id, start_time, end_time).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Order("schedule_date asc").
+		Find(&schedule).Error
+	return
+
+}
+
 func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*models.Schedule, err error) {
 	likeKey := "%" + keywords + "%"
 

service/stock_service.go

@@ -1215,8 +1215,8 @@ func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
 
 }
 
-func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, number string) (out models.WarehouseOutInfo, err error) {
-	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND  warehouse_out_order_number = ?", org_id, good_type_id, good_id, number).First(&out).Error
+func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, out_id int64) (out models.WarehouseOutInfo, err error) {
+	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND  warehouse_out_id = ?", org_id, good_type_id, good_id, out_id).First(&out).Error
 	return
 }
 

数据变更脚本.sql

@@ -96,6 +96,26 @@ ALTER TABLE `sgj_xt`.`xt_monitoring_record`     CHANGE `transmembrane_pressure_u
 --检验检查添加结果提示字段--
 ALTER TABLE `test_xt`.`xt_inspection`     ADD COLUMN `inspect_tips` VARCHAR(255) NULL COMMENT '结果提示' AFTER `inspect_value`;
 
-
+--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');