历史排班

controllers/dialysis_api_controller.go

@@ -135,6 +135,12 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getmonitorloglist", &DialysisApiController{}, "Get:GetMonitorLogList")
 
 	beego.Router("/api/patient/getafterloglist", &DialysisApiController{}, "Get:GetAfterLogList")
+
+	beego.Router("/api/patient/savegathersetting", &DialysisApiController{}, "Get:SaveGatherSetting")
+
+	beego.Router("/api/patient/getgathersetting", &DialysisApiController{}, "Get:GetGatherSetting")
+
+	beego.Router("/api/patient/getdialysisgatherlist", &DialysisApiController{}, "Get:GetDialysisGatherList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -7463,3 +7469,134 @@ func (this *DialysisApiController) GetAfterLogList() {
 		return
 	}
 }
+
+func (this *DialysisApiController) SaveGatherSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	is_index_number, _ := this.GetInt64("is_index_number")
+	fmt.Println("this,23o2332232323232332", is_index_number)
+	is_zone, _ := this.GetInt64("is_zone")
+	is_number, _ := this.GetInt64("is_number")
+	is_birth, _ := this.GetInt64("is_birth")
+	is_age, _ := this.GetInt64("is_age")
+	is_name, _ := this.GetInt64("is_name")
+	is_mode_type, _ := this.GetInt64("is_mode_type")
+	is_prescription_status, _ := this.GetInt64("is_prescription_status")
+	is_admission_number, _ := this.GetInt64("is_admission_number")
+	is_dialysis_no, _ := this.GetInt64("is_dialysis_no")
+	is_dry_weight, _ := this.GetInt64("is_dry_weight")
+	is_dialysis_dialyszers, _ := this.GetInt64("is_dialysis_dialyszers")
+	is_dialysis_strainer, _ := this.GetInt64("is_dialysis_strainer")
+	is_dialysis_irrigation, _ := this.GetInt64("is_dialysis_irrigation")
+	is_calcium, _ := this.GetInt64("is_calcium")
+	is_kalium, _ := this.GetInt64("is_kalium")
+	is_change_nurse, _ := this.GetInt64("is_change_nurse")
+	is_puncture_needle, _ := this.GetInt64("is_puncture_needle")
+	is_anticoagulant, _ := this.GetInt64("is_anticoagulant")
+	is_tube, _ := this.GetInt64("is_tube")
+	is_cuhong, _ := this.GetInt64("is_cuhong")
+	is_zuoka, _ := this.GetInt64("is_zuoka")
+	is_zhetangtie, _ := this.GetInt64("is_zhetangtie")
+	is_paligu, _ := this.GetInt64("is_paligu")
+	is_guhuachun, _ := this.GetInt64("is_guhuachun")
+	is_niaojimei, _ := this.GetInt64("is_niaojimei")
+	is_putaosuangai, _ := this.GetInt64("is_putaosuangai")
+	is_jiaguan, _ := this.GetInt64("is_jiaguan")
+	is_xiongxiewutai, _ := this.GetInt64("is_xiongxiewutai")
+
+	gatherSetting := models.XtDialysisGatherSetting{
+		UserOrgId:          orgId,
+		IndexNumber:        is_index_number,
+		Zone:               is_zone,
+		Number:             is_number,
+		Birth:              is_birth,
+		Name:               is_name,
+		Age:                is_age,
+		ModeType:           is_mode_type,
+		PrescriptionStatus: is_prescription_status,
+		AdmissionNumber:    is_admission_number,
+		DialysisNo:         is_dialysis_no,
+		DryWeight:          is_dry_weight,
+		DialysisDialyszers: is_dialysis_dialyszers,
+		DialysisStrainer:   is_dialysis_strainer,
+		DialysisIrrigation: is_dialysis_irrigation,
+		Calcium:            is_calcium,
+		Kalium:             is_kalium,
+		ChangeNurse:        is_change_nurse,
+		PunctureNeedle:     is_puncture_needle,
+		Anticoagulant:      is_anticoagulant,
+		Tube:               is_tube,
+		Cuhong:             is_cuhong,
+		Zuoka:              is_zuoka,
+		Zhetangtie:         is_zhetangtie,
+		Paligu:             is_paligu,
+		Guhuachun:          is_guhuachun,
+		Niaojimei:          is_niaojimei,
+		Putaosuangai:       is_putaosuangai,
+		Jiaguan:            is_jiaguan,
+		Xiongxiewutai:      is_xiongxiewutai,
+		Ctime:              time.Now().Unix(),
+		Mtime:              time.Now().Unix(),
+		Status:             1,
+	}
+	//查询该机构有没有设置
+	gatherSettingOne, _ := service.GetGatherSettingByOrgId(orgId)
+	if gatherSettingOne.ID == 0 {
+		service.CreateGather(gatherSetting)
+	} else {
+		gatherSetting.ID = gatherSettingOne.ID
+		service.SaveGather(gatherSetting)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"gatherSetting": gatherSetting,
+	})
+	return
+}
+
+func (this *DialysisApiController) GetGatherSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	gatherSetting, _ := service.GetGatherSetting(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"gatherSetting": gatherSetting,
+	})
+	return
+}
+
+func (this *DialysisApiController) GetDialysisGatherList() {
+
+	keyword := this.GetString("keywords")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	partion_type := this.GetString("partition_id")
+	idSplit := strings.Split(partion_type, ",")
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	start_time := this.GetString("schedule_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	scheduids := this.GetString("ids")
+	var ids []string
+	if scheduids != "" {
+		ids = strings.Split(scheduids, ",")
+	}
+
+	list, total, _ := service.GetDialysisGatherList(keyword, limit, page, idSplit, schedule_type, startTime.Unix(), orgId, ids)
+	gatherSetting, _ := service.GetGatherSetting(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":          list,
+		"total":         total,
+		"gatherSetting": gatherSetting,
+	})
+	return
+}

