11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #
@@ -7,7 +7,7 @@ copyrequestbody = true
 sessionon = true
 #sessiongcmaxlifetime = 64800
 
-tokencookiemaxlifetime = 64800
+tokencookiemaxlifetime = 604800
 enablexsrf = false
 xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o
 xsrfexpire = 3600

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"fmt"
+	"github.com/jinzhu/gorm"
 	"strings"
 	"time"
 )
@@ -288,7 +289,8 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 	}
 	if is_open == 1 {
 		//获取空床位的排班数据
-		list, err := service.GetPatientScheduleByBed(startTime, zoneid, classtype, orgid)
+		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid)
+
 		if err != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 			return
@@ -365,3 +367,53 @@ func (this *StaffScheduleApiController) UpdatePatientScheduleById() {
 		"msg": "切换成功",
 	})
 }
+
+func (this *StaffScheduleApiController) UpdateBloodSchedule() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	id, _ := this.GetInt64("id")
+	patient_id, _ := this.GetInt64("patient_id")
+	mode_id, _ := this.GetInt64("mode_id")
+	schedule_type, _ := this.GetInt64("schedule_type")
+	start_time := this.GetString("start_time")
+	dialyzer_perfusion_apparatus := this.GetString("dialyzer_perfusion_apparatus")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	//更改排班
+	schedule := models.XtSchedule{
+		ScheduleType: schedule_type,
+		ModeId:       mode_id,
+	}
+
+	service.UpdatedSchedule(schedule, id)
+
+	//更改透析模式
+	_, errcode := service.GetDialyisSolution(patient_id, startTime)
+	if errcode == gorm.ErrRecordNotFound {
+		orgId := this.GetAdminUserInfo().CurrentOrgId
+		prescription := models.DialysisPrescription{
+			DialyzerPerfusionApparatus: dialyzer_perfusion_apparatus,
+			DialysisDialyszers:         dialyzer_perfusion_apparatus,
+			PatientId:                  patient_id,
+			UserOrgId:                  orgId,
+			Status:                     1,
+			RecordDate:                 startTime,
+			CreatedTime:                time.Now().Unix(),
+		}
+		service.CreateDialysisPrescription(prescription)
+	} else if errcode == nil {
+		prescription := models.DialysisPrescription{
+			DialyzerPerfusionApparatus: dialyzer_perfusion_apparatus,
+			DialysisDialyszers:         dialyzer_perfusion_apparatus,
+		}
+		service.UpdateDialysisPrescriptionOne(prescription, patient_id, startTime)
+	}
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -20,4 +20,5 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/deleteSchedule", &StaffScheduleApiController{}, "Get:DeleteSchedule")
 	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")
 	beego.Router("/m/api/updatepatientschedule", &StaffScheduleApiController{}, "Get:UpdatePatientScheduleById")
+	beego.Router("/m/api/updateschedule", &StaffScheduleApiController{}, "Get:UpdateBloodSchedule")
 }

models/device_models.go

