医保对接

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 = 9919
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,14 +91,14 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9919
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
 
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9919
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9919
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/data_api_controller.go

@@ -224,6 +224,7 @@ func (c *DataApiController) UpdateChildConfig() {
 	dataconfig.UpdatedTime = time.Now().Format("2006-01-02 15:04:05")
 	dataconfig.Remark = string(dataBody["remark"].(string))
 	dataconfig.Order = int64(dataBody["orders"].(float64))
+	dataconfig.FieldType = int64(dataBody["field_type"].(float64))
 	fmt.Println("dataconfitg------", dataconfig.Order)
 	//if dataBody["orders"] != nil {
 	//	dataconfig.Order = int64(dataBody["orders"].(float64))
@@ -348,6 +349,12 @@ func (c *DataApiController) CreateChildConfig() {
 		dataconfig.Order = 0
 	}
 
+	if dataBody["field_type"] != nil {
+		dataconfig.FieldType = int64(dataBody["field_type"].(float64))
+	} else {
+		dataconfig.FieldType = 0
+	}
+
 	// 验证关键字段的值是否重复
 	// thisConfig,_:=service.FindConfigByName(dataconfig.Module, dataconfig.Name,dataconfig.ParentId,dataconfig.OrgId)
 	// if thisConfig.ID >0 {

controllers/dialysis_api_controller.go

@@ -244,8 +244,9 @@ func (c *DialysisApiController) PostPrescription() {
 	//fmt.Println("下机前推注鱼精蛋白",push_the_protamine)
 	// var prescription_doctor int64
 	blood := c.GetString("blood")
-	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
-	//dialysis_irrigation := c.GetString("dialysis_irrigation")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -326,13 +327,78 @@ func (c *DialysisApiController) PostPrescription() {
 		PreImpulse:                 preImpules,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
-		//DialysisDialyszers:         dialysis_dialyszers,
-		//DialysisIrrigation:         dialysis_irrigation,
+		Blood:                    blood,
+		DialysisDialyszers:       dialysis_dialyszers,
+		DialysisIrrigation:       dialysis_irrigation,
 		AntioxidantCommodityName: antioxidant_commodity_name,
 		DisplaceSpeed:            displace_speed,
 	}
 
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.CurrentOrgId)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//      }
+	//      }
+	//    }
+	//  }
+	//
+	//}
+
 	if appRole.UserType == 2 || appRole.UserType == 1 {
 		prescription.PrescriptionDoctor = appRole.AdminUserId
 	}
@@ -497,8 +563,8 @@ func (c *DialysisApiController) PostSoulution() {
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
 	blood := c.GetString("blood")
-	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
-	//dialysis_irrigation := c.GetString("dialysis_irrigation")
+	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
 	var prescription_doctor int64
@@ -590,13 +656,77 @@ func (c *DialysisApiController) PostSoulution() {
 
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		Blood:                     blood,
-		//DialysisIrrigation:        dialysis_irrigation,
-		//DialysisDialyszers:        dialysis_dialyszers,
+		Blood:                    blood,
+		DialysisIrrigation:       dialysis_irrigation,
+		DialysisDialyszers:       dialysis_dialyszers,
 		AntioxidantCommodityName: antioxidant_commodity_name,
 		DisplaceSpeed:            displace_speed,
 	}
 
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.CurrentOrgId)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.CurrentOrgId,patient)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.CurrentOrgId,
+	//            PatientId:  patient,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//        }
+	//      }
+	//    }
+	//  }
+	//}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if dialysisPrescription.ID == 0 { //新增
 		if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -604,7 +734,7 @@ func (c *DialysisApiController) PostSoulution() {
 		}
 
 		prescription.Creater = adminUserInfo.AdminUser.Id
-		//prescription.Creater = adminUserInfo.AdminUser.Id
+
 	} else { //修改
 
 		//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -687,6 +817,8 @@ func (c *DialysisApiController) PostSoulution() {
 		BodyFluidOther:             body_fluid_other,
 		ReplacementTotal:           replacement_total,
 		TargetKtv:                  target_ktv,
+		DialysisIrrigation:         dialysis_irrigation,
+		DialysisDialyszers:         dialysis_dialyszers,
 	}
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 	if err == nil {
@@ -1955,6 +2087,9 @@ func (c *DialysisApiController) CreateMonitor() {
 	result := c.GetString("results")
 
 	monitoring_nurse, _ := c.GetInt64("monitoring_nurse", 0)
+
+	monitor_anticoagulant, _ := c.GetInt64("monitor_anticoagulant")
+	monitor_anticoagulant_value := c.GetString("monitor_anticoagulant_value")
 	monitoring_date = monitoring_date / 1000
 	// operate_time = operate_time / 1000
 	if patient <= 0 {
@@ -2007,6 +2142,8 @@ func (c *DialysisApiController) CreateMonitor() {
 		DisplacementFlowQuantity:  displacement_flow_quantity,
 		Heparin:                   heparin,
 		DialysateFlow:             dialysate_flow,
+		MonitorAnticoagulant:      monitor_anticoagulant,
+		MonitorAnticoagulantValue: monitor_anticoagulant_value,
 	}
 
 	err := service.CreateMonitor(&monitorRecord)

controllers/dialysis_record_api_controller.go

@@ -278,6 +278,9 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
 	}
 
+	//获取患者的最后一次血管通路数据
+	lastAssessment, parseDateErr := service.GetLastPassWayAssessment(adminInfo.CurrentOrgId, patientID)
+
 	returnData := map[string]interface{}{
 		"patient":                     patient,
 		"schedual":                    schedual,
@@ -306,6 +309,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		"is_open_config":              is_open_config,
 		"stockType":                   stockType,
 		"prepare":                     prepare,
+		"lastAssessment":              lastAssessment,
 	}
 	this.ServeSuccessJSON(returnData)
 
@@ -345,6 +349,8 @@ type EditMonitorParamObject struct {
 	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"`
+	MonitorAnticoagulant      int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -455,6 +461,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			DialysateFlow:             monitorParam.DialysateFlow,
 			Urr:                       monitorParam.Urr,
 			BloodSugar:                monitorParam.BloodSugar,
+			MonitorAnticoagulant:      monitorParam.MonitorAnticoagulant,
+			MonitorAnticoagulantValue: monitorParam.MonitorAnticoagulantValue,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -521,6 +529,8 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.DialysateFlow = monitorParam.DialysateFlow
 		monitor.Urr = monitorParam.Urr
 		monitor.BloodSugar = monitorParam.BloodSugar
+		monitor.MonitorAnticoagulant = monitorParam.MonitorAnticoagulant
+		monitor.MonitorAnticoagulantValue = monitorParam.MonitorAnticoagulantValue
 		updateErr := service.UpdateMonitor(monitor)
 		if updateErr != nil {
 			this.ErrorLog("修改透析监测记录失败:%v", updateErr)

controllers/doctors_api_controller.go

@@ -30,6 +30,15 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/schedule/getdoctoradvicecount", &DoctorsApiController{}, "Get:GetDoctorAdviceCount")
 	beego.Router("/api/patient/savevasularaccess", &DoctorsApiController{}, "Get:SaveVasularAccess")
 	beego.Router("/api/patient/getallvascualraccesslist", &DoctorsApiController{}, "Get:GetAllVacualAccessList")
+	beego.Router("/api/patient/getvascularaccessbydetial", &DoctorsApiController{}, "Get:GetVascularAccessByDetail")
+	beego.Router("/api/patient/updatevasularaccess", &DoctorsApiController{}, "Get:UpdateVasularAccess")
+	beego.Router("/api/patient/deletevascularaccess", &DoctorsApiController{}, "Get:DeleteVasularAccess")
+	beego.Router("/api/patient/savepasswayassessment", &DoctorsApiController{}, "Get:SavePassWayAssessment")
+	beego.Router("/api/patient/getallpasswayassessment", &DoctorsApiController{}, "Get:GetAllPassWayAssessment")
+	beego.Router("/api/patient/getpasswayassmentbyid", &DoctorsApiController{}, "Get:GetPasswayAssesmentById")
+	beego.Router("/api/patient/updatepasswayassesment", &DoctorsApiController{}, "Get:UpdatePassWayAssesment")
+	beego.Router("/api/patient/deletepasswayassessment", &DoctorsApiController{}, "Get:DeleteWayAssessment")
+	beego.Router("/api/patient/getaccesslist", &DoctorsApiController{}, "Get:GetAccessList")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -37,7 +46,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adviceType, _ := c.GetInt("advice_type")
 	patientType, _ := c.GetInt("patient_type")
 	delivery_way := c.GetString("delivery_way")
-
+	schedule_type, _ := c.GetInt64("schedule_type")
+	partition_type, _ := c.GetInt64("partition_type")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -56,8 +66,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way)
-	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way)
+	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
+	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
 	config, _ := service.GetHisDoctorConfig(orgID)
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 	if err != nil {
@@ -329,9 +339,116 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	stop_reason := this.GetString("stop_reason")
 	user_status, _ := this.GetInt64("user_status")
+	stop_time := this.GetString("stop_time")
+	stopTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", stop_time+" 00:00:00", loc)
+	patient_id, _ := this.GetInt64("patient_id")
+	other_vascular := this.GetString("other_vascular")
+	ci_type, _ := this.GetInt64("ci_type")
+	blood_cultupe, _ := this.GetInt64("blood_cultupe")
+	sequelae_type, _ := this.GetInt64("sequelae_type")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	creator := adminUserInfo.AdminUser.Id
+
+	//查询改日期是否存在
+	_, errcode := service.GetDialysisDateByDate(startTime.Unix(), patient_id, orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		access := models.XtPatientVascularAccess{
+			AccessProject:          access_project,
+			BloodAccessPartId:      blood_access_part_id,
+			BloodAccessPartOperaId: blood_access_part_opera_id,
+			FirstStartTime:         firstStartTime.Unix(),
+			InflowPass:             inflow_pass,
+			Remark:                 remark,
+			StartTime:              startTime.Unix(),
+			StopReason:             stop_reason,
+			UserStatus:             user_status,
+			Creator:                creator,
+			UserOrgId:              orgId,
+			Status:                 1,
+			Ctime:                  time.Now().Unix(),
+			StopTime:               stopTime.Unix(),
+			PatientId:              patient_id,
+			OtherVascular:          other_vascular,
+			CiType:                 ci_type,
+			BloodCultupe:           blood_cultupe,
+			SequelaeType:           sequelae_type,
+		}
+		err := service.SaveVascularAccess(&access)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"access": access,
+			})
+			return
+		}
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+		return
+	}
+
+}
+
+func (this *DoctorsApiController) GetAllVacualAccessList() {
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	list, total, err := service.GetAllVacualAccessList(orgId, limit, page, patient_id)
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":   list,
+			"total":  total,
+			"doctor": doctor,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) GetVascularAccessByDetail() {
+
+	id, _ := this.GetInt64("id")
+
+	accessDetail, err := service.GetVasularAccessByDetail(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"accessDetail": accessDetail,
+			"doctor":       doctor,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) UpdateVasularAccess() {
+	id, _ := this.GetInt64("id")
+	access_project, _ := this.GetInt64("access_project")
+	blood_access_part_id := this.GetString("blood_access_part_id")
+	blood_access_part_opera_id := this.GetString("blood_access_part_opera_id")
+	first_start_time := this.GetString("first_start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	firstStartTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", first_start_time+" 00:00:00", loc)
+	inflow_pass := this.GetString("inflow_pass")
+	remark := this.GetString("remark")
+	start_time := this.GetString("start_time")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	stop_reason := this.GetString("stop_reason")
+	user_status, _ := this.GetInt64("user_status")
+	stop_time := this.GetString("stop_time")
+	stopTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", stop_time+" 00:00:00", loc)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	creator := adminUserInfo.AdminUser.Id
+	patientId, _ := this.GetInt64("patient_id")
+	other_vascular := this.GetString("other_vascular")
+	ci_type, _ := this.GetInt64("ci_type")
+	blood_cultupe, _ := this.GetInt64("blood_cultupe")
+	sequelae_type, _ := this.GetInt64("sequelae_type")
 	access := models.XtPatientVascularAccess{
 		AccessProject:          access_project,
 		BloodAccessPartId:      blood_access_part_id,
@@ -342,26 +459,86 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 		StartTime:              startTime.Unix(),
 		StopReason:             stop_reason,
 		UserStatus:             user_status,
-		Creator:                creator,
+		Modify:                 creator,
 		UserOrgId:              orgId,
 		Status:                 1,
-		Ctime:                  time.Now().Unix(),
+		StopTime:               stopTime.Unix(),
+		OtherVascular:          other_vascular,
+		CiType:                 ci_type,
+		BloodCultupe:           blood_cultupe,
+		SequelaeType:           sequelae_type,
+	}
+	_, errcode := service.GetDialysisDateByDateOne(startTime.Unix(), patientId, orgId, id)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.UpdateVascularAccess(&access, id)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"access": access,
+			})
+			return
+		}
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+		return
+	}
+
+}
+
+func (this *DoctorsApiController) DeleteVasularAccess() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteVasularAccess(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *DoctorsApiController) SavePassWayAssessment() {
+
+	blood_dealwidth := this.GetString("blood_dealwith")
+	blood_project := this.GetString("blood_project")
+	blood_result := this.GetString("blood_result")
+	creator, _ := this.GetInt64("creator")
+	parent_id, _ := this.GetInt64("parent_id")
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	modify := this.GetAdminUserInfo().AdminUser.Id
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	assessment := models.XtPatientPasswayAssessment{
+		StartTime:     startTime.Unix(),
+		BloodDealwith: blood_dealwidth,
+		BloodProject:  blood_project,
+		BloodResult:   blood_result,
+		Creator:       creator,
+		PatientId:     patient_id,
+		ParentId:      parent_id,
+		Modify:        modify,
+		UserOrgId:     orgId,
+		Status:        1,
+		Ctime:         time.Now().Unix(),
 	}
-	err := service.SaveVascularAccess(&access)
+
+	err := service.CreatePatientWayAssessment(&assessment)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"access": access,
+			"assessment": assessment,
 		})
 		return
 	}
 }
 
