历史排班

controllers/base_api_controller.go

@@ -1,12 +1,13 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
 	"fmt"
 	"strconv"
 	"strings"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
 )
 
 type BaseAPIController struct {
@@ -81,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10480 //机构id 10344
+		subscibe.OrgId = 10278 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,7 +92,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10480 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10278 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10480 //机构id小英10344或4
+		subscibe.OrgId = 10278 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10480 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10278 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1,15 +1,9 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"math"
 	"net/http"
 	"net/url"
@@ -17,6 +11,13 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 )
 
 // type DialysisTestAPIController struct {

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -1,15 +1,16 @@
 package new_mobile_api_controllers
 
 import (
+	"fmt"
+	"strconv"
+	"time"
+
 	"XT_New/controllers/mobile_api_controllers"
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"fmt"
 	"github.com/jinzhu/gorm"
-	"strconv"
-	"time"
 )
 
 type NewManageApiController struct {
@@ -160,69 +161,50 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 		this.ServeSuccessJSON(returnData)
 		return
 	} else {
-		_, errcode := service.GetInforTwo(patientid, scheduledate, orgid, scheduletype)
-		if errcode == gorm.ErrRecordNotFound {
-			information := models.DeviceInformation{
-				Date:                  scheduledate,
-				Zone:                  zoneid,
-				Class:                 scheduletype,
-				BedNumber:             bedid,
-				PatientId:             patientid,
-				DialysisMode:          modeid,
-				LongTime:              strconv.FormatInt(disinfectime, 10),
-				Disinfection:          1,
-				DialysisConcentration: 1,
-				DisinfectionStatus:    1,
-				Move:                  1,
-				UserOrgId:             orgid,
-				DisinfectType:         plan.Way,
-				DisinfectantType:      plan.MachineDisinfectant,
-				FluidPath:             plan.DisinfectanWay, //液路消毒方式
-				Disinfectant:          plan.Disinfectant,
-				Ctime:                 time.Now().Unix(),
-				Status:                1,
-				SignName:              order.FinishNurse,
-				EquimentId:            addmacher.ID,
-				DisinfectionResidue:   2,
-				Bed:                   addmacher.BedNumber,
-				StartTime:             order.StartTime,
-				EndTime:               order.EndTime,
-				Contagion:             con,
-				WeightLoss:            dislysis.WeightLoss,
-				Hyperfiltratio:        dislysis.ActualUltrafiltration,
-				DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
-				MachineRun:            1,
-				DisinfecStartime:      startdateunix,
-				DisinfecEndtime:       enddateunix,
-			}
-			err := service.CreateInformationTwo(&information)
-			fmt.Println("报错", err)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"information": information,
-			})
-		} else if errcode == nil {
-			information := models.DeviceInformation{
-				DisinfecStartime: startdateunix,
-				DisinfecEndtime:  enddateunix,
-				LongTime:         strconv.FormatInt(disinfectime, 10),
-			}
-
-			errcode := service.UpdateInformation(&information, scheduledate, bedid, scheduletype)
-			if errcode != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"information": information,
-			})
-		} else {
+		information := models.DeviceInformation{
+			Date:                  scheduledate,
+			Zone:                  zoneid,
+			Class:                 scheduletype,
+			BedNumber:             bedid,
+			PatientId:             patientid,
+			DialysisMode:          modeid,
+			LongTime:              strconv.FormatInt(disinfectime, 10),
+			Disinfection:          1,
+			DialysisConcentration: 1,
+			DisinfectionStatus:    1,
+			Move:                  1,
+			UserOrgId:             orgid,
+			DisinfectType:         plan.Way,
+			DisinfectantType:      plan.MachineDisinfectant,
+			FluidPath:             plan.DisinfectanWay, //液路消毒方式
+			Disinfectant:          plan.Disinfectant,
+			Ctime:                 time.Now().Unix(),
+			Status:                1,
+			SignName:              order.FinishNurse,
+			EquimentId:            addmacher.ID,
+			DisinfectionResidue:   2,
+			Bed:                   addmacher.BedNumber,
+			StartTime:             order.StartTime,
+			EndTime:               order.EndTime,
+			Contagion:             con,
+			WeightLoss:            dislysis.WeightLoss,
+			Hyperfiltratio:        dislysis.ActualUltrafiltration,
+			DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
+			MachineRun:            1,
+			DisinfecStartime:      startdateunix,
+			DisinfecEndtime:       enddateunix,
+		}
+		service.DeleteInformation(patientid, scheduledate, orgid)
+		err := service.CreateInformationTwo(&information)
+		fmt.Println("报错", err)
+		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"information": information,
+		})
+
 	}
 }
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -1,18 +1,19 @@
 package new_mobile_api_controllers
 
 import (
-	"XT_New/controllers/mobile_api_controllers"
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/controllers/mobile_api_controllers"
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
 )
 
 type StaffScheduleApiController struct {
@@ -1506,3 +1507,15 @@ func (c *StaffScheduleApiController) UpdateMobileSchedule() {
 	})
 	return
 }
