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

controllers/dialysis_parameter_api_controller.go

@@ -40,7 +40,7 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 	fmt.Println("scheduletype", schedulType, start_time, partitionType, keywords, theTime.Unix())
 	if len(keywords) > 0 {
 		dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(adminUserInfo.CurrentOrgId, keywords, schedulType, partitionType, page, limit, theTime.Unix())
-		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit, keywords)
+		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit, keywords, schedulType, partitionType)
 		var vlist []interface{}
 		var elist []interface{}
 		for _, item := range patient {
@@ -64,7 +64,7 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 		dialysisSchedule, err, total := service.GetDialysisParameter(adminUserInfo.CurrentOrgId, theTime.Unix(), schedulType, partitionType, page, limit)
 
 		//查询今日排班的病人
-		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit, keywords)
+		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit, keywords, schedulType, partitionType)
 
 		var vlist []interface{}
 		var elist []interface{}
@@ -219,7 +219,7 @@ func (this *DialysisPrameterApiController) GetCollectList() {
 	schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
 
 	//查询今日排班的病人
-	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword)
+	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword, scheduletype, partitiontype)
 	var vlist []interface{}
 	var clist []interface{}
 	for _, item := range patient {

controllers/his_project_api_controller.go

@@ -79,6 +79,7 @@ func HisProjectRouters() {
 
 	beego.Router("/api/hispatient/getalldepartmentlist", &HisProjectApiController{}, "Get:GetAllDepartmentList")
 	beego.Router("/api/hispatient/getprescription", &HisProjectApiController{}, "Get:GetPrescription")
+	beego.Router("/api/histpatient/getpatientdetail", &HisProjectApiController{}, "Get:GetPatientDetail")
 }
 
 func (this *HisProjectApiController) SaveProject() {
@@ -732,7 +733,6 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	recordDateStr := time.Now().Format("2006-01-02")
 	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	nowtime := recordDate.Unix()
-	fmt.Println("nowtime0000000000", nowtime)
 	phone := this.GetString("phone")
 	social_type, _ := this.GetInt64("social_type")
 	bloodPatient, errcode := service.GetBloodPatientByIdCard(idcard, orgId)
@@ -750,19 +750,19 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			IsNeedCostOfProduction: cost_checked,
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                name,
-			RegisterType:        register,
-			RegisterCost:        registrationfees_float,
-			BalanceAccountsType: settlementValue,
-			Gender:              sex,
-			Total:               totals_float,
-			UserOrgId:           orgId,
-			Status:              1,
-			RecordDate:          nowtime,
-			IsReturn:            1,
-			Ctime:               time.Now().Unix(),
-			Phone:               phone,
-			SocialType:          social_type,
+			Name:                   name,
+			RegisterType:           register,
+			RegisterCost:           registrationfees_float,
+			BalanceAccountsType:    settlementValue,
+			Gender:                 sex,
+			Total:                  totals_float,
+			UserOrgId:              orgId,
+			Status:                 1,
+			RecordDate:             nowtime,
+			IsReturn:               1,
+			Ctime:                  time.Now().Unix(),
+			Phone:                  phone,
+			SocialType:             social_type,
 		}
 		err := service.CreateHisPatient(&patient)
 		lastPatient, err := service.GetLastPatient(orgId)
@@ -795,18 +795,20 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			IsNeedCostOfProduction: cost_checked,
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                name,
-			RegisterType:        register,
-			RegisterCost:        registrationfees_float,
-			BalanceAccountsType: settlementValue,
-			Gender:              sex,
-			Total:               totals_float,
-			UserOrgId:           orgId,
-			PatientId:           bloodPatient.ID,
-			Ctime:               time.Now().Unix(),
-			Phone:               phone,
-			SocialType:          social_type,
-			RecordDate:          nowtime,
+			Name:                   name,
+			RegisterType:           register,
+			RegisterCost:           registrationfees_float,
+			BalanceAccountsType:    settlementValue,
+			Gender:                 sex,
+			Total:                  totals_float,
+			UserOrgId:              orgId,
+			PatientId:              bloodPatient.ID,
+			Ctime:                  time.Now().Unix(),
+			Phone:                  phone,
+			SocialType:             social_type,
+			RecordDate:             nowtime,
+			Status:                 1,
+			IsReturn:               1,
 		}
 		err := service.CreateHisPatient(&patient)
 		lastPatient, err := service.GetLastPatient(orgId)
@@ -1377,3 +1379,17 @@ func (this *HisProjectApiController) GetPrescription() {
 		"list": list,
 	})
 }