-func (this *DoctorsApiController) GetAllVacualAccessList() {
+func (this *DoctorsApiController) GetAllPassWayAssessment() {
 
-	limit, _ := this.GetInt64("limit")
+	patient_id, _ := this.GetInt64("patient_id")
+	parent_id, _ := this.GetInt64("parent_id")
 	page, _ := this.GetInt64("page")
-	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, total, err := service.GetAllVacualAccessList(orgId, limit, page)
+	limit, _ := this.GetInt64("limit")
+	adminUserInfo := this.GetAdminUserInfo()
+	list, total, err := service.GetAllPassWayAssessment(parent_id, patient_id, page, limit, adminUserInfo.CurrentOrgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,
@@ -370,3 +547,74 @@ func (this *DoctorsApiController) GetAllVacualAccessList() {
 		return
 	}
 }
+
+func (this *DoctorsApiController) GetPasswayAssesmentById() {
+
+	id, _ := this.GetInt64("id")
+	assessment, err := service.GetPasswayAssesmentById(id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"assessment": assessment,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) UpdatePassWayAssesment() {
+	id, _ := this.GetInt64("id")
+	blood_dealwidth := this.GetString("blood_dealwith")
+	blood_project := this.GetString("blood_project")
+	blood_result := this.GetString("blood_result")
+	creator, _ := this.GetInt64("creator")
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	modify := this.GetAdminUserInfo().AdminUser.Id
+	assessment := models.XtPatientPasswayAssessment{
+		BloodResult:   blood_result,
+		BloodDealwith: blood_dealwidth,
+		BloodProject:  blood_project,
+		Creator:       creator,
+		StartTime:     startTime.Unix(),
+		Modify:        modify,
+	}
+	err := service.UpdatePassWayAssesment(&assessment, id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"assessment": assessment,
+		})
+		return
+	}
+}
+
+func (this *DoctorsApiController) DeleteWayAssessment() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteWayAssessment(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *DoctorsApiController) GetAccessList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	//血管通路
+	list, err := service.GetAccessList(orgId)
+	blood_access_part_opera, err := service.GetParentAccessList(orgId, list.ID)
+
+	//血管通路部位
+	access, err := service.GetBloodAccess(orgId)
+	blood_access_part, err := service.GetParentAccessList(orgId, access.ID)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"blood_access_part_opera": blood_access_part_opera,
+			"blood_access_part":       blood_access_part,
+		})
+		return
+	}
+}

controllers/gobal_config_api_controller.go

@@ -757,8 +757,11 @@ func (c *GobalConfigApiController) UpdateSystemPrescription() {
 func (c *GobalConfigApiController) GetAllSystemPrescription() {
 	adminUserInfo := c.GetAdminUserInfo()
 	prescriptions, _ := service.FindAllSystemPrescription(adminUserInfo.CurrentOrgId)
+
+	stockType, _ := service.GetStockType(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"prescriptions": prescriptions,
+		"stockType":     stockType,
 	})
 }
 
@@ -990,6 +993,17 @@ func defaultSystemSolutionFormData(solution *models.SystemPrescription, data []b
 		solution.Remark = remark
 	}
 
+	if dataBody["dialysis_dialyszers"] != nil && reflect.TypeOf(dataBody["dialysis_dialyszers"]).String() == "string" {
+		dialysisDialyszers := dataBody["dialysis_dialyszers"].(string)
+		fmt.Println("dialysisDialysis22222222222", dialysisDialyszers)
+		solution.DialysisDialyszers = dialysisDialyszers
+	}
+
+	if dataBody["dialysis_irrigation"] != nil && reflect.TypeOf(dataBody["dialysis_irrigation"]).String() == "string" {
+		dialysisIrrigation := dataBody["dialysis_irrigation"].(string)
+		solution.DialysisIrrigation = dialysisIrrigation
+	}
+
 	return
 }
 

controllers/his_project_api_controller.go

@@ -309,7 +309,7 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
 	ids := this.GetString("ids")
-
+	item_id := this.GetString("item_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	projectTeam := models.XtHisProjectTeam{
@@ -324,6 +324,7 @@ func (this *HisProjectApiController) SaveProjectTeam() {
 		Status:      1,
 		CreatedTime: time.Now().Unix(),
 		ProjectId:   ids,
+		ItemId:      item_id,
 	}
 	//fmt.Println(projectTeam)
 
@@ -397,6 +398,7 @@ func (this *HisProjectApiController) UpdatedProjectTeam() {
 	team_type, _ := this.GetInt64("team_type")
 	remark := this.GetString("remark")
 	ids := this.GetString("ids")
+	item_id := this.GetString("item_id")
 	projectTeam := models.XtHisProjectTeam{
 		ProjectTeam: project_team,
 		Price:       price_float,
@@ -406,6 +408,7 @@ func (this *HisProjectApiController) UpdatedProjectTeam() {
 		TeamType:    team_type,
 		Remark:      remark,
 		ProjectId:   ids,
+		ItemId:      item_id,
 	}
 
 	err := service.UpdatedProjectTeam(id, &projectTeam)
@@ -620,12 +623,15 @@ func (this *HisProjectApiController) AddProjectList() {
 	}
 	err := service.CreateProjectList(&projectList)
 	detail, _ := service.GetProjectDetail(id)
+
+	item, err := service.GetLastItem(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"projectList": detail,
+		"item":        item,
 	})
 	return
 }

controllers/inspection_api_controller.go

@@ -92,9 +92,11 @@ func (c *InspectionApiController) PatientInspectionReference() {
 		}
 	}
 
+	list, err := service.GetInspectionReferenceByOrgId(0)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"reference":    reference,
 		"patient_info": patient_info,
+		"list":         list,
 	})
 	return
 

controllers/manager_center_api_controller.go

@@ -126,7 +126,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_charge_predict, _ := c.GetInt64("is_charge_predict")
 	is_statistics_work, _ := c.GetInt64("is_statistics_work")
 	is_charge_use, _ := c.GetInt64("is_charge_use")
-
+	dealer, _ := c.GetInt64("dealer")
 	adminInfo := c.GetAdminUserInfo()
 
 	drugLib := &models.BaseDrugLib{
@@ -178,6 +178,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Status:                 1,
 		Ctime:                  time.Now().Unix(),
 		Mtime:                  time.Now().Unix(),
+		Dealer:                 dealer,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -254,6 +255,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_charge_use, _ := c.GetInt64("is_charge_use")
 	drug_code := c.GetString("drug_code")
 	//unit := c.GetString("unit")
+	dealer, _ := c.GetInt64("dealer")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -308,6 +310,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		Ctime:                  drug.Ctime,
 		Mtime:                  time.Now().Unix(),
 		DrugCode:               drug_code,
+		Dealer:                 dealer,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)
@@ -1546,6 +1549,11 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		RetailPrice:            retail_price,
 	}
 
+	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id)
+	if totals > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodInfoNameExistError)
+		return
+	}
 	err, goodInfos := service.ModifyGoodInfo(&goodInfo)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -91,6 +91,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
+
 		if err != nil {
 			this.ErrorLog("获取排班信息失败:%v", err)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -117,6 +118,7 @@ func (this *DialysisAPIController) Scheduals() {
 		} else {
 
 		}
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
@@ -337,6 +339,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, date.Unix(), schedual.ModeId)
+
 	//if getDialysisPrescribeErr != nil {
 	//	this.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -375,6 +378,11 @@ func (this *DialysisAPIController) DialysisRecord() {
 	stockType, _ := service.GetStockType(adminInfo.Org.Id)
 
 	prepare, _ := service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
+
+	//获取最后一次血管通路
+	lastAssessment, parseDateErr := service.GetLastPassWayAssessment(adminInfo.Org.Id, patientID)
+
+	prescribeOne, parseDateErr := service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
 	var his_advices []*models.HisDoctorAdviceInfo
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
@@ -429,6 +437,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"is_open_config":                 is_open_config,
 		"stockType":                      stockType,
 		"prepare":                        prepare,
+		"lastAssessment":                 lastAssessment,
+		"prescribeOne":                   prescribeOne,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -1155,6 +1165,71 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DisplaceSpeed:            displace_speed,
 	}
 
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.Org.Id)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//        }
+	//      }
+	//    }
+	//  }
+	//}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if dialysisPrescription.ID == 0 { //新增
 		//if mode_id > 0 {