controllers/patient_api_controller.go

@@ -4607,6 +4607,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		chaptalization := dataBody["chaptalization"].(string)
 		solution.Chaptalization = chaptalization
 	}
+
+	if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "string" {
+		blood_access_part_id := dataBody["blood_access_part_id"].(string)
+		solution.BloodAccessPartId = blood_access_part_id
+	}
 	return
 }
 

controllers/sign_api_controller.go

@@ -662,8 +662,7 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
-	fmt.Println("WOOWOWOWOWOWOWOWOWOWOWWOOWOWWO")
-	list, _ := service.GetAllPatientNew(10587)
+	list, _ := service.GetAllPatientNew(10567)
 	for _, item := range list {
 
 		hans := item.Name // 要转换的汉字字符串

models/role_models.go

@@ -153,3 +153,44 @@ type Roles struct {
 func (Roles) TableName() string {
 	return "sgj_user_role"
 }
+
+type XtDialysisGatherSetting struct {
+	ID                 int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IndexNumber        int64 `gorm:"column:index_number" json:"index_number" form:"index_number"`
+	Zone               int64 `gorm:"column:zone" json:"zone" form:"zone"`
+	Number             int64 `gorm:"column:number" json:"number" form:"number"`
+	Birth              int64 `gorm:"column:birth" json:"birth" form:"birth"`
+	Name               int64 `gorm:"column:name" json:"name" form:"name"`
+	Age                int64 `gorm:"column:age" json:"age" form:"age"`
+	ModeType           int64 `gorm:"column:mode_type" json:"mode_type" form:"mode_type"`
+	PrescriptionStatus int64 `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	AdmissionNumber    int64 `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	DialysisNo         int64 `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	DryWeight          int64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	DialysisDialyszers int64 `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisStrainer   int64 `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	DialysisIrrigation int64 `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	Calcium            int64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Kalium             int64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	ChangeNurse        int64 `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
+	PunctureNeedle     int64 `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	Anticoagulant      int64 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	Tube               int64 `gorm:"column:tube" json:"tube" form:"tube"`
+	Cuhong             int64 `gorm:"column:cuhong" json:"cuhong" form:"cuhong"`
+	Zuoka              int64 `gorm:"column:zuoka" json:"zuoka" form:"zuoka"`
+	Zhetangtie         int64 `gorm:"column:zhetangtie" json:"zhetangtie" form:"zhetangtie"`
+	Paligu             int64 `gorm:"column:paligu" json:"paligu" form:"paligu"`
+	Guhuachun          int64 `gorm:"column:guhuachun" json:"guhuachun" form:"guhuachun"`
+	Niaojimei          int64 `gorm:"column:niaojimei" json:"niaojimei" form:"niaojimei"`
+	Putaosuangai       int64 `gorm:"column:putaosuangai" json:"putaosuangai" form:"putaosuangai"`
+	Jiaguan            int64 `gorm:"column:jiaguan" json:"jiaguan" form:"jiaguan"`
+	Xiongxiewutai      int64 `gorm:"column:xiongxiewutai" json:"xiongxiewutai" form:"xiongxiewutai"`
+	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 (XtDialysisGatherSetting) TableName() string {
+	return "xt_dialysis_gather_setting"
+}

models/schedule_models.go

@@ -423,6 +423,7 @@ type NewMSchedualPatientVMList struct {
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	AdmissionNumber    string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
 }
 
 func (NewMSchedualPatientVMList) TableName() string {

service/dialysis_solution_service.go

@@ -586,3 +586,59 @@ func GetLongDialysisAdviceToday(orgID int64, schedule_type int64, partition_id [
 	return schedule, err
 
 }
+
+func GetDialysisGatherList(keywords string, limit int64, page int64, partition_id []string, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodSchedule, total int64, err error) {
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
+	offset := (page - 1) * limit
+	if scheduleDate > 0 {
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
+	}
+	//if partition_id > 0 {
+	//	db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	//}
+	if len(partition_id) > 0 {
+		db = db.Where("xt_schedule.partition_id in(?)", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
+	}
+	if len(ids) >= 1 {
+		db = db.Where("xt_schedule.id in(?)", ids)
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).
+			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, scheduleDate)
+			}).
+			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
+			Preload("XtDoctorAdviceOne", "status = 1 AND user_org_id = ? and advice_date = ? and (advice_type = 2 or advice_type =3)", orgID, scheduleDate).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).
+			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
+			Preload("XtDoctorAdviceOne", "status = 1 AND user_org_id = ? and advice_date = ? and (advice_type = 2 or advice_type =3)", orgID, scheduleDate).
+			Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, scheduleDate)
+			}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	}
+
+	return schedule, total, err
+}