@@ -1056,26 +1056,53 @@ type VmXtSchedule struct {
 }
 
 type PatientDeviceNumber struct {
-	ID            int64         `gorm:"column:id" json:"id"`
-	OrgID         int64         `gorm:"column:org_id" json:"-"`
-	Number        string        `gorm:"column:number" json:"number"`
-	GroupID       int64         `gorm:"column:group_id" json:"group_id"`
-	ZoneID        int64         `gorm:"column:zone_id" json:"zone_id"`
-	CreateTime    int64         `gorm:"column:ctime" json:"-"`
-	ModifyTime    int64         `gorm:"column:mtime" json:"-"`
-	Sort          int64         `gorm:"column:sort" json:"sort" form:"sort"`
-	PartitionId   int64         `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId         int64         `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId     int64         `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate  int64         `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType  int64         `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek  int64         `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId        int64         `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Name          string        `gorm:"column:name" json:"name"`
-	Patient       Patients      `json:"patient"  gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
-	DeviceZone    DeviceZone    `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber  DeviceNumber  `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	TreatmentMode TreatmentMode `json:"mode" gorm:"foreignkey:ModeId"`
-	DialysisOrder DialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	Schedule      Schedule      `json:"schedule"  gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
+	ID       int64           `gorm:"column:id" json:"id" form:"id"`
+	OrgId    int64           `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number   string          `gorm:"column:number" json:"number" form:"number"`
+	GroupId  int64           `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId   int64           `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	Status   int64           `gorm:"column:status" json:"status" form:"status"`
+	Ctime    int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime    int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Sort     int64           `gorm:"column:sort" json:"sort" form:"sort"`
+	Schedule []*BlodSchedule `json:"schedule" gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
+}
+
+func (PatientDeviceNumber) TableName() string {
+
+	return "xt_device_number"
+}
+
+type PatientDialysisOrder struct {
+	ID                     int64  `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate           int64  `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	UserOrgId              int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId              int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PrescriptionId         int64  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Stage                  int64  `gorm:"column:stage" json:"stage" form:"stage"`
+	Remark                 string `gorm:"column:remark" json:"remark" form:"remark"`
+	BedId                  int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	StartNurse             int64  `gorm:"column:start_nurse" json:"start_nurse" form:"start_nurse"`
+	FinishNurse            int64  `gorm:"column:finish_nurse" json:"finish_nurse" form:"finish_nurse"`
+	Status                 int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime            int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime            int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	PunctureNurse          int64  `gorm:"column:puncture_nurse" json:"puncture_nurse" form:"puncture_nurse"`
+	Creator                int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	FinishCreator          int64  `gorm:"column:finish_creator" json:"finish_creator" form:"finish_creator"`
+	FinishModifier         int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
+	SchedualType           int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
+	StartTime              int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime                int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	WashpipeNurse          int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	ChangeNurse            int64  `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
+	DifficultPunctureNurse int64  `gorm:"column:difficult_puncture_nurse" json:"difficult_puncture_nurse" form:"difficult_puncture_nurse"`
+	NewFistulaNurse        int64  `gorm:"column:new_fistula_nurse" json:"new_fistula_nurse" form:"new_fistula_nurse"`
+	ZoneId                 int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+}
+
+func (PatientDialysisOrder) TableName() string {
+
+	return "xt_dialysis_order"
 }

models/schedule_models.go

@@ -44,12 +44,12 @@ type Schedule struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient       string        `gorm:"-" json:"patient" form:"patient"`
-	DeviceZone    DeviceZone    `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber  DeviceNumber  `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	TreatmentMode TreatmentMode `json:"mode" gorm:"foreignkey:ModeId"`
-	DialysisOrder DialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-
+	Patient                   string               `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone                DeviceZone           `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber              DeviceNumber         `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	TreatmentMode             TreatmentMode        `json:"mode" gorm:"foreignkey:ModeId"`
+	DialysisOrder             DialysisOrder        `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisPrescription      DialysisPrescription `json:"order" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
 	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
@@ -233,3 +233,59 @@ type WeekScheduleSix struct {
 func (WeekScheduleSix) TableName() string {
 	return "xt_schedule"
 }
+
+type BlodSchedule 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"`
+	PartitionId               int64                     `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64                     `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId                 int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate              int64                     `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType              int64                     `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek              int64                     `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId                    int64                     `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                    int64                     `gorm:"column:status" json:"status" form:"status"`
+	VmBloodPatients           VmBloodPatients           `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	BloodDialysisOrder        BloodPatientDialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	BloodDialysisPrescription BloodDialysisPrescription `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
+}
+
+func (BlodSchedule) TableName() string {
+	return "xt_schedule"
+}
+
+type BloodPatientDialysisOrder struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Stage        int64 `gorm:"column:stage" json:"stage" form:"stage"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+}
+
+func (BloodPatientDialysisOrder) TableName() string {
+	return "xt_dialysis_order"
+}
+
+type BloodPatientDialysisPrescription struct {
+	ID                         int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId                  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MachineType                string `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+}
+
+func (BloodPatientDialysisPrescription) TableName() string {
+	return "xt_dialysis_prescription"
+}
+
+type VmBloodPatients struct {
+	ID    int64  `gorm:"column:id" json:"id" form:"id"`
+	BedId int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name  string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (VmBloodPatients) TableName() string {
+	return "xt_patients"
+}

service/doctor_schedule_service.go

@@ -598,26 +598,38 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	return schedule, err
 }
 