@@ -1514,6 +1589,7 @@ func (c *DialysisAPIController) GetSchedualPatientsList() {
 // @param nurse:int 上机护士
 // @param bed:int 床位号
 func (this *DialysisAPIController) StartDialysis() {
+
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("record_date")
 	nurseID, _ := this.GetInt64("nurse")
@@ -1569,15 +1645,15 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	nurse, getNurseErr = service.GetAdminUserByUserID(puncture_nurse)
-	if getNurseErr != nil {
-		this.ErrorLog("获取护士失败:%v", getNurseErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if nurse == nil {
-		this.ErrorLog("护士不存在")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if getNurseErr != nil {
+	//	this.ErrorLog("获取护士失败:%v", getNurseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if nurse == nil {
+	//	this.ErrorLog("护士不存在")
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.Org.Id, bedID)
 	if getDeviceNumberErr != nil {
@@ -2055,8 +2131,75 @@ func (c *DialysisAPIController) PostSolution() {
 		BodyFluidOther:             body_fluid_other,
 		ReplacementTotal:           replacement_total,
 		TargetKtv:                  target_ktv,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
 	}
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
+
+	//查询最近透析准备表里是否存在 透析器 灌流器
+
+	//splitStr := strings.Split(dialysis_dialyszers, ",")
+	//
+	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
+	//
+	//mation, _ := service.GetGoodInfoMation(adminUserInfo.Org.Id)
+	//if len(mation)>0{
+	//  for _, item := range splitStr {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println("",errcode)
+	//        }
+	//      }
+	//    }
+	//
+	//  }
+	//
+	//  for _, item := range splitIrrigation {
+	//    for _,it := range mation{
+	//      if(item == it.SpecificationName){
+	//        //查询最近一次的透析器
+	//        _, errcode := service.GetDialysisBeforePrepare(it.GoodTypeId, it.ID, adminUserInfo.Org.Id,id)
+	//        if errcode == gorm.ErrRecordNotFound{
+	//          //插入数据
+	//          prepare := models.DialysisBeforePrepare{
+	//            UserOrgId:  adminUserInfo.Org.Id,
+	//            PatientId:  id,
+	//            RecordDate: recordDate.Unix(),
+	//            GoodTypeId: it.GoodTypeId,
+	//            GoodId:     it.ID,
+	//            Count:      1,
+	//            Ctime:      time.Now().Unix(),
+	//            Creater:    adminUserInfo.AdminUser.Id,
+	//            Status:1,
+	//
+	//          }
+	//          errcode := service.CreateDialysisBeforePrepareOne(&prepare)
+	//          fmt.Println(errcode)
+	//        }
+	//      }
+	//    }
+	//  }
+	//}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"solution":     &solution,
 		"prescription": &prescription,
@@ -2221,15 +2364,15 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	}
 
 	nurse, getNurseErr = service.GetAdminUserByUserID(puncture_nurse)
-	if getNurseErr != nil {
-		this.ErrorLog("获取护士失败:%v", getNurseErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if nurse == nil {
-		this.ErrorLog("护士不存在")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if getNurseErr != nil {
+	//	this.ErrorLog("获取护士失败:%v", getNurseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if nurse == nil {
+	//	this.ErrorLog("护士不存在")
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.Org.Id, bedID)
 	if getDeviceNumberErr != nil {
@@ -3031,6 +3174,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 	if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
 		goods, _ := dataBody["goods"].([]interface{})
+
 		if len(goods) > 0 {
 			for _, item := range goods {
 				items := item.(map[string]interface{})
@@ -3056,23 +3200,25 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-				//commdity_code := items["commdity_code"].(string)
-				//fmt.Println("新建22222222222222",commdity_code)
+				commdity_code := items["commdity_code"].(string)
+
 				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
-					UserOrgId:  adminUser.Org.Id,
-					PatientId:  patient_id,
-					RecordDate: record_time,
-					GoodId:     good_id,
-					GoodTypeId: good_type_id,
-					Count:      count,
-					Ctime:      time.Now().Unix(),
-					Mtime:      time.Now().Unix(),
-					Creater:    adminUser.AdminUser.Id,
-					Modifier:   0,
-					//CommdityCode:commdity_code,
+					UserOrgId:    adminUser.Org.Id,
+					PatientId:    patient_id,
+					RecordDate:   record_time,
+					GoodId:       good_id,
+					GoodTypeId:   good_type_id,
+					Count:        count,
+					Ctime:        time.Now().Unix(),
+					Mtime:        time.Now().Unix(),
+					Creater:      adminUser.AdminUser.Id,
+					Modifier:     0,
+					CommdityCode: commdity_code,
 				}
+				//问题点
 				record_count := service.FindDialysisBeforePrepare(prepare.PatientId, prepare.GoodId, prepare.GoodTypeId, adminUser.Org.Id, record_time)
+
 				if record_count == 0 {
 					beforePrepares = append(beforePrepares, prepare)
 				}
@@ -3149,22 +3295,22 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 				ctime := int64(items["ctime"].(float64))
 
-				//commdity_code := items["commdity_code"].(string)
-				//fmt.Println("commdityecode22222222222222222222",commdity_code)
+				commdity_code := items["commdity_code"].(string)
+
 				prepare := &models.DialysisBeforePrepare{
-					ID:         id,
-					UserOrgId:  adminUser.Org.Id,
-					PatientId:  patient_id,
-					RecordDate: record_time,
-					GoodId:     good_id,
-					GoodTypeId: good_type_id,
-					Count:      count,
-					Ctime:      ctime,
-					Mtime:      time.Now().Unix(),
-					Creater:    creater,
-					Modifier:   adminUser.AdminUser.Id,
-					Status:     1,
-					//CommdityCode: commdity_code,
+					ID:           id,
+					UserOrgId:    adminUser.Org.Id,
+					PatientId:    patient_id,
+					RecordDate:   record_time,
+					GoodId:       good_id,
+					GoodTypeId:   good_type_id,
+					Count:        count,
+					Ctime:        ctime,
+					Mtime:        time.Now().Unix(),
+					Creater:      creater,
+					Modifier:     adminUser.AdminUser.Id,
+					Status:       1,
+					CommdityCode: commdity_code,
 				}
 				updateBeforePrepares = append(updateBeforePrepares, prepare)
 
@@ -3394,6 +3540,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 	var newBeforePrepares []*models.DialysisBeforePrepare
 
+	//判断是否开启自动出库
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 
 	if record.IsOpen == 1 {
@@ -3461,23 +3608,23 @@ func (c *DialysisAPIController) EditConsumables() {
 						return
 					}
 					ctime := int64(items["ctime"].(float64))
-					//commdity_code := items["commdity_code"].(string)
-					//fmt.Println("commdityecode22222222222222222222",commdity_code)
+					commdity_code := items["commdity_code"].(string)
+
 					adminUser := c.GetMobileAdminUserInfo()
 					prepare := &models.DialysisBeforePrepare{
-						ID:         id,
-						UserOrgId:  adminUser.Org.Id,
-						PatientId:  patient_id,
-						RecordDate: record_time,
-						GoodId:     good_id,
-						GoodTypeId: good_type_id,
-						Count:      count,
-						Ctime:      ctime,
-						Mtime:      time.Now().Unix(),
-						Creater:    creater,
-						Modifier:   adminUser.AdminUser.Id,
-						Status:     1,
-						//CommdityCode: commdity_code,
+						ID:           id,
+						UserOrgId:    adminUser.Org.Id,
+						PatientId:    patient_id,
+						RecordDate:   record_time,
+						GoodId:       good_id,
+						GoodTypeId:   good_type_id,
+						Count:        count,
+						Ctime:        ctime,
+						Mtime:        time.Now().Unix(),
+						Creater:      creater,
+						Modifier:     adminUser.AdminUser.Id,
+						Status:       1,
+						CommdityCode: commdity_code,
 					}
 					beforePrepares = append(beforePrepares, prepare)
 
@@ -3485,6 +3632,7 @@ func (c *DialysisAPIController) EditConsumables() {
 			}
 		}
 
+		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
 		if dataBody["new_goods"] != nil && reflect.TypeOf(dataBody["new_goods"]).String() == "[]interface {}" {
@@ -3514,30 +3662,34 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-					//commdity_code := items["commdity_code"].(string)
-					//fmt.Println("commdityecode22222222222222222222",commdity_code)
+
+					commdity_code := items["commdity_code"].(string)
+					fmt.Println("commdityecode", commdity_code)
 					adminUser := c.GetMobileAdminUserInfo()
 					prepare := &models.DialysisBeforePrepare{
-						UserOrgId:  adminUser.Org.Id,
-						PatientId:  patient_id,
-						RecordDate: record_time,
-						GoodId:     good_id,
-						GoodTypeId: good_type_id,
-						Count:      count,
-						Ctime:      time.Now().Unix(),
-						Mtime:      time.Now().Unix(),
-						Creater:    adminUser.AdminUser.Id,
-						Modifier:   0,
-						//CommdityCode:commdity_code,
+						UserOrgId:    adminUser.Org.Id,
+						PatientId:    patient_id,
+						RecordDate:   record_time,
+						GoodId:       good_id,
+						GoodTypeId:   good_type_id,
+						Count:        count,
+						Ctime:        time.Now().Unix(),
+						Mtime:        time.Now().Unix(),
+						Creater:      adminUser.AdminUser.Id,
+						Modifier:     0,
+						CommdityCode: commdity_code,
 					}
 					newBeforePrepares = append(newBeforePrepares, prepare)
 
 				}
 				newBeforePrepares = RemoveRepeatedGood(newBeforePrepares)
 			}
+
+			//创建数据
 			service.CreateDialysisBeforePrepare(newBeforePrepares)
 		}
 
+		//查询是否有出库单
 		out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
@@ -3563,7 +3715,9 @@ func (c *DialysisAPIController) EditConsumables() {
 				Type:                    1,
 				IsSys:                   1,
 			}
+			//创建出库单
 			err := service.AddSigleWarehouseOut(&warehouseOut)
+			fmt.Println("err", err)
 			if err != nil {
 				utils.TraceLog("创建出库单失败 err = %v", err)
 			} else {
@@ -3588,6 +3742,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						}
 						stockInInfo, _ := service.FindLastStockInInfoRecord(item.GoodId, adminInfo.Org.Id)
 						warehouseOutInfo.Price = stockInInfo.Price
+						//创建出库详情
 						err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 						if err == nil {
 							details := &models.AutomaticReduceDetail{
@@ -3607,11 +3762,13 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 				}
 			}
+			//没有出库单创建
 		} else if err == nil {
 
 			if len(newBeforePrepares) > 0 { //新增
 
 				for _, item := range newBeforePrepares {
+
 					outInfo, err := service.FindStockOutInfoByTypeId(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, out.ID, out.WarehouseOutOrderNumber)
 
 					if err == gorm.ErrRecordNotFound {
@@ -3800,15 +3957,12 @@ func (c *DialysisAPIController) EditConsumables() {
 									}
 								}
 
-								fmt.Println("444444444")
-
 							}
 						}
 					}
 				}
 			}
 		}
-		fmt.Println("655555555")
 
 		var errs error
 		if len(beforePrepares) > 0 {
@@ -4007,6 +4161,9 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 
 	goodTypes, _ := service.FindAllGoodType(adminUser.Org.Id)
 
+	//获取当天该病人的透析处方
+	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
+	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
 	if err == gorm.ErrRecordNotFound {
 
 		dialysisGoods, _, total := service.MobileGetDialysisGoods(adminUser.Org.Id, date.Unix(), schedule_type, partition_id, page, 0, patient_id, "", schedualEndDate)
@@ -4023,6 +4180,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 			"dialysis_goods": dialysisGoods,
 			"good_type":      goodTypes,
 			"total":          total,
+			"prescribe":      prescribe,
+			"good_info":      good_info,
 		})
 		return
 
@@ -4046,6 +4205,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				"dialysis_goods": dialysisGoods,
 				"good_type":      goodTypes,
 				"total":          total,
+				"prescribe":      prescribe,
+				"good_info":      good_info,
 			})
 			return
 
@@ -4112,11 +4273,17 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 
 	goodUser, _ := service.GetAllStockOutUserDetail(patient_id, adminUser.Org.Id, date.Unix())
 	lastGoodUserDetial, _ := service.GetLastDialysisGoods(patient_id, adminUser.Org.Id, date.Unix())
+
+	//获取今日患者的透析处方参数
+
+	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"good_type":      goodTypes,
 		"good_user":      goodUser,
 		"good_info":      good_info,
 		"last_good_user": lastGoodUserDetial,
+		"prescription":   prescribe,
 	})
 	return
 
@@ -4158,15 +4325,16 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				good_id := int64(items["good_id"].(float64))
 
+				good_id := int64(items["good_id"].(float64))
+				fmt.Println("goood_id2222222222222222", good_id)
 				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
 					utils.ErrorLog("good_type_id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
 				good_type_id := int64(items["good_type_id"].(float64))
-
+				fmt.Println("goood_id2222222222222222", good_type_id)
 				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
 					utils.ErrorLog("count")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4174,7 +4342,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				}
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-
+				fmt.Println("count22222222", count)
 				adminUser := c.GetMobileAdminUserInfo()
 				prepare := &models.DialysisBeforePrepare{
 					UserOrgId:  adminUser.Org.Id,
@@ -4424,3 +4592,45 @@ func (c *DialysisAPIController) GetDepartment() {
 	}
 
 }
+
+func (c *DialysisAPIController) GetMobilePrintStockGood() {
+
+	types, _ := c.GetInt("type", 0)
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, err := service.FindPrintStockGoodInfoByType(types, startTime, endTime, orgId)
+	stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":       list,
+			"type":       types,
+			"stockTotal": stockTotal,
+		})
+	}
+}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -92,6 +92,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	dialysate_flow, _ := this.GetFloat("dialysate_flow")
 	urr := this.GetString("urr")
 	blood_sugar, _ := this.GetFloat("blood_sugar")
+	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
+	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -146,6 +148,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		DialysateFlow:             dialysate_flow,
 		Urr:                       urr,
 		BloodSugar:                blood_sugar,
+		MonitorAnticoagulant:      monitor_anticoagulant,
+		MonitorAnticoagulantValue: monitor_anticoagulant_value,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -240,7 +244,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	urr := this.GetString("urr")
 	blood_sugar, _ := this.GetFloat("blood_sugar")
 	adminInfo := this.GetMobileAdminUserInfo()
-
+	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
+	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -288,6 +293,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.DialysateFlow = dialysate_flow
 	monitor.Urr = urr
 	monitor.BloodSugar = blood_sugar
+	monitor.MonitorAnticoagulant = monitor_anticoagulant
+	monitor.MonitorAnticoagulantValue = monitor_anticoagulant_value
 	err = service.UpdateMonitor(monitor)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorUpdate)

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -137,4 +137,5 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/department/get", &DialysisAPIController{}, "Get:GetDepartment")
 
+	beego.Router("/m/api/getmobileprintstockgood", &DialysisAPIController{}, "Get:GetMobilePrintStockGood")
 }

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2627,7 +2627,7 @@ func (this *NewDialysisApiController) GetRolePosition() {
 
 	//去查角色
 	role, err := service.GetAdminUserRole(cretor, orgid)
-	fmt.Println("role----------------", role.RoleIds)
+
 	role_ids := strings.Split(role.RoleIds, ",")
 	var names = ""
 	for _, item := range role_ids {
@@ -2750,3 +2750,46 @@ func (this *NewDialysisApiController) SaveCourseManageMentTwo() {
 		"record": record,
 	})
 }
+
+func (this *NewDialysisApiController) GetVascularAccess() {
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	patient_id, _ := this.GetInt64("patient_id")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	adminInfo := this.GetMobileAdminUserInfo()
+	appId := adminInfo.App.Id
+	list, total, err := service.GetAllVacualAccessList(orgId, limit, page, patient_id)
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":   list,
+			"total":  total,
+			"doctor": doctor,
+		})
+		return
+	}
+}
+
+func (this *NewDialysisApiController) GetVascularAccessDetail() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	parent_id, _ := this.GetInt64("parent_id")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	list, total, err := service.GetAllPassWayAssessment(parent_id, patient_id, page, limit, orgId)
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	appId := adminInfo.App.Id
+	allDoctor, err := service.GetAllDoctor(orgId, appId)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"total":     total,
+			"allDoctor": allDoctor,
+		})
+		return
+	}
+}

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -43,8 +43,7 @@ func (this *NewManageApiController) GetDisInfectionTime() {
 	unitType, _ := service.GetUnitType(bedid, orgid)
 	//查询使用登记最后一条消毒记录
 	infomation, err := service.GetLaseDeviceInfomation(orgid, bedid, scheduledate, scheduletype)
-	fmt.Println("infomation========", infomation)
-	fmt.Println("err-------", err)
+	fmt.Println("err", err)
 	if err == gorm.ErrRecordNotFound {
 		//查询改设备是否有消毒计划
 		plan, errcode := service.GetDisInfectionTime(orgid, unitType.UnitType, scheduletype, scheduleweek)
@@ -216,3 +215,27 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 		}
 	}
 }
+
+func (this *NewManageApiController) GetDeviceInformation() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+
+	scheduleDate := this.GetString("schedule_date")
+	recordDate, parseErr := utils.ParseTimeStringToTime("2006-01-02", scheduleDate)
+	if parseErr != nil {
+		this.ErrorLog("时间解析失败:%v", parseErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	fmt.Println("recordDate2222222", recordDate.Unix())
+	//查询今日所有设备使用登记
+	information, err := service.GetDeviceInfomation(orgid, recordDate.Unix())
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+	})
+}

controllers/new_mobile_api_controllers/new_manage_api_router.go

@@ -7,4 +7,5 @@ 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")
+	beego.Router("/m/api/getdeviceinformation", &NewManageApiController{}, "Get:GetDeviceInformation")
 }

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -162,6 +162,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/deletemanagementtwo", &NewDialysisApiController{}, "Delete:DeleteManageMentTwo")
 	beego.Router("/m/api/patient/savecouresemanagement", &NewDialysisApiController{}, "Get:SaveCourseManageMent")
 	beego.Router("/m/api/patient/savecoursemanagementtwo", &NewDialysisApiController{}, "Get:SaveCourseManageMentTwo")
