历史排班

controllers/his_api_controller.go

@@ -8420,7 +8420,7 @@ func (c *HisApiController) GetCompareData() {
 func (c *HisApiController) GetFaPiaoData() {
 	order_id, _ := c.GetInt64("order_id")
 	patient_id, _ := c.GetInt64("patient_id")
-	number := c.GetString("number")
+	//number := c.GetString("number")
 
 	adminUser := c.GetAdminUserInfo()
 	order, _ := service.GetHisOrderByID(order_id)
@@ -8430,7 +8430,7 @@ func (c *HisApiController) GetFaPiaoData() {
 
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
-	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, number)
+	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, order.MdtrtId)
 
 	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -9372,3 +9372,294 @@ func (this *DialysisAPIController) CheckMobileInformation() {
 	}
 
 }
+
+func (c *DialysisAPIController) GetControlMonitorList() {
+
+	partition, _ := c.GetInt64("partition")
+	monitorDate := c.GetString("date")
+	patient_id, _ := c.GetInt64("patient_id")
+	pat_type, _ := c.GetInt64("pat_type")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTime int64
+	if len(monitorDate) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", monitorDate+" 00:00:00", loc)
+		if err != nil {
+			theStartTime = 0
+		}
+		theStartTime = theTime.Unix()
+	}
+	adminInfo := c.GetMobileAdminUserInfo()
+	orgID := adminInfo.Org.Id
+	monitor, err := service.GetNewMonitorRecord(orgID, theStartTime, partition, patient_id)
+
+	if err != nil {
+		c.ErrorLog("获取排班信息失败:%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		if len(monitor) > 0 {
+			//获取所有床位
+			numberList, _ := service.GetAllDeviceNumberByList(orgID)
+			//获取所有分区
+			zoneList, _ := service.GetAllZoneByList(orgID)
+			//获取透析处方
+			prescriptions, _ := service.GetAllPrescriptionByListSix(orgID, theStartTime)
+			//获取透前评估
+			assessmentBefores, _ := service.GetAllAssessmentBeforesByListOne(orgID, theStartTime)
+			//获取上机
+			dialysisOrders, _ := service.GetAllDialysisOrdersByListNight(orgID, theStartTime, pat_type)
+			//获取透后
+			AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListSix(orgID, theStartTime)
+
+			//获取透后监测
+			monitorlist, _ := service.GetNewAllMonitorList(orgID, theStartTime, pat_type)
+
+			//获取所有的患者
+			patients, _ := service.GetAllPatientListByListOne(orgID)
+
+			//获取所有透析模式
+			treatments, _ := service.GetAllTreatModeByList(orgID)
+
+			//获取所有医嘱
+			adviceList, _ := service.GetAdviceList(orgID, theStartTime, pat_type)
+
+			//获取双人核对
+			checkList, _ := service.GetDobuleCheck(orgID, theStartTime)
+
+			//治疗小结
+			summaryList, _ := service.GetTreatmentSummaryForList(orgID, theStartTime)
+
+			//待消毒
+			informationList, _ := service.GetDialysisInformationList(orgID, theStartTime)
+
+			for key, item := range monitor {
+				// 获取床位信息
+				for _, it := range numberList {
+					if item.BedId == it.ID {
+						monitor[key].DeviceNumber = it
+						break
+					}
+				}
+
+				//获取分区信息
+				for _, it := range zoneList {
+					if item.PartitionId == it.ID {
+						monitor[key].DeviceZone = it
+					}
+				}
+
+				for _, prescription := range prescriptions {
+					if item.PatientId == prescription.PatientId {
+						monitor[key].Prescription = prescription
+						break
+					}
+				}
+
+				for _, it := range checkList {
+					if item.PatientId == it.PatientId {
+						monitor[key].DoubleCheck = it
+						break
+					}
+				}
+
+				for _, it := range summaryList {
+					if item.PatientId == it.PatientId {
+						monitor[key].TreatmentSummaryForList = it
+						break
+					}
+				}
+
+				// 透前评估
+				for _, assessmentBefore := range assessmentBefores {
+					if item.PatientId == assessmentBefore.PatientId {
+						monitor[key].AssessmentBeforeDislysis = assessmentBefore
+						break
+					}
+				}
+
+				// 透析上下机
+				for _, dialysisOrder := range dialysisOrders {
+					if item.PatientId == dialysisOrder.PatientId {
+						monitor[key].DialysisOrder = dialysisOrder
+						break
+					}
+				}
+
+				// 治疗小节
+				for _, afterDislysis := range AssessmentAfterDislysis {
+					if item.PatientId == afterDislysis.PatientId {
+						monitor[key].AssessmentAfterDislysis = afterDislysis
+						break
+					}
+				}
+
+				for _, it := range monitorlist {
+					if item.PatientId == it.PatientId {
+						monitor[key].MonitoringRecord = append(monitor[key].MonitoringRecord, it)
+					}
+				}
+
+				for _, it := range adviceList {
+					if item.PatientId == it.PatientId {
+						monitor[key].AdviceList = append(monitor[key].AdviceList, it)
+					}
+				}
+
+				for _, patient := range patients {
+					if item.PatientId == patient.ID {
+						monitor[key].MonitorPatients = patient
+						break
+					}
+				}
+
+				for _, treatment := range treatments {
+					if item.ModeId == treatment.ID {
+						monitor[key].TreatmentMode = treatment
+						break
+					}
+				}
+
+				for _, infor := range informationList {
+					if item.PatientId == infor.PatientId {
+						monitor[key].NewDeviceInformation = infor
+						break
+					}
+				}
+			}
+		}
+
+	}
+
+	patients, err := service.GetAllpatientFourty(orgID)
+
+	var mds []*models.NewMonitorDialysisScheduleList
+
+	if pat_type == 0 {
+		for _, item := range monitor {
+			mds = append(mds, item)
+		}
+	}
+
+	//待医嘱核对
+	if pat_type == 1 {
+		for _, item := range monitor {
+			if len(item.AdviceList) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	//待开小结
+	if pat_type == 2 {
+		for _, item := range monitor {
+			if item.TreatmentSummaryForList == nil {
+
+				mds = append(mds, item)
+
+			}
+
+		}
+	}
+	//待下机
+	if pat_type == 3 {
+		for _, item := range monitor {
+			if item.DialysisOrder != nil {
+				if item.DialysisOrder.ID > 0 {
+					mds = append(mds, item)
+				}
+			}
+
+		}
+	}
+
+	//待消毒
+	if pat_type == 4 {
+		for _, item := range monitor {
+			if item.NewDeviceInformation == nil {
+				mds = append(mds, item)
+			}
+
+		}
+	}
+	//待双人核对
+	if pat_type == 5 {
+		for _, item := range monitor {
+			if item.DoubleCheck == nil {
+
+				mds = append(mds, item)
+
+			}
+
+		}
+	}
+
+	//医嘱未执行
+	if pat_type == 6 {
+		for _, item := range monitor {
+			if len(item.AdviceList) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	//患者未签名
+	if pat_type == 7 {
+		for _, item := range monitor {
+			if item.DialysisOrder != nil {
+				if item.DialysisOrder.ID > 0 {
+					mds = append(mds, item)
+				}
+			}
+
+		}
+	}
+	//目标超滤于实际超滤不同
+	if pat_type == 8 {
+		for _, item := range monitor {
+			if item.Prescription != nil && item.AssessmentAfterDislysis != nil {
+				if item.Prescription.TargetUltrafiltration != item.AssessmentAfterDislysis.ActualUltrafiltration {
+					mds = append(mds, item)
+				}
+			}
+
+		}
+	}
+	//血压少于5次
+	if pat_type == 9 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) < 5 {
+				mds = append(mds, item)
+			}
+		}
+	}
+
+	if pat_type == 10 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) == 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+
+	if pat_type == 11 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	if pat_type == 12 {
+		for _, item := range monitor {
+			if len(item.MonitoringRecord) > 0 {
+				mds = append(mds, item)
+			}
+		}
+	}
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"monitor":  mds,
+			"patients": patients,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -199,4 +199,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/checkmobileinformation", &DialysisAPIController{}, "Get:CheckMobileInformation")
 