-func GetPatientScheduleByBed(startime int64, zoneid int64, classtype int64, orgid int64) (list []*models.PatientDeviceNumber, err error) {
+func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64) (list []*models.PatientDeviceNumber, err error) {
 
 	db := XTReadDB().Table("xt_device_number as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_schedule as s").Where("s.status = 1")
-	p := XTReadDB().Table("xt_patients as p").Where("p.status = 1")
-	fmt.Println(table, p)
 	if zoneid > 0 {
-		db = db.Where("s.zone_id = ?", zoneid)
+		db = db.Where("x.zone_id = ?", zoneid)
 	}
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	if classtype > 0 {
-		db = db.Where("s.schedule_type = ?", classtype)
-	}
+	err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
+		return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ?", orgid, schedule_date).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1").Preload("BloodDialysisPrescription", "status = 1")
+	}).Find(&list).Error
 
-	err = db.Select("x.id,x.number,x.group_id,x.zone_id,x.sort,s.partition_id,s.bed_id,s.patient_id,s.schedule_date,s.schedule_type,s.schedule_week,s.mode_id").Joins("left join xt_schedule as s on s.bed_id = x.id").Where("s.schedule_date = ?", startime).Scan(&list).Error
 	return list, err
 }
 
+func GetPatientDialysisOrderDate(shcedule_date int64, class_type int64, orgid int64) (schedule []*models.Schedule, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if shcedule_date > 0 {
+		db = db.Where("x.schedule_date = ?", shcedule_date)
+	}
+	if class_type > 0 {
+		db = db.Where("x.schedule_type = ?", class_type)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id").Preload("DialysisOrder", "status = 1").Preload("DialysisPrescription", "status = 1").Find(&schedule).Error
+	return schedule, err
+}
+
 func DeleteSchedule(id int64) error {
 
 	schedule := models.XtSchedule{}
@@ -655,3 +667,37 @@ func UpdateStaffScheduleOne(nextid int64, schedule models.WeekSchedule) error {
 	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
 	return err
 }
+
+func UpdatedSchedule(schedule models.XtSchedule, id int64) error {
+
+	xtSchedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&xtSchedule).Where("id = ? and status =1", id).Updates(map[string]interface{}{"schedule_type": schedule.ScheduleType, "mode_id": schedule.ModeId}).Error
+	return err
+}
+
+func GetDialyisSolution(patientid int64, recorddate int64) (*models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+
+	err := XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and status = 1", patientid, recorddate).Find(&prescription).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &prescription, nil
+}
+
+func CreateDialysisPrescription(prescription models.DialysisPrescription) error {
+
+	err := XTReadDB().Create(&prescription).Error
+
+	return err
+}
+
+func UpdateDialysisPrescriptionOne(prescription models.DialysisPrescription, patientid int64, recordate int64) error {
+
+	err := XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and status = 1", patientid, recordate).Updates(map[string]interface{}{"dialyzers": prescription.Dialyzer, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus}).Error
+	return err
+}

service/user_service.go

@@ -138,9 +138,7 @@ func GetLastData(orgid int64) (models.SgjPatientDryweight, error) {
 }
 
 func UpdateDialysisPrescription(patientid int64, orgid int64, dryweight float64, prescription models.PredialysisEvaluation) error {
-	fmt.Println("patientid", patientid)
-	fmt.Println("orgid", orgid)
-	fmt.Println("dryweight", dryweight)
+
 	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ?", patientid, orgid).Update(map[string]interface{}{"dry_weight": dryweight, "mtime": time.Now().Unix()}).Last(&prescription).Error
 	fmt.Println("错误是设么", err)
 	return err