+
+func (this *HisProjectApiController) GetPatientDetail() {
+
+	id, _ := this.GetInt64("id")
+	adminUserInfo := this.GetAdminUserInfo()
+	patient, err := service.GetPatientByID(adminUserInfo.CurrentOrgId, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -48,7 +48,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 
 		//dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(orgid, keywords, scheduleType, partitionType, page, limit, theTime.Unix())
 		//查询今日排班的病人
-		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords)
+		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
 		var vlist []interface{}
 		var elist []interface{}
 		for _, item := range patient {
@@ -71,7 +71,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	} else {
 		dialysisSchedule, err, total := service.GetDialysisParameter(orgid, theTime.Unix(), scheduleType, partitionType, page, limit)
 		//查询今日排班的病人
-		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords)
+		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
 		var vlist []interface{}
 		var elist []interface{}
 		for _, item := range patient {
@@ -154,7 +154,7 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 	//获取透析参数数据
 	//schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
 	//查询今日排班的病人
-	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword)
+	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword, scheduletype, partitiontype)
 	var vlist []interface{}
 	var clist []interface{}
 	for _, item := range patient {

controllers/schedule_api_controller.go

@@ -39,7 +39,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule_template/search", &ScheduleApiController{}, "get:SearchTemplateSchedulePatients")
 
 	beego.Router("/api/schedule_template/cancel", &ScheduleApiController{}, "post:CancelScheduleTemplate")
-
+	beego.Router("/api/schedule/getnextscheduleweekday", &ScheduleApiController{}, "Get:GetNextWeekDaySchedule")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -765,7 +765,6 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 func (this *ScheduleApiController) GetWeekDaySchedule() {
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
-	fmt.Println(week_type)
 	thisTime := time.Now()
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
@@ -816,6 +815,7 @@ func (this *ScheduleApiController) GetWeekDaySchedule() {
 		break
 	}
 	targetDay, parseErr := utils.ParseTimeStringToTime("2006-01-02", targetDayStr)
+
 	if parseErr != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1898,3 +1898,20 @@ func (c *ScheduleApiController) CancelScheduleTemplate() {
 		return
 	}
 }
+
+func (this *ScheduleApiController) GetNextWeekDaySchedule() {
+
+	week_type, _ := this.GetInt64("week_type", -1)
+	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)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}

service/dialysis_parameter_service.go

@@ -278,7 +278,7 @@ func GetAnticoagulantCount(startime int64, endtime int64, orgid int64) (prescrip
 	return prescriptionCount, err
 }
 
-func GetDialysisTodaySchedulePatient(orgid int64, startime int64, page int64, limit int64, keywords string) (schedule []*models.XtScheduleTwo, err error) {
+func GetDialysisTodaySchedulePatient(orgid int64, startime int64, page int64, limit int64, keywords string, schedulType int64, partiontype int64) (schedule []*models.XtScheduleTwo, err error) {
 	//offset := (page - 1) * limit
 	//err = XTReadDB().Model(&schedule).Where("user_org_id = ? and schedule_date = ? and status = 1", orgid, startime).Offset(offset).Limit(limit).Order("id desc").Find(&schedule).Error
 	//return schedule, err
@@ -286,6 +286,13 @@ func GetDialysisTodaySchedulePatient(orgid int64, startime int64, page int64, li
 
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if schedulType > 0 {
+		db = db.Where("x.schedule_type = ?", schedulType)
+	}
+	if partiontype > 0 {
+		db = db.Where("x.partition_id = ?", partiontype)
+	}
+
 	table := XTReadDB().Table("xt_patients as s")
 	fmt.Println(table)
 	if len(keywords) > 0 {

service/his_project_service.go

@@ -304,7 +304,7 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
 	if orgid > 0 {
 		db = db.Where("x.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").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").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
 	return hisPatient, total, err
 }
 

service/schedule_service.go

@@ -305,6 +305,7 @@ func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*m
 }
 
 func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.Time, weektime int64) (schedules []*models.WeekSchedule, err error) {
+
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
 		db = db.Where("s.user_org_id = ?", orgID)
@@ -338,6 +339,7 @@ func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.
 				advice.IsCheck = 1
 				if advice.FrequencyType == 3 {
 					week := int(scheduleDates.Weekday())
+					fmt.Println("week-------", week)
 					fmt.Println(advice.WeekDay)
 					switch week {
 					case 1:
@@ -629,3 +631,34 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 	err = readDb.Model(&models.PatientScheduleTemplateItem{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }
+
+func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64) (schedules []*models.WeekSchedule, err error) {
+
+	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
+	if orgID > 0 {
+		db = db.Where("s.user_org_id = ?", orgID)
+	}
+	if startime > 0 {
+		db = db.Where("s.schedule_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("s.schedule_date <= ?", endtime)
+	}
+	if weektime > 0 {
+		db = db.Where("s.schedule_type = ?", weektime)
+	}
+	if weektype > 0 {
+		db = db.Where("s.schedule_week = ?", weektype)
+	}
+	err = db.
+		Preload("DeviceZone", "status = 1 ").
+		Preload("DeviceNumber", "status = 1 ").
+		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Order("id asc")
+		}).
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Order("s.partition_id asc").
+		Find(&schedules).Error
+	return schedules, err
+}