Merge branch 'master' of http://git.shengws.com/csx/XT_New

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 

controllers/device_api_controller.go

@@ -572,6 +572,11 @@ func (this *DeviceAPIController) ModifyZone() {
 	zone.Type = type_
 	zone.ModifyTime = time.Now().Unix()
 
+	byName, _ := service.GetZoneByNameOne(name, adminInfo.CurrentOrgId)
+	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 	updateErr := service.UpdateDeviceZone(zone)
 	if updateErr != nil {
 		this.ErrorLog("修改设备分区失败:%v", updateErr)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2353,6 +2353,7 @@ func (this *NewDialysisApiController) UpdateGroup() {
 	name := this.GetString("name")
 	byName, _ := service.GetGroupByNameOne(name, orgid)
 	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	group := models.DeviceGroup{Name: name}
@@ -2397,6 +2398,7 @@ func (this *NewDialysisApiController) UpdatedBed() {
 	BedName, _ := service.GetBedByNameOne(name, orgId)
 	fmt.Println("-----", BedName.ID)
 	if BedName.ID > 0 && BedName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	number := models.DeviceNumber{

controllers/patient_api_controller.go

@@ -62,6 +62,7 @@ func PatientApiRegistRouters() {
 	beego.Router("/api/infectious/remind", &PatientApiController{}, "Get:GetRemindPatientList")
 
 	beego.Router("/api/remind/is_open", &PatientApiController{}, "Post:PostIsOpenRemind")
+	beego.Router("/api/patients/advices/getpatientschedules", &PatientApiController{}, "Get:GetPatientScheduleOne")
 
 }
 
@@ -243,29 +244,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,
@@ -311,27 +312,27 @@ 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:              "",
+		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:                  "",
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -459,29 +460,29 @@ func (c *PatientApiController) EditPatient() {
 	}
 	fmt.Println("病人--------------------------------------------------------------", patient.Name, patient.Age)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          patient.UserOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		Lapseto:            patient.Lapseto,
-		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,
+		Lapseto:                   patient.Lapseto,
+		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,
@@ -523,17 +524,17 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		ContactName:              patient.ContactName,
-		UpdatedTime:              time.Now().Unix(),
+		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
+		IsInfectious:              patient.IsInfectious,
+		RemindCycle:               patient.RemindCycle,
+		ResponseResult:            patient.ResponseResult,
+		IsOpenRemind:              patient.IsOpenRemind,
+		FirstTreatmentDate:        patient.FirstTreatmentDate,
+		DialysisAge:               patient.DialysisAge,
+		ExpenseKind:               patient.ExpenseKind,
+		TellPhone:                 patient.TellPhone,
+		ContactName:               patient.ContactName,
+		UpdatedTime:               time.Now().Unix(),
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1990,7 +1991,10 @@ func (c *PatientApiController) GetDoctorAdvices() {
 	startTime := c.GetString("start_time", "")
 	endTime := c.GetString("end_time", "")
 	keywords := c.GetString("keywords", "")
-
+	page, _ := c.GetInt64("page")
+	fmt.Println("page", page)
+	limit, _ := c.GetInt64("limit")
+	fmt.Println("limit", limit)
 	adminUserInfo := c.GetAdminUserInfo()
 
 	operatorIDs := make([]int64, 0)
@@ -2020,6 +2024,8 @@ func (c *PatientApiController) GetDoctorAdvices() {
 	}
 
 	advices, total, _ := service.GetDoctorAdviceList(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords)
+	advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+
 	if len(advices) > 0 {
 		for _, item := range advices {
 			if item.AdviceDoctor > 0 {
@@ -2044,6 +2050,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		"advices":   advices,
 		"operators": operators,
 		"total":     total,
+		"advicetwo": advicestwo,
 	})
 	return
 
@@ -3343,3 +3350,27 @@ func (c *PatientApiController) PostIsOpenRemind() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	}
 }
+
+func (c *PatientApiController) GetPatientScheduleOne() {
+	id, _ := c.GetInt64("id")
+	//查询该病人是否当天是排班
+	nowDateTime := time.Now()
+	nowDate := nowDateTime.Format("2006-01-02")
+	nowDate += " 00:00:00"
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", nowDate, loc)
+	nowdate := theTime.Unix()
+	fmt.Println("nowdate", nowdate)
+	adminUser := c.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
+	fmt.Println("orgid", orgId)
+	scheduls, err := service.GetPatientScheduleOne(id, nowdate, orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"scheduls": scheduls,
+	})
+}

service/device_service.go

@@ -275,16 +275,22 @@ func GetDeviceZoneByID(orgID int64, zoneID int64) (*models.DeviceZone, error) {
 func GetZoneByName(name string, orgid int64) (*models.DeviceZone, error) {
 	zones := models.DeviceZone{}
 	err := XTReadDB().Model(&zones).Where("name = ? and org_id = ? and status = 1", name, orgid).Find(&zones).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
 	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
+		return nil, err
 	}
+
 	return &zones, nil
 }
 
+func GetZoneByNameOne(name string, orgid int64) (zone models.DeviceZone, err error) {
+
+	err = XTReadDB().Model(&zone).Where("name = ? and org_id=? and status = 1", name, orgid).First(&zone).Error
+	return zone, err
+}
+
 func CreateDeviceZone(orgID int64, name string, type_ int) (*models.DeviceZone, error) {
 	now := time.Now().Unix()
 	zone := models.DeviceZone{

service/dialysis_service.go

@@ -695,9 +695,18 @@ func GetAdminUserES(orgID int64, appID int64, ids []int64) (es []*models.AdminUs
 	return
 }
 
-func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error) {
+//
+//func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error) {
+//
+//	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
+//	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
+//	fmt.Println("table", table)
+//	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error
+//	return admin, err
+//}
 
-	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
+func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error) {
+	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status =1")
 	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
 	fmt.Println("table", table)
 	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error

service/patient_service.go

@@ -682,7 +682,7 @@ func FindDoctorAdviceByGroupNo(orgID, groupNo int64) (advice models.DoctorAdvice
 	return
 }
 func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64, keywords string) (advices []*models.DoctorAdvices, total int64, err error) {
-	//db := readDb.Model(&models.DoctorAdvice{}).Where("status=1")
+
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Print("table", table)
@@ -697,6 +697,7 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	} else if advice_type == 0 {
 		db = db.Where("x.advice_type in (?)", []int{1, 3})
 	}
+
 	if stop == 1 {
 		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
 	} else if stop == 2 {
@@ -717,6 +718,86 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	fmt.Print("err", err)
 	return
 }
+
+func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string) (advices []*models.DoctorAdvices, total int64, err error) {
+
+	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Print("table", table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 && advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
+	if advice_type == 3 && advice_type > 0 {
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
+	}
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	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, 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").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	fmt.Print("err", err)
+	return
+}
+
+func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64) (advices []*models.DoctorAdvices, total int64, err error) {
+
+	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println(table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
+	if advice_type == 3 {
+		db = db.Where("x.advice_type <> 1")
+	}
+
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	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, 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").Scan(&advices).Error
+	fmt.Print("错误是什么", err)
+	return
+
+}
+
 func GetDoctorAdvicePageList(orgID, patientID, advice_type, stop, start, end int64, keywords string, page, limit int64) (advices []*models.DoctorAdvice, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -1073,3 +1154,9 @@ func GetSchedualPatientByKeyWord(orgID int64, keywords string, date int64) (pati
 	}
 	return
 }
+
+func GetPatientScheduleOne(patientid int64, nowdate int64, orgid int64) (models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTReadDB().Model(&schedule).Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status =1", patientid, nowdate, orgid).Find(&schedule).Error
+	return schedule, err
+}

service/patientmanage_service.go

@@ -524,7 +524,6 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 }
 
 func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end int64, limit int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvice, total int64, err error) {
-	fmt.Println("advicetype------------------------------", advice_type)
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)