+
+func (c *StaffScheduleApiController) GetPatientMap() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+	sitemap, _ := service.GetPatientSitemap(patient_id, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"sitemap": sitemap,
+	})
+	return
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -38,4 +38,6 @@ func StaffScheduleApiControllersRegisterRouters() {
 
 	beego.Router("m/api/schedule/updateschedule", &StaffScheduleApiController{}, "Get:UpdateMobileSchedule")
 
+	beego.Router("m/api/patient/getpatientmap", &StaffScheduleApiController{}, "Get:GetPatientMap")
+
 }

controllers/schedule_api_controller.go

@@ -1,18 +1,19 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
+
 	"github.com/astaxie/beego"
 )
 
@@ -4487,10 +4488,13 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
+	fmt.Println("week_type-------------------------", week_type)
 	if week_type > 0 {
 		list, err := service.GetWeekDayScheduleByIdThee(orgId, targetDay.Unix(), week_time, zone)
 		for _, item := range list {
 			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
+			adviceList, _ := service.GetHisDoctorAdviceList(orgId, item.PatientId, targetDay.Unix())
+			item.HisDoctorAdviceInfo = adviceList
 			item.XtDialysisOrderSix = order
 			if orgId == 10340 {
 

controllers/self_drug_api_congtroller.go

@@ -1,18 +1,19 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 )
 
 type SelfDrugApiController struct {

service/manage_service.go

@@ -1,11 +1,12 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetEquitmentName(unit_type string, orgid int64) (*models.DeviceEquimentname, error) {
@@ -1240,6 +1241,14 @@ func GetPatientOrderInfo(schduledate int64, patientid int64, orgid int64) (model
 	return order, err
 }
 
+func DeleteInformation(patient_id int64, schedule_date int64, user_org_id int64) (models.DeviceInformation, error) {
+
+	information := models.DeviceInformation{}
+
+	err := UserWriteDB().Model(&information).Where("patient_id =? and date =? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return information, err
+}
+
 func CreateInformationTwo(information *models.DeviceInformation) error {
 	err := UserWriteDB().Create(&information).Error
 	return err
@@ -1247,7 +1256,7 @@ func CreateInformationTwo(information *models.DeviceInformation) error {
 
 func UpdateInformation(information *models.DeviceInformation, scheduledate int64, bedid int64, scheduletype int64) error {
 
-	err := UserWriteDB().Model(&information).Where("date = ? and bed_number = ? and class = ?", scheduledate, bedid, scheduletype).Updates(map[string]interface{}{"long_time": information.LongTime, "disinfec_startime": information.DisinfecStartime, "disinfec_endtime": information.DisinfecEndtime}).Error
+	err := UserWriteDB().Model(&information).Where("date = ? and bed_number = ? and class = ?", scheduledate, bedid, scheduletype).Updates(map[string]interface{}{"long_time": information.LongTime, "disinfec_startime": information.DisinfecStartime, "disinfec_endtime": information.DisinfecEndtime, "bed_number": information.BedNumber, "zone": information.Zone}).Error
 	return err
 }
 

service/schedule_service.go

@@ -1,12 +1,13 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
 
+	"XT_New/models"
+
 	"github.com/jinzhu/gorm"
 )
 
@@ -20,10 +21,6 @@ func GetSchedulePartitionPanel(orgID int64) (partitions []*models.Partition, err
 
 func GetSchedulePartitionPanelOne(orgID int64, partionId []string) (partitions []*models.Partition, err error) {
 
-	//if len(partionId) > 0 {
-	//	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1 and zone_id in (?)", orgID, partionId).Where("org_id=? and status=1 and id  ?", orgID, partionId).Find(&partitions).Error
-	//}
-	//if len(partionId) == 0 {
 	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
 	//}
 
@@ -977,10 +974,10 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ? and user_org_id = ? ", scheduleDate, orgid).Preload("DialysisPrescription", "status = 1 and record_date =? and user_org_id = ?", scheduleDate, orgid).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+	}).Preload("DialysisPrescription", "status = 1 and record_date =? and user_org_id = ?", scheduleDate, orgid).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and solution_status = 1").Order("id asc")
 	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate).Limit(1)
 	}).Find(&list).Error
 
 	return list, err
@@ -1007,7 +1004,7 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and solution_status =1").Order("id asc")
 	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate).Limit(1)
 	}).Find(&list).Error
 
 	return list, err
@@ -1510,6 +1507,13 @@ func GetLastDialysisOrder(org_id int64, patient_id int64, dialysis_date int64) (
 	return order, err
 }
 
+func GetHisDoctorAdviceList(org_id int64, patient_id int64, dialysis_date int64) (adviceInfo []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("patient_id=? and user_org_id = ? and advice_date= ? and status=1", patient_id, org_id, dialysis_date).Find(&adviceInfo).Error
+
+	return adviceInfo, err
+}
+
 func GetLastDialysisSolution(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.NewDialysisPrescription, error) {
 
 	dialysisprescription := models.NewDialysisPrescription{}