+	beego.Router("/m/api/getcontrolmonitorlist", &DialysisAPIController{}, "Get:GetControlMonitorList")
+
 }

controllers/patient_dataconfig_api_controller.go

@@ -775,15 +775,15 @@ func (this *PatientDataConfigAPIController) CreateCourse() {
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, _ := service.GetPatientByIDOne(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 	record := models.PatientDiseaseCourse{

controllers/self_drug_api_congtroller.go

@@ -3499,15 +3499,21 @@ func (this *SelfDrugApiController) GetSendGoodInformation() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	fmt.Println("orgid", orgId)
-	//获取入库数据
-	list, _ := service.GetSendGoodInformation(10265)
-
-	//project, _ := service.GetHisPrescriptionList(10265)
+	list, _ := service.GetWarehouseOutInfo(10489)
 
 	for _, it := range list {
-		service.UpdateGoodFlow(it.ID, it.PackingPrice)
+		service.UpdateWarehosueOutInfo(it.ID, it.WarehouseOutTime)
 	}
 
+	//获取入库数据
+	//list, _ := service.GetSendGoodInformation(10265)
+	//
+	////project, _ := service.GetHisPrescriptionList(10265)
+	//
+	//for _, it := range list {
+	//	service.UpdateGoodFlow(it.ID, it.PackingPrice)
+	//}
+
 	//for _, it := range list {
 	//	//查询是否有数据
 	//	_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)

models/device_models.go

@@ -1488,3 +1488,17 @@ func (XtDialysisRegistration) TableName() string {
 
 	return "xt_dialysis_registration"
 }
+
+type NewDeviceInformation struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	Date      int64 `gorm:"column:date" json:"date" form:"date"`
+	Class     int64 `gorm:"column:class" json:"class" form:"class"`
+	Zone      int64 `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber int64 `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+}
+
+func (NewDeviceInformation) TableName() string {
+
+	return "xt_device_information"
+}

models/new_monitor.go

@@ -50,6 +50,7 @@ type VMMonitorDialysisOrder struct {
 	DeviceNumber  DeviceNumber `gorm:"ForeignKey:BedId" json:"device_number"`
 	StartTime     int64        `gorm:"column:start_time" json:"start_time"`
 	DialysisTotal int64        `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
+	Url           string       `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (VMMonitorDialysisOrder) TableName() string {
@@ -120,6 +121,7 @@ type VMMonitoringRecord struct {
 	VenousPressure         float64 `gorm:"column:venous_pressure" json:"venous_pressure" form:"venous_pressure"`
 	ArterialPressure       float64 `gorm:"column:arterial_pressure" json:"arterial_pressure" form:"arterial_pressure"`
 	BloodOxygenSaturation  string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Symptom                string  `gorm:"column:symptom" json:"symptom" form:"symptom"`
 	Dispose                string  `gorm:"column:dispose" json:"dispose" form:"dispose"`
 	Result                 string  `gorm:"column:result" json:"result" form:"result"`
 }
@@ -127,3 +129,34 @@ type VMMonitoringRecord struct {
 func (VMMonitoringRecord) TableName() string {
 	return "xt_monitoring_record"
 }
+
+type NewMonitorDialysisScheduleList struct {
+	ID           int64 `gorm:"column:id" json:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status"`
+
+	MonitorPatients *VMMonitorPatients `gorm:"ForeignKey:PatientId" json:"patient"`
+	DeviceNumber    *DeviceNumber      `gorm:"ForeignKey:BedId" json:"device_number"`
+	DeviceZone      *DeviceZone        `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	TreatmentMode   *TreatmentMode     `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
+
+	DialysisOrder            *VMMonitorDialysisOrder    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	Prescription             *VMDialysisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	AssessmentBeforeDislysis *VMPredialysisEvaluation   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  *VMAssessmentAfterDislysis `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assessment_after_dislysis"`
+	MonitoringRecord         []*VMMonitoringRecord      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	AdviceList               []*VMDoctorAdviceForList   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"advice"`
+	DoubleCheck              *VmDoubleCheck             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dobuleCheck"`
+	TreatmentSummaryForList  *VMTreatmentSummaryForList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatmentSummary"`
+	NewDeviceInformation     *NewDeviceInformation      `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatmentSummary"`
+}
+
+func (NewMonitorDialysisScheduleList) TableName() string {
+	return "xt_schedule"
+}

models/patient_models.go

@@ -2004,3 +2004,19 @@ type XtPatientAllergic struct {
 func (XtPatientAllergic) TableName() string {
 	return "xt_patient_allergic"
 }
+
+type VmDoubleCheck struct {
+	ID             int64 `gorm:"column:id" json:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id"`
+	CheckDate      int64 `gorm:"column:check_date" json:"check_date"`
+	Status         int64 `gorm:"column:status" json:"status"`
+	Creater        int64 `gorm:"column:creater" json:"creater"`
+	Modifier       int64 `gorm:"column:modifier" json:"modifier"`
+	CheckTime      int64 `gorm:"column:check_time" json:"check_time"`
+	FirstCheckTime int64 `gorm:"column:first_check_time" json:"first_check_time"`
+}
+
+func (VmDoubleCheck) TableName() string {
+	return "xt_double_check"
+}

service/manage_service.go

@@ -1809,7 +1809,7 @@ func GetRegistGoodInforList(user_org_id int64) (good []*models.GoodInformationFo
 
 func GetRegistNumber(sys_record_time int64, good_id int64, user_org_id int64) (infor []*models.WarehouseOutInfoNight, err error) {
 
-	err = XTReadDB().Where("sys_record_time = ? and good_id = ? and org_id = ? and status =1", sys_record_time, good_id, user_org_id).Find(&infor).Error
+	err = XTReadDB().Where("sys_record_time = ? and good_id = ? and org_id = ? and status =1 and is_sys=1", sys_record_time, good_id, user_org_id).Find(&infor).Error
 
 	return infor, err
 }

service/mobile_dialysis_service.go

@@ -276,13 +276,11 @@ func (MSchedualPatientVM) TableName() string {
 }
 
 type MDialysisOrderVM struct {
-	ID           int64 `gorm:"column:id" json:"id"`
-	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
-	// PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
-	Stage int64 `gorm:"column:stage" json:"stage"`
-	// Remark         string `gorm:"column:remark" json:"remark"`
+	ID                 int64                      `gorm:"column:id" json:"id"`
+	DialysisDate       int64                      `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId          int64                      `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId          int64                      `gorm:"column:patient_id" json:"patient_id"`
+	Stage              int64                      `gorm:"column:stage" json:"stage"`
 	BedID              int64                      `gorm:"column:bed_id" json:"bed_id"`
 	StartNurse         int64                      `gorm:"column:start_nurse" json:"start_nurse"`
 	FinishNurse        int64                      `gorm:"column:finish_nurse" json:"finish_nurse"`

service/new_stock_service.go

@@ -571,3 +571,19 @@ func AddCountFlowOne(warehouse_info_id int64, good_id int64, user_org_id int64,
 	err = XTWriteDB().Model(&stockFlow).Where("warehousing_detail_id = ? and good_id = ? and user_org_id = ? and patient_id = ? AND consumable_type = 7 and system_time = ?").Update(map[string]interface{}{"over_count": over_count}).Error
 	return err
 }
+
+func GetWarehouseOutInfo(user_org_id int64) (info []*models.WarehouseOut, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status =1", 10489).Find(&info).Error
+
+	return info, err
+}
+
+func UpdateWarehosueOutInfo(id int64, sys_record_time int64) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+
+	err := XTWriteDB().Model(&info).Where("warehouse_out_id = ? and org_id = ? ", id, 10489).Updates(map[string]interface{}{"sys_record_time": sys_record_time, "ctime": sys_record_time}).Error
+
+	return info, err
+}

service/patient_service.go

@@ -2442,9 +2442,21 @@ func GetAllZoneByList(orgID int64) (zone []*models.DeviceZone, err error) {
 	}
 }
 
-func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
+func GetAllDialysisOrdersByListNight(orgID int64, scheduleDate int64, pay_tyep int64) (dialysisOrders []*models.VMMonitorDialysisOrder, err error) {
+
+	if pay_tyep == 0 {
+		err = readDb.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+	}
+	//待下机
+	if pay_tyep == 3 {
+		err = readDb.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ? and end_time = 0", orgID, scheduleDate).Find(&dialysisOrders).Error
+	}
+
+	fmt.Println("pay_typeowowowoowwo", pay_tyep)
+	if pay_tyep == 7 {
+		err = readDb.Preload("DeviceNumber", "status = 1 AND org_id = ?'", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?  and url = ''", orgID, scheduleDate).Find(&dialysisOrders).Error
+	}
 
-	err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
 	return dialysisOrders, err
 }
 
@@ -2551,6 +2563,13 @@ func GetAllDialysisOrdersByListSix(orgID int64, scheduleDate int64) (dialysisOrd
 	return dialysisOrders, err
 }
 
+func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
+
+	err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+
+	return dialysisOrders, err
+}
+
 func GetAllDialysisOrdersByListOne(orgID int64, scheduleDate int64) (dialysisOrders []*models.VMMonitorDialysisOrder, err error) {
 	redis := RedisClient()
 
@@ -2958,3 +2977,78 @@ func GetPatientAllagicList(patient_id int64, user_org_id int64) (list []*models.
 
 	return list, err
 }
+
+func GetNewMonitorRecord(orgID int64, date int64, partition int64, patientId int64) ([]*models.NewMonitorDialysisScheduleList, error) {
+	var mds []*models.NewMonitorDialysisScheduleList
+
+	db := readDb.Model(&models.NewMonitorDialysisScheduleList{})
+	if date > 0 {
+		db = db.Where("schedule_date = ?", date)
+	}
+	if partition > 0 {
+		db = db.Where("partition_id = ?", partition)
+	}
+	if patientId > 0 {
+
+		db = db.Where("patient_id = ?", patientId)
+	}
+
+	err = db.Where("status = 1 and user_org_id = ?", orgID).Find(&mds).Error
+
+	return mds, err
+}
+
+func GetAdviceList(user_org_id int64, advice_date int64, pat_type int64) (advice []*models.VMDoctorAdviceForList, err error) {
+
+	if pat_type == 0 {
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =7 and check_time = 0", user_org_id, advice_date).Find(&advice).Error
+	}
+	//待医嘱核对
+	if pat_type == 1 {
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and check_time = 0", user_org_id, advice_date).Find(&advice).Error
+	}
+	//待医嘱执行
+	if pat_type == 6 {
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and execution_state = 2", user_org_id, advice_date).Find(&advice).Error
+
+	}
+	return advice, err
+}
+
+func GetDobuleCheck(user_org_id int64, advice_date int64) (check []*models.VmDoubleCheck, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and check_date = ? and status = 1", user_org_id, advice_date).Find(&check).Error
+	return check, err
+}
+
+func GetTreatmentSummaryForList(user_org_id int64, advice_date int64) (summary []*models.VMTreatmentSummaryForList, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and assessment_date = ? and status =1", user_org_id, advice_date).Find(&summary).Error
+
+	return summary, err
+}
+
+func GetDialysisInformationList(user_org_id int64, advice_date int64) (information []*models.NewDeviceInformation, err error) {
+
+	err = UserReadDB().Where("user_org_id =? and date = ? and status =1", user_org_id, advice_date).Find(&information).Error
+	return information, err
+}
+
+func GetNewAllMonitorList(orgID int64, scheduleDate int64, pat_type int64) (monitor []*models.VMMonitoringRecord, err error) {
+	if pat_type == 0 || pat_type == 9 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+
+	if pat_type == 10 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? AND accumulated_blood_volume = 0", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+
+	if pat_type == 11 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? AND symptom <> ''", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+
+	if pat_type == 12 {
+		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ? AND dispose <> ''", orgID, scheduleDate).Order("monitoring_date asc").Find(&monitor).Error
+	}
+	return monitor, err
+}