service/gobal_config_service.go

@@ -1322,3 +1322,32 @@ func GetAfterLogList(patient_id int64, page int64, limit int64, record_date int6
 
 	return afterlist, total, err
 }
+
+func GetGatherSettingByOrgId(user_org_id int64) (models.XtDialysisGatherSetting, error) {
+
+	gatherSetting := models.XtDialysisGatherSetting{}
+	err := XTReadDB().Where("user_org_id =? and status =1", user_org_id).Find(&gatherSetting).Error
+	return gatherSetting, err
+}
+
+func CreateGather(setting models.XtDialysisGatherSetting) error {
+
+	err := XTWriteDB().Create(&setting).Error
+	return err
+}
+
+func SaveGather(setting models.XtDialysisGatherSetting) error {
+
+	err := XTWriteDB().Save(&setting).Error
+
+	return err
+}
+
+func GetGatherSetting(user_org_id int64) (models.XtDialysisGatherSetting, error) {
+
+	gatherSetting := models.XtDialysisGatherSetting{}
+
+	err := XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&gatherSetting).Error
+
+	return gatherSetting, err
+}

service/inspection_service.go

@@ -169,7 +169,7 @@ func DeletePatientInspection(orgId, patientId, projectId, date int64) (err error
 func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections []*models.Inspection, total int64, date int64, err error) {
 
 	var projectCount models.UserInspectionProjectCount
-	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Order("created_time desc").Scan(&projectCount).Error
+	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("count(distinct inspect_date) as count, project_id, patient_id").Order("inspect_date desc").Scan(&projectCount).Error
 
 	if err != nil {
 		return
@@ -181,7 +181,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("created_time 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("inspect_date desc").Offset(page - 1).Limit(1).Scan(&Id).Error
 	if err != nil {
 		return
 	}

service/schedule_service.go

@@ -243,7 +243,7 @@ func GetNextSchedule(orgID, end, patientID int64) (schedules []*models.PatientSc
 func GetNextScheduleByList(patient_id int64, schedule_date int64, user_org_id int64) (models.SchedulePatientsOne, error) {
 
 	patientsOne := models.SchedulePatientsOne{}
-	err := XTReadDB().Where("patient_id = ? and schedule_date >? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).First(&patientsOne).Error
+	err := XTReadDB().Where("patient_id = ? and schedule_date >? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Order("schedule_date asc").First(&patientsOne).Error
 	return patientsOne, err
 }