+	beego.Router("/m/api/patient/getvascularaccess", &NewDialysisApiController{}, "Get:GetVascularAccess")
+	beego.Router("/m/api/patient/getvascularaccessdetail", &NewDialysisApiController{}, "Get:GetVascularAccessDetail")
 
 	//His相关
 	beego.Router("/m/api/hispatientlist/get", &MobileHisApiController{}, "Get:GetHisPatientList")

controllers/patient_api_controller.go

@@ -254,29 +254,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,
@@ -322,28 +322,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)
@@ -481,28 +481,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,
@@ -544,19 +544,19 @@ 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(),
-		BloodPatients:             1,
-		Lapseto:                   patient.Lapseto,
+		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,
+		Lapseto:                  patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -854,6 +854,8 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 		BloodAccess:                solution.BloodAccess,
 		DialysateFlow:              solution.DialysateFlow,
 		DialysateTemperature:       solution.DialysateTemperature,
+		DialysisIrrigation:         solution.DialysisIrrigation,
+		DialysisDialyszers:         solution.DialysisDialyszers,
 	}
 	service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	if err != nil {
@@ -926,9 +928,11 @@ func (c *PatientApiController) GetPatientDialysisSolutionList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	solutions, total, _ := service.GetPatientDialysisSolutionList(adminUserInfo.CurrentOrgId, id, page, limit)
+	stockType, _ := service.GetStockType(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"solutions": solutions,
 		"total":     total,
+		"stockType": stockType,
 	})
 	return
 }
@@ -3390,6 +3394,22 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		solution.Remark = remark
 	}
 
+	if dataBody["created_time"] != nil && reflect.TypeOf(dataBody["created_time"]).String() == "float64" {
+		created_time := int64(dataBody["created_time"].(float64))
+
+		solution.CreatedTime = created_time
+	}
+
+	if dataBody["dialysis_dialyszers"] != nil && reflect.TypeOf(dataBody["dialysis_dialyszers"]).String() == "string" {
+		dialysisDialyszers := dataBody["dialysis_dialyszers"].(string)
+		solution.DialysisDialyszers = dialysisDialyszers
+	}
+
+	if dataBody["dialysis_irrigation"] != nil && reflect.TypeOf(dataBody["dialysis_irrigation"]).String() == "string" {
+		dialysisIrrigation := dataBody["dialysis_irrigation"].(string)
+		solution.DialysisIrrigation = dialysisIrrigation
+	}
+
 	return
 }
 

controllers/schedule_api_controller.go

@@ -44,6 +44,8 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/getthreeweeklist", &ScheduleApiController{}, "Get:GetThreeWeekList")
 
 	beego.Router("/api/schedule/getallzones", &ScheduleApiController{}, "Get:GetAllZones")
+
+	beego.Router("/api/schedule/copypatientschedules", &ScheduleApiController{}, "Get:GetCopyPatientSchedules")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -1928,7 +1930,9 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 	week_time, _ := this.GetInt64("week_time")
 	start_time, _ := this.GetInt64("start_time")
 	end_time, _ := this.GetInt64("end_time")
+
 	adminUserInfo := this.GetAdminUserInfo()
+
 	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1992,3 +1996,127 @@ func (this *ScheduleApiController) GetAllZones() {
 		"zones": zones,
 	})
 }
+
+func (this *ScheduleApiController) GetCopyPatientSchedules() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	start_time, _ := this.GetInt64("start_time")
+	fmt.Println("start_time", start_time)
+	end_time, _ := this.GetInt64("end_time")
+	fmt.Println("end_time", end_time)
+	copy_startime, _ := this.GetInt64("copy_startime")
+	fmt.Println("copy_startime", copy_startime)
+	copy_endtime, _ := this.GetInt64("copy_endtime")
+
+	//获取本周患者排班
+	schedules, _ := service.GetWeekSchedules(orgId, start_time, end_time)
+
+	//查询复制中的排班日期是否存在
+	_, errcode := service.GetLastWeekSchedule(orgId, copy_startime, copy_endtime)
+
+	if errcode == gorm.ErrRecordNotFound {
+		//如果没有直接新增
+
+		for _, item := range schedules {
+			//fmt.Println(item.StartTime+604800)
+			//礼拜1
+			if item.ScheduleWeek == 1 {
+				item.ScheduleDate = copy_startime
+			}
+			if item.ScheduleWeek == 2 {
+				item.ScheduleDate = copy_startime + 86400
+			}
+			if item.ScheduleWeek == 3 {
+				item.ScheduleDate = copy_startime + 172800
+			}
+			if item.ScheduleWeek == 4 {
+				item.ScheduleDate = copy_startime + 259200
+			}
+			if item.ScheduleWeek == 5 {
+				item.ScheduleDate = copy_startime + 345600
+			}
+
+			if item.ScheduleWeek == 6 {
+				item.ScheduleDate = copy_startime + 432000
+			}
+			//礼拜天
+			if item.ScheduleWeek == 0 {
+				item.ScheduleDate = copy_endtime
+			}
+			schedule := models.XtSchedule{
+				UserOrgId:    item.UserOrgId,
+				PartitionId:  item.PartitionId,
+				BedId:        item.BedId,
+				PatientId:    item.PatientId,
+				ScheduleDate: item.ScheduleDate,
+				ScheduleType: item.ScheduleType,
+				ScheduleWeek: item.ScheduleWeek,
+				ModeId:       item.ModeId,
+				Status:       1,
+				CreatedTime:  time.Now().Unix(),
+			}
+
+			err := service.AddPatientSchedule(&schedule)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": schedule,
+			})
+		}
+	} else if errcode == nil {
+
+		//先清除复制周的排班
+		errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
+		fmt.Println(errcode)
+		for _, item := range schedules {
+			//fmt.Println(item.StartTime+604800)
+			//礼拜1
+			if item.ScheduleWeek == 1 {
+				item.ScheduleDate = copy_startime
+			}
+			if item.ScheduleWeek == 2 {
+				item.ScheduleDate = copy_startime + 86400
+			}
+			if item.ScheduleWeek == 3 {
+				item.ScheduleDate = copy_startime + 172800
+			}
+			if item.ScheduleWeek == 4 {
+				item.ScheduleDate = copy_startime + 259200
+			}
+			if item.ScheduleWeek == 5 {
+				item.ScheduleDate = copy_startime + 345600
+			}
+
+			if item.ScheduleWeek == 6 {
+				item.ScheduleDate = copy_startime + 432000
+			}
+			//礼拜天
+			if item.ScheduleWeek == 0 {
+				item.ScheduleDate = copy_endtime
+			}
+			schedule := models.XtSchedule{
+				UserOrgId:    item.UserOrgId,
+				PartitionId:  item.PartitionId,
+				BedId:        item.BedId,
+				PatientId:    item.PatientId,
+				ScheduleDate: item.ScheduleDate,
+				ScheduleType: item.ScheduleType,
+				ScheduleWeek: item.ScheduleWeek,
+				ModeId:       item.ModeId,
+				Status:       1,
+				CreatedTime:  time.Now().Unix(),
+			}
+
+			err := service.AddPatientSchedule(&schedule)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedule": schedule,
+			})
+		}
+	}
+}

controllers/stock_good_api_controller.go

@@ -51,6 +51,7 @@ func (c *StockGoodApiController) CreateGoodType() {
 	total := service.FindAllGoodTypeTotal(adminUserInfo.CurrentOrgId)
 	code := strconv.FormatInt(total+1, 10)
 	code = "34000000" + code
+
 	goodType := models.GoodsType{
 		TypeCode:       code,
 		TypeName:       type_name,

controllers/stock_in_api_controller.go

@@ -1379,7 +1379,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.WarehouseOutInfo{
-						ID:                      id,
+						ID: id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						GoodId:                  good_id,
@@ -1985,6 +1985,7 @@ func (this *StockManagerApiController) GetOutStockTotalCount() {
 	warehouseOutTime, _ := this.GetInt64("warehouse_out_time")
 	adminUserInfo := this.GetAdminUserInfo()
 	stockCount, err := service.GetOutStockTotalCount(warehouseOutTime, adminUserInfo.CurrentOrgId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	}

models/data_models.go

@@ -18,6 +18,7 @@ type Dataconfig struct {
 	Content        string `gorm:"column:content" json:"content" form:"content"`
 	Order          int64  `gorm:"column:orders" json:"orders" form:"orders"`
 	Code           string `gorm:"column:code" json:"code" form:"code"`
+	FieldType      int64  `gorm:"column:field_type" json:"field_type" form:"field_type"`
 }
 
 func (Dataconfig) TableName() string {

models/device_models.go

@@ -584,6 +584,9 @@ type DeviceCultures struct {
 	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	UserName          string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 //细菌培养检测
@@ -605,6 +608,9 @@ type DeviceCulture struct {
 	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 func (DeviceCulture) TableName() string {
@@ -631,6 +637,9 @@ type DeviceDialysates struct {
 	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	UserName          string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 //内霉素检测
@@ -652,6 +661,9 @@ type DeviceDialysate struct {
 	BedId             int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
 	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 func (DeviceDialysate) TableName() string {
@@ -660,57 +672,63 @@ func (DeviceDialysate) TableName() string {
 }
 
 type DeviceIons struct {
-	ID             int64  `gorm:"column:id" json:"id" form:"id"`
-	SamplingDate   int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
-	Samplerc       int64  `gorm:"column:samplerc" json:"samplerc" form:"samplerc"`
-	DetectionUnit  string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
-	ConcentrateNof string `gorm:"column:concentrate_nof" json:"concentrate_nof" form:"concentrate_nof"`
-	ConcentrateNog string `gorm:"column:concentrate_nog" json:"concentrate_nog" form:"concentrate_nog"`
-	DateReportc    int64  `gorm:"column:date_reportc" json:"date_reportc" form:"date_reportc"`
-	ActualNa       string `gorm:"column:actual_na" json:"actual_na" form:"actual_na"`
-	ActualPna      string `gorm:"column:actual_pna" json:"actual_pna" form:"actual_pna"`
-	ActualK        string `gorm:"column:actual_k" json:"actual_k" form:"actual_k"`
-	ActualCa       string `gorm:"column:actual_ca" json:"actual_ca" form:"actual_ca"`
-	ActualCi       string `gorm:"column:actual_ci" json:"actual_ci" form:"actual_ci"`
-	ActualHco      string `gorm:"column:actual_hco" json:"actual_hco" form:"actual_hco"`
-	ActualMg       string `gorm:"column:actual_mg" json:"actual_mg" form:"actual_mg"`
-	ActualPh       string `gorm:"column:actual_ph" json:"actual_ph" form:"actual_ph"`
-	Remakes        string `gorm:"column:remakes" json:"remakes" form:"remakes"`
-	Status         int64  `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime          int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	BedId          int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	EquitmentId    int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
-	UserName       string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Bed            string `gorm:"column:bed" json:"bed" form:"bed"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate    int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Samplerc        int64  `gorm:"column:samplerc" json:"samplerc" form:"samplerc"`
+	DetectionUnit   string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	ConcentrateNof  string `gorm:"column:concentrate_nof" json:"concentrate_nof" form:"concentrate_nof"`
+	ConcentrateNog  string `gorm:"column:concentrate_nog" json:"concentrate_nog" form:"concentrate_nog"`
+	DateReportc     int64  `gorm:"column:date_reportc" json:"date_reportc" form:"date_reportc"`
+	ActualNa        string `gorm:"column:actual_na" json:"actual_na" form:"actual_na"`
+	ActualPna       string `gorm:"column:actual_pna" json:"actual_pna" form:"actual_pna"`
+	ActualK         string `gorm:"column:actual_k" json:"actual_k" form:"actual_k"`
+	ActualCa        string `gorm:"column:actual_ca" json:"actual_ca" form:"actual_ca"`
+	ActualCi        string `gorm:"column:actual_ci" json:"actual_ci" form:"actual_ci"`
+	ActualHco       string `gorm:"column:actual_hco" json:"actual_hco" form:"actual_hco"`
+	ActualMg        string `gorm:"column:actual_mg" json:"actual_mg" form:"actual_mg"`
+	ActualPh        string `gorm:"column:actual_ph" json:"actual_ph" form:"actual_ph"`
+	Remakes         string `gorm:"column:remakes" json:"remakes" form:"remakes"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId           int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId     int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	UserName        string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Bed             string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications   int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 //透析液离子浓度检测
 type DeviceIon struct {
-	ID             int64  `gorm:"column:id" json:"id" form:"id"`
-	SamplingDate   int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
-	Samplerc       int64  `gorm:"column:samplerc" json:"samplerc" form:"samplerc"`
-	DetectionUnit  string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
-	ConcentrateNof string `gorm:"column:concentrate_nof" json:"concentrate_nof" form:"concentrate_nof"`
-	ConcentrateNog string `gorm:"column:concentrate_nog" json:"concentrate_nog" form:"concentrate_nog"`
-	DateReportc    int64  `gorm:"column:date_reportc" json:"date_reportc" form:"date_reportc"`
-	ActualNa       string `gorm:"column:actual_na" json:"actual_na" form:"actual_na"`
-	ActualPna      string `gorm:"column:actual_pna" json:"actual_pna" form:"actual_pna"`
-	ActualK        string `gorm:"column:actual_k" json:"actual_k" form:"actual_k"`
-	ActualCa       string `gorm:"column:actual_ca" json:"actual_ca" form:"actual_ca"`
-	ActualCi       string `gorm:"column:actual_ci" json:"actual_ci" form:"actual_ci"`
-	ActualHco      string `gorm:"column:actual_hco" json:"actual_hco" form:"actual_hco"`
-	ActualMg       string `gorm:"column:actual_mg" json:"actual_mg" form:"actual_mg"`
-	ActualPh       string `gorm:"column:actual_ph" json:"actual_ph" form:"actual_ph"`
-	Remakes        string `gorm:"column:remakes" json:"remakes" form:"remakes"`
-	Status         int64  `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime          int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	BedId          int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	EquitmentId    int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
-	Bed            string `gorm:"column:bed" json:"bed" form:"bed"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate    int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Samplerc        int64  `gorm:"column:samplerc" json:"samplerc" form:"samplerc"`
+	DetectionUnit   string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	ConcentrateNof  string `gorm:"column:concentrate_nof" json:"concentrate_nof" form:"concentrate_nof"`
+	ConcentrateNog  string `gorm:"column:concentrate_nog" json:"concentrate_nog" form:"concentrate_nog"`
+	DateReportc     int64  `gorm:"column:date_reportc" json:"date_reportc" form:"date_reportc"`
+	ActualNa        string `gorm:"column:actual_na" json:"actual_na" form:"actual_na"`
+	ActualPna       string `gorm:"column:actual_pna" json:"actual_pna" form:"actual_pna"`
+	ActualK         string `gorm:"column:actual_k" json:"actual_k" form:"actual_k"`
+	ActualCa        string `gorm:"column:actual_ca" json:"actual_ca" form:"actual_ca"`
+	ActualCi        string `gorm:"column:actual_ci" json:"actual_ci" form:"actual_ci"`
+	ActualHco       string `gorm:"column:actual_hco" json:"actual_hco" form:"actual_hco"`
+	ActualMg        string `gorm:"column:actual_mg" json:"actual_mg" form:"actual_mg"`
+	ActualPh        string `gorm:"column:actual_ph" json:"actual_ph" form:"actual_ph"`
+	Remakes         string `gorm:"column:remakes" json:"remakes" form:"remakes"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId           int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId     int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	Bed             string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications   int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 func (DeviceIon) TableName() string {
@@ -892,3 +910,115 @@ type VmSchedule struct {
 	Number       string `gorm:"column:number" json:"number" form:"number"`
 	ZoneName     string `gorm:"column:name" json:"zon_name" form:"name"`
 }
+
+type XtDeviceOxygenates struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate      int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Specimenb         int64  `gorm:"column:specimenb" json:"specimenb" form:"specimenb"`
+	ConcentrateNoc    string `gorm:"column:concentrate_noc" json:"concentrate_noc" form:"concentrate_noc"`
+	ConcentratebNod   string `gorm:"column:concentrateb_nod" json:"concentrateb_nod" form:"concentrateb_nod"`
+	SamplingLocationb int64  `gorm:"column:sampling_locationb" json:"sampling_locationb" form:"sampling_locationb"`
+	DetectionUnit     string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	Samplerb          int64  `gorm:"column:samplerb" json:"samplerb" form:"samplerb"`
+	ReportingDateb    int64  `gorm:"column:reporting_dateb" json:"reporting_dateb" form:"reporting_dateb"`
+	DetectionResultb  string `gorm:"column:detection_resultb" json:"detection_resultb" form:"detection_resultb"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId             int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
+}
+
+func (XtDeviceOxygenates) TableName() string {
+
+	return "xt_device_oxygenates"
+}
+
+type XtDeviceHadwater struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate      int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Specimenb         int64  `gorm:"column:specimenb" json:"specimenb" form:"specimenb"`
+	ConcentrateNoc    string `gorm:"column:concentrate_noc" json:"concentrate_noc" form:"concentrate_noc"`
+	ConcentratebNod   string `gorm:"column:concentrateb_nod" json:"concentrateb_nod" form:"concentrateb_nod"`
+	SamplingLocationb int64  `gorm:"column:sampling_locationb" json:"sampling_locationb" form:"sampling_locationb"`
+	DetectionUnit     string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	Samplerb          int64  `gorm:"column:samplerb" json:"samplerb" form:"samplerb"`
+	ReportingDateb    int64  `gorm:"column:reporting_dateb" json:"reporting_dateb" form:"reporting_dateb"`
+	DetectionResultb  string `gorm:"column:detection_resultb" json:"detection_resultb" form:"detection_resultb"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId             int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
+}
+
+func (XtDeviceHadwater) TableName() string {
+
+	return "xt_device_hadwater"
+}
+
+type XtDeviceWater struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate      int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Specimenb         int64  `gorm:"column:specimenb" json:"specimenb" form:"specimenb"`
+	ConcentrateNoc    string `gorm:"column:concentrate_noc" json:"concentrate_noc" form:"concentrate_noc"`
+	ConcentratebNod   string `gorm:"column:concentrateb_nod" json:"concentrateb_nod" form:"concentrateb_nod"`
+	SamplingLocationb int64  `gorm:"column:sampling_locationb" json:"sampling_locationb" form:"sampling_locationb"`
+	DetectionUnit     string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	Samplerb          int64  `gorm:"column:samplerb" json:"samplerb" form:"samplerb"`
+	ReportingDateb    int64  `gorm:"column:reporting_dateb" json:"reporting_dateb" form:"reporting_dateb"`
+	DetectionResultb  string `gorm:"column:detection_resultb" json:"detection_resultb" form:"detection_resultb"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId             int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
+}
+
+func (XtDeviceWater) TableName() string {
+
+	return "xt_device_water"
+}
+
+type XtDevicePh struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate      int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Specimenb         int64  `gorm:"column:specimenb" json:"specimenb" form:"specimenb"`
+	ConcentrateNoc    string `gorm:"column:concentrate_noc" json:"concentrate_noc" form:"concentrate_noc"`
+	ConcentratebNod   string `gorm:"column:concentrateb_nod" json:"concentrateb_nod" form:"concentrateb_nod"`
+	SamplingLocationb int64  `gorm:"column:sampling_locationb" json:"sampling_locationb" form:"sampling_locationb"`
+	DetectionUnit     string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	Samplerb          int64  `gorm:"column:samplerb" json:"samplerb" form:"samplerb"`
+	ReportingDateb    int64  `gorm:"column:reporting_dateb" json:"reporting_dateb" form:"reporting_dateb"`
+	DetectionResultb  string `gorm:"column:detection_resultb" json:"detection_resultb" form:"detection_resultb"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId             int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
+}
+
+func (XtDevicePh) TableName() string {
+
+	return "xt_device_ph"
+}

models/dialysis.go

@@ -355,6 +355,8 @@ type DoctorAdvices struct {
 	AnticoagulantShouji        float64         `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
 	AnticoagulantWeichi        float64         `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
 	AnticoagulantZongliang     float64         `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	DialysisDialyszers         string          `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string          `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 type DoctorAdvice struct {
@@ -683,6 +685,8 @@ type MonitoringRecord struct {
 	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"`
+	MonitorAnticoagulant      int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
 }
 
 func (MonitoringRecord) TableName() string {

models/drug.go

@@ -53,6 +53,7 @@ type BaseDrugLib struct {
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	DoseCode               string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
 
+	Dealer int64 `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/gobal_models.go

@@ -82,6 +82,8 @@ type SystemPrescription struct {
 	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
 	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (SystemPrescription) TableName() string {

models/his_models.go

@@ -59,6 +59,7 @@ type XtHisProjectTeam struct {
 	CreatedTime int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId      string  `gorm:"column:item_id" json:"item_id" form:"item_id"`
 }
 
 func (XtHisProjectTeam) TableName() string {

models/patient_models.go

@@ -246,6 +246,8 @@ type DialysisPrescriptionList struct {
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
 	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
 	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -325,6 +327,8 @@ type DialysisSolution struct {
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
 	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other"`
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (DialysisSolution) TableName() string {

models/user_models.go

@@ -335,6 +335,8 @@ type XtDialysisSolution struct {
 	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
 	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (XtDialysisSolution) TableName() string {
@@ -487,9 +489,86 @@ type XtPatientVascularAccess struct {
 	Ctime                  int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                  int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Modify                 int64  `gorm:"column:modify" json:"modify" form:"modify"`
+	StopTime               int64  `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	PatientId              int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OtherVascular          string `gorm:"column:other_vascular" json:"other_vascular" form:"other_vascular"`
+	CiType                 int64  `gorm:"column:ci_type" json:"ci_type" form:"ci_type"`
+	BloodCultupe           int64  `gorm:"column:blood_cultupe" json:"blood_cultupe" form:"blood_cultupe"`
+	SequelaeType           int64  `gorm:"column:sequelae_type" json:"sequelae_type" form:"sequelae_type"`
 }
 
 func (XtPatientVascularAccess) TableName() string {
 
 	return "xt_patient_vascular_access"
 }
+
+type XtPatientPasswayAssessment struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	StartTime     int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	BloodProject  string `gorm:"column:blood_project" json:"blood_project" form:"blood_project"`
+	BloodResult   string `gorm:"column:blood_result" json:"blood_result" form:"blood_result"`
+	BloodDealwith string `gorm:"column:blood_dealwith" json:"blood_dealwith" form:"blood_dealwith"`
+	Modify        int64  `gorm:"column:modify" json:"modify" form:"modify"`
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId     int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ParentId      int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtPatientPasswayAssessment) TableName() string {
+
+	return "xt_patient_passway_assessment"
+}
+
+type XtAerialDetection struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	StartTime           int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	Class               int64  `gorm:"column:class" json:"class" form:"class"`
+	DisinfectionMethods string `gorm:"column:disinfection_methods" json:"disinfection_methods" form:"disinfection_methods"`
+	DisinfectionFluid   string `gorm:"column:disinfection_fluid" json:"disinfection_fluid" form:"disinfection_fluid"`
+	Sort                string `gorm:"column:sort" json:"sort" form:"sort"`
+	Creator             int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	DetectionTime       int64  `gorm:"column:detection_time" json:"detection_time" form:"detection_time"`
+	DetectionResult     string `gorm:"column:detection_result" json:"detection_result" form:"detection_result"`
+	UploadTime          int64  `gorm:"column:upload_time" json:"upload_time" form:"upload_time"`
+	CheckOut            int64  `gorm:"column:check_out" json:"check_out" form:"check_out"`
+	Modifications       int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtAerialDetection) TableName() string {
+
+	return "xt_aerial_detection"
+}
+
+type XtBodyDetection struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	StartTime           int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	CreatedTime         int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	Class               int64  `gorm:"column:class" json:"class" form:"class"`
+	DisinfectionMethods string `gorm:"column:disinfection_methods" json:"disinfection_methods" form:"disinfection_methods"`
+	DisinfectionFluid   string `gorm:"column:disinfection_fluid" json:"disinfection_fluid" form:"disinfection_fluid"`
+	Sort                string `gorm:"column:sort" json:"sort" form:"sort"`
+	Creator             int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	DetectionTime       int64  `gorm:"column:detection_time" json:"detection_time" form:"detection_time"`
+	DetectionResult     string `gorm:"column:detection_result" json:"detection_result" form:"detection_result"`
+	UploadTime          int64  `gorm:"column:upload_time" json:"upload_time" form:"upload_time"`
+	CheckOut            int64  `gorm:"column:check_out" json:"check_out" form:"check_out"`
+	Modifications       int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtBodyDetection) TableName() string {
+
+	return "xt_body_detection"
+}

service/data.go

@@ -247,7 +247,7 @@ func FindConfigByTitleForUpdate(module string, title string, org_id int64, id in
 }
 
 func UpdateChildConfig(dataconfig *models.Dataconfig) (err error) {
-	err = readDb.Model(&models.Dataconfig{}).Where("id =?", dataconfig.ID).Update(map[string]interface{}{"name": dataconfig.Name, "update_time": dataconfig.UpdatedTime, "remark": dataconfig.Remark, "orders": dataconfig.Order}).Error
+	err = readDb.Model(&models.Dataconfig{}).Where("id =?", dataconfig.ID).Update(map[string]interface{}{"name": dataconfig.Name, "update_time": dataconfig.UpdatedTime, "remark": dataconfig.Remark, "orders": dataconfig.Order, "field_type": dataconfig.FieldType}).Error
 	return
 }
 

service/dialysis_service.go

@@ -1122,7 +1122,7 @@ func UpdateDrugUserInfoDetails(drug_id int64, time int64, org_id int64, patient_
 }
 
 func FindDialysisBeforePrepare(patient_id int64, good_id int64, good_type_id int64, user_org_id int64, record_time int64) (count int64) {
-	readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ?  AND good_id = ? AND good_type_id = ? AND record_date = ? AND status = 1", user_org_id, patient_id, good_id, good_type_id, record_time).Count(&count)
+	readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ?  AND good_id = ? AND good_type_id = ? AND record_date = ? AND status = 1 AND count<> 0", user_org_id, patient_id, good_id, good_type_id, record_time).Count(&count)
 	return
 
 }
@@ -1148,3 +1148,28 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 	err = writeDb.Save(&advice).Error
 	return
 }
+
+func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
+
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1", orgid).Find(&goodinfo).Error
+	return goodinfo, err
+}
+
+func GetDialysisBeforePrepare(goodTypeId int64, goodId int64, orgid int64, patientId int64) (*models.DialysisBeforePrepare, error) {
+
+	prepare := models.DialysisBeforePrepare{}
+	err := XTReadDB().Where("good_type_id = ? and good_id = ? and user_org_id = ? and status =1 and patient_id = ?", goodTypeId, goodId, orgid, patientId).Last(&prepare).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &prepare, nil
+}
+
+func CreateDialysisBeforePrepareOne(prepare *models.DialysisBeforePrepare) error {
+
+	err := XTReadDB().Create(&prepare).Error
+	return err
+}

service/drug_stock_service.go

@@ -35,9 +35,9 @@ func FindAllDrugByManufactureId(manufacturer_id int64, dealer_id int64, org_id i
 	if manufacturer_id > 0 {
 		db = db.Where("manufacturer = ?", manufacturer_id)
 	}
-	//if dealer_id > 0 {
-	//	db = db.Where("dealer = ?", dealer_id)
-	//}
+	if dealer_id > 0 {
+		db = db.Where("dealer = ?", dealer_id)
+	}
 	err = db.Preload("DrugSpecs", "status = 1 AND org_id = ? AND find_in_set('停用',drug_status) = 0", org_id).Group("drug_name").Find(&goodInfo).Error
 	return goodInfo, err
 }

service/gobal_config_service.go

@@ -354,3 +354,44 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 
 	return cancel, total, err
 }
+
+func FindPrintStockGoodInfoByType(types int, startTime int64, end_time int64, orgId int64) (list []*models.StockInfo, err error) {
+
+	db := XTReadDB().Model(&models.StockInfo{})
+	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
+	if types == 1 {
+		db = db.Joins("JOIN xt_warehouse_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1", orgId).Joins("JOIN xt_warehouse AS warehouse ON warehouse.id = xt_warehouse_info.warehousing_id AND warehouse.status = 1 AND warehouse.warehousing_time >=? AND warehouse.warehousing_time<= ? AND warehouse.org_id = ?", startTime, end_time, orgId)
+		})
+	} else if types == 2 {
+		db = db.Joins("JOIN xt_sales_return_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QuerySalesReturnInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_sales_return_info.org_id = ? AND xt_sales_return_info.status = 1", orgId).Joins("JOIN xt_sales_return AS sales ON sales.id = xt_sales_return_info.sales_return_id AND sales.status = 1 AND sales.return_time >=? AND sales.return_time<= ? AND sales.org_id = ?", startTime, end_time, orgId)
+		})
+
+	} else if types == 3 {
+		db = db.Joins("JOIN xt_warehouse_out_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1", orgId).Joins("JOIN xt_warehouse_out ON xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.status = 1 AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.org_id = ? ", startTime, end_time, orgId)
+		})
+
+	} else if types == 4 {
+
+		db = db.Joins("JOIN xt_cancel_stock_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
+		db = db.Preload("QueryCancelStockInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId).Joins("JOIN xt_cancel_stock AS cancel ON cancel.id = xt_cancel_stock_info.cancel_stock_id AND cancel.status = 1 AND cancel.return_time >=? AND cancel.return_time<= ? AND cancel.org_id = ?", startTime, end_time, orgId)
+		})
+
+	}
+	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
+	err = db.Order("ctime desc").Find(&list).Error
+	return
+}
+
+func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+
+	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+
+	return autoMatic, err
+}

service/his_project_service.go

@@ -107,7 +107,7 @@ func GetProjectTeamDetail(id int64) (models.XtHisProjectTeam, error) {
 
 func UpdatedProjectTeam(id int64, team *models.XtHisProjectTeam) error {
 
-	err := XTWriteDB().Model(&team).Where("id=? and status = 1", id).Updates(map[string]interface{}{"project_team": team.ProjectTeam, "price": team.Price, "pinyin": team.Pinyin, "wubi": team.Wubi, "tube_color": team.TubeColor, "team_type": team.TeamType, "remark": team.Remark, "project_id": team.ProjectId}).Error
+	err := XTWriteDB().Model(&team).Where("id=? and status = 1", id).Updates(map[string]interface{}{"project_team": team.ProjectTeam, "price": team.Price, "pinyin": team.Pinyin, "wubi": team.Wubi, "tube_color": team.TubeColor, "team_type": team.TeamType, "remark": team.Remark, "project_id": team.ProjectId, "item_id": team.ItemId}).Error
 	return err
 }
 
@@ -305,7 +305,7 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
 	db = db.Preload("HisOrder", "status = 1 AND user_org_id = ?", orgid)
-	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.is_return,x.doctor,x.ctime,x.social_type,x.phone").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
+	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.is_return,x.doctor,x.ctime,x.social_type,x.phone,x.status").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
 	return hisPatient, total, err
 }
 
@@ -684,3 +684,10 @@ func GetProjectHisList(orgid int64) (hisProjectList []*models.XtHisProjectList,
 	error = XTReadDB().Model(&hisProjectList).Where("user_org_id = ? and status = 1", orgid).Group("project_id").Find(&hisProjectList).Error
 	return hisProjectList, error
 }
+
+func GetLastItem(orgid int64) (models.XtHisProjectList, error) {
+
+	list := models.XtHisProjectList{}
+	err := XTReadDB().Model(&list).Where("user_org_id = ? and status = 1", orgid).Last(&list).Error
+	return list, err
+}

service/inspection_service.go

@@ -139,7 +139,7 @@ func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections
 	}
 
 	var Id models.InspectionDate
-	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("inspect_date").Group("inspect_date").Order("inspect_date desc").Offset(page - 1).Limit(1).Scan(&Id).Error
+	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("inspect_date").Group("inspect_date").Order("created_time desc").Offset(page - 1).Limit(1).Scan(&Id).Error
 	if err != nil {
 		return
 	}
@@ -211,3 +211,9 @@ func GetAllInspectionReference(orgId int64) (inspectionReference []*models.Inspe
 	err = readDb.Model(&models.InspectionReference{}).Where("org_id = ? AND status = 1", orgId).Find(&inspectionReference).Error
 	return
 }
+
+func GetInspectionReferenceByOrgId(orgid int64) (insepciton []*models.XtInspectionReference, err error) {
+
+	err = readDb.Model(&insepciton).Where("org_id = ? and status = 1 and project_name = '传染病检查'", orgid).Find(&insepciton).Error
+	return insepciton, err
+}

service/manage_service.go

@@ -448,7 +448,7 @@ func GetAllCulture(orgId int64) (cultures []*models.DeviceCultures, err error) {
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.speling_date,x.specimen,x.concentrate_noa,x.concentrate_nob,x.sampling_locationa,x.detection_unit,x.sampler,x.reporting_date,x.detection_result,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sampler").Scan(&cultures).Error
+	err = db.Group("x.id").Select("x.id,x.speling_date,x.specimen,x.concentrate_noa,x.concentrate_nob,x.sampling_locationa,x.detection_unit,x.sampler,x.reporting_date,x.detection_result,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sampler").Scan(&cultures).Error
 	return cultures, err
 }
 
@@ -459,7 +459,7 @@ func GetAllDialysate(orgId int64) (dialysate []*models.DeviceDialysates, err err
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
 
 	return dialysate, err
 }
@@ -471,7 +471,7 @@ func GetAllDeviceIon(orgId int64) (ions []*models.DeviceIons, err error) {
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.samplerc,x.detection_unit,x.concentrate_nof,x.concentrate_nog,x.date_reportc,x.actual_na,x.actual_pna,x.actual_k,x.actual_ca,x.actual_ci,x.actual_hco,x.actual_mg,x.actual_ph,x.remakes,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerc").Scan(&ions).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.samplerc,x.detection_unit,x.concentrate_nof,x.concentrate_nog,x.date_reportc,x.actual_na,x.actual_pna,x.actual_k,x.actual_ca,x.actual_ci,x.actual_hco,x.actual_mg,x.actual_ph,x.remakes,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerc").Scan(&ions).Error
 	return ions, err
 }
 
@@ -489,7 +489,7 @@ func GetSampler(id int64) (models.App_Role, error) {
 
 func UpdateCulture(id int64, orgid int64, culture *models.DeviceCulture) error {
 
-	err := writeUserDb.Model(&culture).Where("id= ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"speling_date": culture.SpelingDate, "specimen": culture.Specimen, "concentrate_noa": culture.ConcentrateNoa, "concentrate_nob": culture.ConcentrateNob, "sampling_locationa": culture.SamplingLocationa, "detection_unit": culture.DetectionUnit, "sampler": culture.Sampler, "reporting_date": culture.ReportingDate, "detection_result": culture.DetectionResult, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&culture).Where("id= ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"speling_date": culture.SpelingDate, "specimen": culture.Specimen, "concentrate_noa": culture.ConcentrateNoa, "concentrate_nob": culture.ConcentrateNob, "sampling_locationa": culture.SamplingLocationa, "detection_unit": culture.DetectionUnit, "sampler": culture.Sampler, "reporting_date": culture.ReportingDate, "detection_result": culture.DetectionResult, "sort": culture.Sort, "pass_examination": culture.PassExamination, "modifications": culture.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -518,7 +518,7 @@ func GetDialystate(id int64) (models.DeviceDialysate, error) {
 
 func Updatedialystate(id int64, orgid int64, dialysate *models.DeviceDialysate) error {
 
-	err := writeUserDb.Model(&dialysate).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": dialysate.SamplingDate, "specimenb": dialysate.Specimenb, "concentrate_noc": dialysate.ConcentrateNoc, "concentrateb_nod": dialysate.ConcentratebNod, "sampling_locationb": dialysate.SamplingLocationb, "detection_unit": dialysate.DetectionUnit, "samplerb": dialysate.Samplerb, "reporting_dateb": dialysate.ReportingDateb, "detection_resultb": dialysate.DetectionResultb, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&dialysate).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": dialysate.SamplingDate, "specimenb": dialysate.Specimenb, "concentrate_noc": dialysate.ConcentrateNoc, "concentrateb_nod": dialysate.ConcentratebNod, "sampling_locationb": dialysate.SamplingLocationb, "detection_unit": dialysate.DetectionUnit, "samplerb": dialysate.Samplerb, "reporting_dateb": dialysate.ReportingDateb, "detection_resultb": dialysate.DetectionResultb, "sort": dialysate.Sort, "pass_examination": dialysate.PassExamination, "modifications": dialysate.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -548,7 +548,7 @@ func GetIon(id int64) (models.DeviceIon, error) {
 
 func UpdateIon(id int64, orgid int64, ion *models.DeviceIon) error {
 
-	err := writeUserDb.Model(&ion).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": ion.SamplingDate, "samplerc": ion.Samplerc, "detection_unit": ion.DetectionUnit, "concentrate_nof": ion.ConcentrateNof, "concentrate_nog": ion.ConcentrateNog, "date_reportc": ion.DateReportc, "actual_na": ion.ActualNa, "actual_pna": ion.ActualPna, "actual_k": ion.ActualK, "actual_ca": ion.ActualCa, "actual_ci": ion.ActualCi, "actual_hco": ion.ActualCi, "actual_mg": ion.ActualMg, "actual_ph": ion.ActualPh, "remakes": ion.Remakes, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&ion).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": ion.SamplingDate, "samplerc": ion.Samplerc, "detection_unit": ion.DetectionUnit, "concentrate_nof": ion.ConcentrateNof, "concentrate_nog": ion.ConcentrateNog, "date_reportc": ion.DateReportc, "actual_na": ion.ActualNa, "actual_pna": ion.ActualPna, "actual_k": ion.ActualK, "actual_ca": ion.ActualCa, "actual_ci": ion.ActualCi, "actual_hco": ion.ActualCi, "actual_mg": ion.ActualMg, "actual_ph": ion.ActualPh, "remakes": ion.Remakes, "sort": ion.Sort, "pass_examination": ion.PassExamination, "modifications": ion.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -588,28 +588,6 @@ func GetCultureData(bedid int64, start int64, end int64, orgId int64) (cultures
 	return cultures, err
 }
 
-func GetDialysateData(bedid int64, start int64, end int64, orgId int64) (dialysate []*models.DeviceDialysates, err error) {
-	db := UserReadDB().Table("xt_device_dialysate as x").Where("x.status = 1")
-	table := UserReadDB().Table("sgj_user_admin_role as r")
-	fmt.Println("table", table)
-	if orgId > 0 {
-		db = db.Where("x.user_org_id = ?", orgId)
-	}
-	if bedid > 0 {
-		db = db.Where("x.bed_id = ?", bedid)
-	}
-	if start > 0 {
-		db = db.Where("x.sampling_date >= ?", start)
-	}
-	if end > 0 {
-		db = db.Where("x.sampling_date <= ?", end)
-	}
-
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
-
-	return dialysate, err
-}
-
 func GetDeviceIonData(bedid int64, start int64, end int64, orgId int64) (ions []*models.DeviceIons, err error) {
 	db := UserReadDB().Table("xt_device_ion as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
@@ -1236,3 +1214,330 @@ func DeleteEquit(id int64) (models.DeviceAddmacher, error) {
 	err := UserWriteDB().Model(&addmacher).Where("id=?", id).Updates(map[string]interface{}{"status": 0}).Error
 	return addmacher, err
 }
+
+func GetDeviceInfomation(orgid int64, scheduledate int64) (information []*models.DeviceInformation, err error) {
+
+	err = UserReadDB().Model(&information).Where("user_org_id = ? and date = ? and status =1", orgid, scheduledate).Find(&information).Error
+	return information, err
+}
+
+func CreateOxygenates(oxygenates *models.XtDeviceOxygenates) error {
+
+	err := UserWriteDB().Create(&oxygenates).Error
+	return err
+}
+
+func CreateHadWater(hadwater *models.XtDeviceHadwater) error {
+
+	err := UserWriteDB().Create(&hadwater).Error
+	return err
+}
+
+func CreateWater(water *models.XtDeviceWater) error {
+
+	err := UserWriteDB().Create(&water).Error
+	return err
+}
+
+func CreateDevicePh(ph *models.XtDevicePh) error {
+
+	err := UserWriteDB().Create(&ph).Error
+	return err
+}
+
+func GetAllDeviceOxygenates(orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_oxygenates as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetAllHadWater(orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_hadwater as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetDeviceWater(orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_water as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetDevicePH(orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_ph as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetDialysateData(bedid int64, start int64, end int64, orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_dialysate as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	if bedid > 0 {
+		db = db.Where("x.bed_id = ?", bedid)
+	}
+	if start > 0 {
+		db = db.Where("x.sampling_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("x.sampling_date <= ?", end)
+	}
+
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetOxygenates(bedid int64, start int64, end int64, orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_oxygenates as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	if bedid > 0 {
+		db = db.Where("x.bed_id = ?", bedid)
+	}
+	if start > 0 {
+		db = db.Where("x.sampling_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("x.sampling_date <= ?", end)
+	}
+
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetHardWater(bedid int64, start int64, end int64, orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_hadwater as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	if bedid > 0 {
+		db = db.Where("x.bed_id = ?", bedid)
+	}
+	if start > 0 {
+		db = db.Where("x.sampling_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("x.sampling_date <= ?", end)
+	}
+
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetWater(bedid int64, start int64, end int64, orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_water as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	if bedid > 0 {
+		db = db.Where("x.bed_id = ?", bedid)
+	}
+	if start > 0 {
+		db = db.Where("x.sampling_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("x.sampling_date <= ?", end)
+	}
+
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetDevicePh(bedid int64, start int64, end int64, orgId int64) (dialysate []*models.DeviceDialysates, err error) {
+	db := UserReadDB().Table("xt_device_ph as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	if orgId > 0 {
+		db = db.Where("x.user_org_id = ?", orgId)
+	}
+	if bedid > 0 {
+		db = db.Where("x.bed_id = ?", bedid)
+	}
+	if start > 0 {
+		db = db.Where("x.sampling_date >= ?", start)
+	}
+	if end > 0 {
+		db = db.Where("x.sampling_date <= ?", end)
+	}
+
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+
+	return dialysate, err
+}
+
+func GetOxygenatesById(id int64) (models.XtDeviceOxygenates, error) {
+	oxygenates := models.XtDeviceOxygenates{}
+	err := UserReadDB().Model(&oxygenates).Where("id = ? and status = 1", id).Find(&oxygenates).Error
+	return oxygenates, err
+}
+
+func UpdateOxygenates(id int64, orgid int64, dialysate *models.XtDeviceOxygenates) error {
+	err := writeUserDb.Model(&dialysate).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": dialysate.SamplingDate, "specimenb": dialysate.Specimenb, "concentrate_noc": dialysate.ConcentrateNoc, "concentrateb_nod": dialysate.ConcentratebNod, "sampling_locationb": dialysate.SamplingLocationb, "detection_unit": dialysate.DetectionUnit, "samplerb": dialysate.Samplerb, "reporting_dateb": dialysate.ReportingDateb, "detection_resultb": dialysate.DetectionResultb, "sort": dialysate.Sort, "pass_examination": dialysate.PassExamination, "modifications": dialysate.Modifications, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetHardWaterById(id int64) (models.XtDeviceHadwater, error) {
+	hadwater := models.XtDeviceHadwater{}
+	err := UserReadDB().Model(&hadwater).Where("id = ? and status = 1", id).Find(&hadwater).Error
+	return hadwater, err
+}
+
+func GetWaterById(id int64) (models.XtDeviceWater, error) {
+
+	water := models.XtDeviceWater{}
+	err := UserReadDB().Model(&water).Where("id=? and status =1", id).Find(&water).Error
+	return water, err
+}
+
+func GetDevicePhById(id int64) (models.XtDevicePh, error) {
+
+	devicePh := models.XtDevicePh{}
+	err := UserReadDB().Model(&devicePh).Where("id = ? and status =1", id).Find(&devicePh).Error
+	return devicePh, err
+}
+
+func CreateAerialDetection(detection *models.XtAerialDetection) error {
+
+	err := XTWriteDB().Create(&detection).Error
+	return err
+}
+
+func GetAirList(limit int64, page int64, orgid int64) (airlist []*models.XtAerialDetection, total int64, err error) {
+	offset := (page - 1) * limit
+	err = XTReadDB().Model(&airlist).Where("user_org_id = ? and status =1", orgid).Count(&total).Limit(limit).Offset(offset).Order("created_time desc").Find(&airlist).Error
+	return airlist, total, err
+}
+
+func GetAirDisinfectDetail(id int64) (models.XtAerialDetection, error) {
+
+	detection := models.XtAerialDetection{}
+	err := XTReadDB().Model(&detection).Where("id = ? and status = 1", id).Find(&detection).Error
+	return detection, err
+}
+
+func UpdateAeriaDetection(detection *models.XtAerialDetection, id int64) error {
+
+	err := XTWriteDB().Model(&detection).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"start_time": detection.StartTime, "created_time": detection.CreatedTime, "class": detection.Class, "disinfection_methods": detection.DisinfectionMethods, "disinfection_fluid": detection.DisinfectionFluid, "sort": detection.Sort, "creator": detection.Creator, "detection_time": detection.DetectionTime, "detection_result": detection.DetectionResult, "upload_time": detection.UploadTime, "check_out": detection.CheckOut, "modifications": detection.Modifications}).Error
+	return err
+}
+
+func DeleteAirDisinfect(id int64) error {
+	detection := models.XtAerialDetection{}
+	err := XTWriteDB().Model(&detection).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func SaveBodyDetection(detection *models.XtBodyDetection) error {
+
+	err := XTWriteDB().Create(&detection).Error
+	return err
+}
+
+func GetBodyList(limit int64, page int64, orgid int64) (body []*models.XtBodyDetection, total int64, err error) {
+
+	offset := (page - 1) * limit
+	err = XTReadDB().Model(&body).Where("user_org_id = ? and status =1", orgid).Count(&total).Limit(limit).Offset(offset).Order("created_time desc").Find(&body).Error
+	return body, total, err
+
+}
+
+func GetBodyDisinfectDetail(id int64) (models.XtBodyDetection, error) {
+
+	detection := models.XtBodyDetection{}
+	err := XTReadDB().Model(&detection).Where("id = ? and status = 1", id).Find(&detection).Error
+	return detection, err
+}
+
+func UpdateBodyDetection(detection *models.XtBodyDetection, id int64) error {
+
+	err := XTWriteDB().Model(&detection).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"start_time": detection.StartTime, "created_time": detection.CreatedTime, "class": detection.Class, "disinfection_methods": detection.DisinfectionMethods, "disinfection_fluid": detection.DisinfectionFluid, "sort": detection.Sort, "creator": detection.Creator, "detection_time": detection.DetectionTime, "detection_result": detection.DetectionResult, "upload_time": detection.UploadTime, "check_out": detection.CheckOut, "modifications": detection.Modifications}).Error
+	return err
+}
+
+func DeleteBodyDisInfect(id int64) error {
+
+	detection := models.XtBodyDetection{}
+	err := XTWriteDB().Model(&detection).Where("id = ?  and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateHadWater(id int64, orgid int64, hadwater *models.XtDeviceHadwater) error {
+
+	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "sort": hadwater.Sort, "pass_examination": hadwater.PassExamination, "modifications": hadwater.Modifications, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func UpdateDeviceWater(id int64, orgid int64, hadwater *models.XtDeviceWater) error {
+
+	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "sort": hadwater.Sort, "pass_examination": hadwater.PassExamination, "modifications": hadwater.Modifications, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func UpdateDivicePh(id int64, orgid int64, hadwater *models.XtDevicePh) error {
+	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "sort": hadwater.Sort, "pass_examination": hadwater.PassExamination, "modifications": hadwater.Modifications, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteOxygenates(id int64) error {
+	oxygenates := models.XtDeviceOxygenates{}
+	err := writeUserDb.Model(&oxygenates).Where("id = ? ", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func DeleteHadWater(id int64) error {
+	hadwater := models.XtDeviceHadwater{}
+	err := writeUserDb.Model(&hadwater).Where("id =?", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func DeleteWater(id int64) error {
+
+	water := models.XtDeviceWater{}
+	err := writeUserDb.Model(&water).Where("id = ? ", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func DeleteDevicePh(id int64) error {
+
+	ph := models.XtDevicePh{}
+	err := writeUserDb.Model(&ph).Where("id = ? ", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -794,9 +794,6 @@ func (MDoctorAdviceVM) TableName() string {
 func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
-	fmt.Println("advicetype", adviceType)
-	fmt.Println("patientType", patientType)
-	fmt.Println("adminUserId", adminUserId)
 	adviceCondition := []interface{}{}
 	if adviceType == 0 {
 		if patientType == 0 {
@@ -944,7 +941,7 @@ func MobileCreateDialysisOrder(orgID int64, patientID int64, order *models.Dialy
 	}
 
 	// 接诊评估
-	if err := tx.Model(&models.ReceiveTreatmentAsses{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1", orgID, patientID, order.DialysisDate).Updates(map[string]interface{}{"record_id": order.ID, "updated_time": now.Unix()}).Error; err != nil {
+	if err := tx.Model(&models.ReceiveTreatmentAsses{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1", orgID, patientID, order.DialysisDate).Updates(map[string]interface{}{"record_id": order.ID, "update_time": now.Unix()}).Error; err != nil {
 		tx.Rollback()
 		return err
 	}
@@ -1203,6 +1200,19 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 	return &record, nil
 }
 
+func MobileGetDialysisPrescribeByModeIdOne(orgID int64, patientID int64, recordDate int64) (*models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func MobileGetLastDialysisPrescribe(orgID int64, patientID int64) (*models.DialysisPrescription, error) {
 	var record models.DialysisPrescription
 	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 ", patientID, orgID).Last(&record).Error
@@ -1779,3 +1789,152 @@ func GetHisDoctorAdviceCount(startime int64, endtime int64, deliveway string, or
 	err = db.Select("x.advice_name,x.advice_desc,x.delivery_way,count(x.id) as total").Group("x.advice_name,x.advice_desc").Scan(&advice).Error
 	return advice, err
 }
+
+func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64) ([]*MScheduleDoctorAdviceVM, error) {
+	var vms []*MScheduleDoctorAdviceVM
+	adviceWhere := ""
+	adviceCondition := []interface{}{}
+	if adviceType == 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	} else if adviceType == 1 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		}
+
+	} else if adviceType == 3 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) > 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) <= 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	}
+
+	db := readDb.Table("xt_schedule")
+	if scheduleType > 0 {
+		db = db.Where("schedule_type = ?", scheduleType)
+	}
+	if partitonType > 0 {
+		db = db.Where("partition_id = ?", partitonType)
+	}
+	db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+		}).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
+		Preload("DoctorAdvices", adviceCondition...).
+		Where("status = 1 AND user_org_id = ?", orgID)
+	if scheduleDate != 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+
+	err := db.Find(&vms).Error
+	return vms, err
+}
+
+func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64) ([]*HisMScheduleDoctorAdviceVM, error) {
+
+	var vms []*HisMScheduleDoctorAdviceVM
+	if len(deliverWay) > 0 {
+		db := readDb.Table("xt_schedule")
+		if scheduleType > 0 {
+			db = db.Where("schedule_type = ?", scheduleType)
+		}
+		if partitionType > 0 {
+			db = db.Where("partition_id = ?", partitionType)
+		}
+		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	} else {
+		db := readDb.Table("xt_schedule")
+		if scheduleType > 0 {
+			db = db.Where("schedule_type = ?", scheduleType)
+		}
+		if partitionType > 0 {
+			db = db.Where("partition_id = ?", partitionType)
+		}
+		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	}
+
+	return vms, err
+}

service/patient_service.go

@@ -956,7 +956,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 		db = db.Where("do.dialysis_date<=?", end)
 	}
 	if mode_id > 0 {
-		db = db.Joins("JOIN xt_dialysis_prescription as dp ON dp.record_id=do.id")
+		db = db.Joins("JOIN xt_dialysis_prescription as dp ON dp.patient_id=do.patient_id and dp.user_org_id = do.user_org_id and dp.record_date = do.dialysis_date")
 		db = db.Where("dp.mode_id=?", mode_id)
 	}
 
@@ -1476,7 +1476,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation}).Error
 	return err
 }
 

service/patientmanage_service.go

@@ -527,7 +527,7 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 		db = db.Where("x.start_time<=?", end)
 	}
 	//offset := (page - 1) * limit
-	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
+	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang,s.dialysis_dialyszers,s.dialysis_irrigation, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
 	fmt.Print("err", err)
 	return
 
@@ -562,7 +562,7 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 		db = db.Where("x.start_time<=?", end)
 	}
 	offset := (page - 1) * limit
-	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Scan(&doctoradvice).Error
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name,s.dialyzer_perfusion_apparatus,s.anticoagulant,s.anticoagulant_shouji,s.anticoagulant_weichi,s.anticoagulant_zongliang,s.dialysis_dialyszers,s.dialysis_irrigation, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Joins("left join xt_dialysis_prescription as s on s.patient_id = x.patient_id and s.record_date = x.advice_date and s.user_org_id = ?", orgID).Scan(&doctoradvice).Error
 	fmt.Print("错误是什么", err)
 	return
 }
@@ -654,7 +654,7 @@ func GetlongDialysisrecord(patientid int64, startime int64, endtime int64, limit
 	}
 	offset := (page - 1) * limit
 	err = db.Count(&total).Order("x.created_time desc").Offset(offset).Limit(limit).Group("x.id").
-		Select("x.id,x.name,x.sub_name,x.user_org_id,x.patient_id,x.parent_id,x.type,x.period,x.times,x.anticoagulant,x.anticoagulant_shouji,x.anticoagulant_weichi,x.anticoagulant_zongliang,x.anticoagulant_gaimingcheng,x.anticoagulant_gaijiliang,x.mode_name,x.mode_id,x.dialysis_duration,x.replacement_way,x.hemodialysis_machine,x.blood_filter,x.perfusion_apparatus,x.blood_flow_volume,x.dewater,x.displace_liqui,x.glucose,x.dry_weight,x.dialysate_flow,x.kalium,x.sodium,x.calcium,x.bicarbonate,x.doctor,x.first_dialysis,x.remark,x.initiate_mode,x.affirm_state,x.use_state,x.status,x.registrars_id,x.created_time,x.updated_time,x.solution_type,x.dialysate_temperature,x.conductivity,x.dialysis_duration_hour,x.dialysis_duration_minute,x.target_ultrafiltration,x.dialysate_formulation,x.dialyzer,x.replacement_total,x.dialyzer_perfusion_apparatus,x.body_fluid,x.special_medicine,x.special_medicine_other,x.displace_liqui_part,x.displace_liqui_value,x.blood_access,x.ultrafiltration,x.body_fluid_other,x.target_ktv").Find(&prescription).Error
+		Select("x.id,x.name,x.sub_name,x.user_org_id,x.patient_id,x.parent_id,x.type,x.period,x.times,x.anticoagulant,x.anticoagulant_shouji,x.anticoagulant_weichi,x.anticoagulant_zongliang,x.anticoagulant_gaimingcheng,x.anticoagulant_gaijiliang,x.mode_name,x.mode_id,x.dialysis_duration,x.replacement_way,x.hemodialysis_machine,x.blood_filter,x.perfusion_apparatus,x.blood_flow_volume,x.dewater,x.displace_liqui,x.glucose,x.dry_weight,x.dialysate_flow,x.kalium,x.sodium,x.calcium,x.bicarbonate,x.doctor,x.first_dialysis,x.remark,x.initiate_mode,x.affirm_state,x.use_state,x.status,x.registrars_id,x.created_time,x.updated_time,x.solution_type,x.dialysate_temperature,x.conductivity,x.dialysis_duration_hour,x.dialysis_duration_minute,x.target_ultrafiltration,x.dialysate_formulation,x.dialyzer,x.replacement_total,x.dialyzer_perfusion_apparatus,x.body_fluid,x.special_medicine,x.special_medicine_other,x.displace_liqui_part,x.displace_liqui_value,x.blood_access,x.ultrafiltration,x.body_fluid_other,x.target_ktv,x.dialysis_dialyszers,x.dialysis_irrigation").Find(&prescription).Error
 
 	return
 }
@@ -1475,15 +1475,115 @@ func GetDialysAfterRecord(patientid int64, startime int64, endtime int64, orgid
 	return dislysis, err
 }
 
+func GetDialysisDateByDate(starTime int64, patientId int64, orgId int64) (*models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err := XTReadDB().Model(&access).Where("start_time = ? and patient_id = ? and user_org_id = ? and status = 1", starTime, patientId, orgId).Find(&access).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &access, nil
+}
+
+func GetDialysisDateByDateOne(starTime int64, patientId int64, orgId int64, id int64) (*models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err := XTReadDB().Model(&access).Where("start_time = ? and patient_id = ? and user_org_id = ? and status = 1 and id <> ?", starTime, patientId, orgId, id).Find(&access).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &access, nil
+}
+
 func SaveVascularAccess(access *models.XtPatientVascularAccess) error {
 
 	err := XTWriteDB().Create(&access).Error
 	return err
 }
 
-func GetAllVacualAccessList(orgid int64, limit int64, page int64) (vascular []*models.XtPatientVascularAccess, total int64, err error) {
+func GetAllVacualAccessList(orgid int64, limit int64, page int64, patientId int64) (vascular []*models.XtPatientVascularAccess, total int64, err error) {
 
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&vascular).Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Find(&vascular).Error
+	err = XTReadDB().Model(&vascular).Where("user_org_id = ? and status = 1 and patient_id = ?", orgid, patientId).Count(&total).Offset(offset).Limit(limit).Order("start_time desc").Find(&vascular).Error
 	return vascular, total, err
 }
+
+func GetVasularAccessByDetail(id int64) (models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err := XTReadDB().Where("id = ? and status =1", id).Find(&access).Error
+	return access, err
+}
+
+func UpdateVascularAccess(access *models.XtPatientVascularAccess, id int64) error {
+
+	err := XTWriteDB().Model(&access).Where("id= ?", id).Updates(map[string]interface{}{"access_project": access.AccessProject, "blood_access_part_id": access.BloodAccessPartId, "inflow_pass": access.InflowPass, "start_time": access.StartTime, "first_start_time": access.FirstStartTime, "blood_access_part_opera_id": access.BloodAccessPartOperaId, "stop_reason": access.StopReason, "remark": access.Remark, "user_status": access.UserStatus, "modify": access.Modify, "stop_time": access.StopTime, "other_vascular": access.OtherVascular, "ci_type": access.CiType, "blood_cultupe": access.BloodCultupe, "sequelae_type": access.SequelaeType}).Error
+	return err
+}
+
+func DeleteVasularAccess(id int64) error {
+	access := models.XtPatientVascularAccess{}
+	err := XTWriteDB().Model(&access).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func CreatePatientWayAssessment(assessment *models.XtPatientPasswayAssessment) error {
+
+	err := XTWriteDB().Create(&assessment).Error
+	return err
+}
+
+func GetAllPassWayAssessment(parent_id int64, patient_id int64, page int64, limit int64, orgid int64) (assessment []*models.XtPatientPasswayAssessment, total int64, err error) {
+	offset := (page - 1) * limit
+	err = XTReadDB().Model(&assessment).Where("parent_id = ? and patient_id = ? and user_org_id = ? and status =1", parent_id, patient_id, orgid).Count(&total).Offset(offset).Limit(limit).Order("start_time desc").Find(&assessment).Error
+	return assessment, total, err
+}
+
+func GetPasswayAssesmentById(id int64) (models.XtPatientPasswayAssessment, error) {
+
+	assessment := models.XtPatientPasswayAssessment{}
+	err := XTReadDB().Model(&assessment).Where("id=? and status =1", id).Find(&assessment).Error
+	return assessment, err
+}
+
+func UpdatePassWayAssesment(assessment *models.XtPatientPasswayAssessment, id int64) error {
+
+	err := XTWriteDB().Model(&assessment).Where("id = ?", id).Updates(map[string]interface{}{"start_time": assessment.StartTime, "creator": assessment.Creator, "blood_project": assessment.BloodProject, "blood_result": assessment.BloodResult, "blood_dealwith": assessment.BloodDealwith, "modify": assessment.Modify, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteWayAssessment(id int64) error {
+	assessment := models.XtPatientPasswayAssessment{}
+	err := XTWriteDB().Model(&assessment).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetLastPassWayAssessment(orgid int64, patientId int64) (models.XtPatientVascularAccess, error) {
+
+	assessment := models.XtPatientVascularAccess{}
+	err := XTReadDB().Model(&assessment).Where("user_org_id = ? and patient_id = ? and status =1 and user_status = 1", orgid, patientId).Order("start_time desc").Last(&assessment).Error
+	return assessment, err
+}
+
+func GetAccessList(orgid int64) (*models.Dataconfig, error) {
+
+	dataconfig := models.Dataconfig{}
+	err := XTReadDB().Model(&dataconfig).Where("org_id = 0 and name = '血管通路' and status = ?", 1).Find(&dataconfig).Error
+	return &dataconfig, err
+}
+
+func GetParentAccessList(orgid int64, parentid int64) (dataconfig []*models.Dataconfig, err error) {
+
+	err = XTReadDB().Model(&dataconfig).Where("org_id in(0,?) and parent_id = ? and status =1", orgid, parentid).Find(&dataconfig).Error
+	return dataconfig, err
+
+}
+
+func GetBloodAccess(orgid int64) (*models.Dataconfig, error) {
+	dataconfig := models.Dataconfig{}
+	err := XTReadDB().Model(&dataconfig).Where("org_id = 0 and name = '血管通路部位' and status = 1 ").Find(&dataconfig).Error
+	return &dataconfig, err
+}

service/schedule_service.go

@@ -719,3 +719,33 @@ func UpdatedDialysisPrescription(prescription *models.DialysisPrescription, reco
 	err := XTWriteDB().Model(&prescription).Where("record_date = ? and patient_id = ? and user_org_id = ?", recordDate, patientid, orgid).Update(map[string]interface{}{"mode_id": prescription.ModeId, "updated_time": time.Now().Unix()}).Error
 	return err
 }
+
+func GetWeekSchedules(orgid int64, startime int64, endtime int64) (scheudle []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Model(&scheudle).Where("user_org_id = ? and status = 1 and schedule_date>=? and schedule_date<=?", orgid, startime, endtime).Find(&scheudle).Error
+	return scheudle, err
+}
+
+func GetLastWeekSchedule(orgid int64, startime int64, endtime int64) (*models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTReadDB().Where("user_org_id = ? and status =1 and schedule_date>=? and schedule_date<=?", orgid, startime, endtime).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+func AddPatientSchedule(schedule *models.XtSchedule) error {
+
+	err := XTWriteDB().Create(&schedule).Error
+	return err
+}
+
+func UpdatePatientSchedule(orgid int64, startime int64, endtime int64) error {
+
+	schedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&schedule).Where("user_org_id = ? and schedule_date>=? and schedule_date<=? and status =1", orgid, startime, endtime).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/self_drug_service.go

@@ -793,6 +793,6 @@ func GetSelfOutStockQuery(startTime int64, endTime int64, orgid int64) (selfouts
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.drug_name_id,Sum(x.outstore_number) as count").Group("x.drug_name_id").Scan(&selfoutstock).Error
+	err = db.Select("x.drug_name_id,Sum(x.outstore_number) as count").Group("x.drug_name").Scan(&selfoutstock).Error
 	return selfoutstock, err
 }

service/stock_service.go

@@ -121,6 +121,30 @@ func FindAllGoodTypeTotal(orgId int64) (total int64) {
 	return
 }
 
+func GetGoodsTypeIsExist(orgid int64) (*models.GoodsType, error) {
+	goodsType := models.GoodsType{}
+	err := XTReadDB().Where("org_id = ? and stock_attribute = 2 and status =1", orgid).Find(&goodsType).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &goodsType, nil
+}
+
+func GetGoodsTypeIsExistOne(orgid int64) (*models.GoodsType, error) {
+	goodsType := models.GoodsType{}
+	err := XTReadDB().Where("org_id = ? and stock_attribute = 3 and status = 1", orgid).Find(&goodsType).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &goodsType, nil
+}
+
 func AddSigleGoodType(goodType *models.GoodsType) (error, *models.GoodsType) {
 	err := writeDb.Create(&goodType).Error
 	return err, goodType
@@ -233,7 +257,7 @@ func FindGoodInfoList(orgId int64, page int64, limit int64, keyword string, is_u
 	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Where("good_code LIKE ? OR specification_name LIKE ?", likeKey, likeKey)
+		db = db.Where("good_code LIKE ? OR good_name LIKE ?", likeKey, likeKey)
 	} else {
 		if is_use > 0 {
 			if is_use == 1 {
@@ -1940,6 +1964,11 @@ func FindGoodInfoByName(name string, org_id int64, good_type_id int64) (total in
 	return
 }
 
+func FindGoodInfoByNameOne(name string, org_id int64, good_type_id int64, id int64) (total int64) {
+	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? and id <> ? ", org_id, name, good_type_id, id).Count(&total)
+	return
+}
+
 func FindAllGoodTypeByType(types int64) (goodType []*models.GoodsType, err error) {
 	err = readDb.Model(&models.GoodsType{}).Where("type = ? AND status = 1", types).Find(&goodType).Error
 	return goodType, err
@@ -2067,7 +2096,7 @@ func UpdateDrugStockOutInfoCount2(org_id int64, id int64, count int64) {
 
 func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id int64, good_type_id int64, patient_id int64) (count int64, err error) {
 
-	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ?", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
+	err = readDb.Model(&models.AutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND good_id = ? AND good_type_id = ? AND patient_id = ? AND record_time = ? AND count <> 0", org_id, good_id, good_type_id, patient_id, record_time).Count(&count).Error
 	return
 
 }
@@ -2110,7 +2139,7 @@ func GetStockInGoodInfo(orgId int64) (stockIn []*VMWarehousingInfo, err error) {
 }
 
 func GetAllStockOutUserDetail(patient_id int64, orgId int64, record_time int64) (goodUser []*models.DialysisBeforePrepare, err error) {
-	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND record_date = ? AND status = 1", patient_id, orgId, record_time).Find(&goodUser).Error
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND record_date = ? AND status = 1 AND count <> 0 ", patient_id, orgId, record_time).Find(&goodUser).Error
 	return
 }