库存调拨修改

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -69,36 +70,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 1//4，809
-		//userAdmin.Mobile = "12222222222"
-		//userAdmin.IsSuperAdmin = true
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 11
-		//subscibe.OrgId = 14//机构id
-		//subscibe.PeriodStart = 1547447814
-		//subscibe.PeriodEnd = 1550039814
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
-		//adminUserInfo.CurrentAppId = 14//4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "15717313968"
+
+		userAdmin.Id = 1 //4，809
+		userAdmin.Mobile = "12222222222"
+		userAdmin.IsSuperAdmin = true
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 11
+		subscibe.OrgId = 10447 //机构id
+		subscibe.PeriodStart = 1547447814
+		subscibe.PeriodEnd = 1550039814
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 10447 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 10340 //4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
@@ -315,35 +316,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 1//4，809
-		//userAdmin.Mobile = "12222222222"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 11
-		//subscibe.OrgId = 14//机构id小英9675或4
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
-		//adminUserInfo.CurrentAppId = 14//4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "15717313968"
+
+		userAdmin.Id = 1 //4，809
+		userAdmin.Mobile = "12222222222"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 11
+		subscibe.OrgId = 10447 //机构id小英9675或4
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 10447 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 10340 //4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/dialysis_record_api_controller.go

@@ -1163,7 +1163,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		if newdialysisRecord.ID > 0 {
 
 			//针对长沙南雅医院
-			if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
+			if adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
 
 				record.Temperature = 36.5
 				record.ArterialPressure = -100
@@ -1173,6 +1173,13 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				record.VenousPressure = 80
 				record.TransmembranePressure = 60
 			}
+			//针对新化博翔
+			if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10447 {
+				record.BloodOxygenSaturation = "99"
+				record.Conductivity = 14
+				record.DialysateTemperature = 36.5
+				record.BreathingRate = "20"
+			}
 
 			//针对兰溪人民医院的需求
 			if adminUserInfo.CurrentOrgId == 10432 {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2512,7 +2512,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	// 如果当天有插入数据，则不再往透析纪录里插入数据
 	if newdialysisRecord.ID > 0 {
-		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 {
+		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9675 {
 			record.Temperature = 36.5
 			record.ArterialPressure = -100
 			record.DialysateTemperature = 36.5
@@ -2521,6 +2521,13 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.VenousPressure = 80
 			record.TransmembranePressure = 60
 		}
+		//针对新化博翔
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10447 {
+			record.BloodOxygenSaturation = "99"
+			record.Conductivity = 14
+			record.DialysateTemperature = 36.5
+			record.BreathingRate = "20"
+		}
 		//针对兰溪人民医院的需求
 		if adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 9671 {
 			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -929,6 +929,8 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			DialysisMachineName: str,
 		}
 		service.DeleteSchedule(id)
+		//清除该患者当天的排班
+		service.DeleteScheduleByPatientId(patient_id, schedule_date, org_id)
 		service.CreateSchedule(&xtSchedule)
 	}
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/patient_dataconfig_api_controller.go

@@ -100,7 +100,7 @@ func (this *PatientDataConfigAPIController) CreateCourse() {
 		return
 	}
 
-	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", record_time_str)
+	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
 	adminUserInfo := this.GetAdminUserInfo()
 	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
@@ -330,8 +330,11 @@ func (this *PatientDataConfigAPIController) ModifyCourse() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", record_time_str)
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
+	fmt.Println("checkDate--------------", checkDate)
 	adminUserInfo := this.GetAdminUserInfo()
 	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
 	if getPatientErr != nil {

models/patient_models.go

@@ -1731,34 +1731,35 @@ func (NewDialysisSolution) TableName() string {
 }
 
 type NewDialysisPrescription struct {
-	ID                     int64   `gorm:"column:id" json:"id"`
-	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId              int64   `gorm:"column:patient_id" json:"patient_id"`
-	Dialyzer               int64   `gorm:"column:dialyzer" json:"dialyzer"`
-	Anticoagulant          int64   `gorm:"column:anticoagulant" json:"anticoagulant"`
-	AnticoagulantShouji    float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji"`
-	AnticoagulantWeichi    float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi"`
-	AnticoagulantZongliang float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang"`
-	ModeId                 int64   `gorm:"column:mode_id" json:"mode_id"`
-	DialysisDuration       float64 `gorm:"column:dialysis_duration" json:"dialysis_duration"`
-	ReplacementTotal       float64 `gorm:"column:replacement_total" json:"replacement_total"`
-	ReplacementWay         int64   `gorm:"column:replacement_way" json:"replacement_way"`
-	HemodialysisMachine    int64   `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine"`
-	Remark                 string  `gorm:"column:remark" json:"remark"`
-	Status                 int64   `gorm:"column:status" json:"status"`
-	RecordDate             int64   `gorm:"column:record_date" json:"record_date"`
-	DialysisDurationHour   int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour"`
-	DialysisDurationMinute int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute"`
-	DialysateFormulation   int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation"`
-	TargetUltrafiltration  float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
-	BloodAccess            int64   `gorm:"column:blood_access" json:"blood_access"`
-	Ultrafiltration        float64 `gorm:"column:ultrafiltration" json:"ultrafiltration"`
-	Dialyzers              int64   `gorm:"column:dialyzers" json:"dialyzers"`
-	Blood                  string  `gorm:"column:blood" json:"blood"`
-	DialysisDialyszers     string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
-	DialysisIrrigation     string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	DialysisRemark         string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	ID                         int64   `gorm:"column:id" json:"id"`
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id"`
+	Dialyzer                   int64   `gorm:"column:dialyzer" json:"dialyzer"`
+	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant"`
+	AnticoagulantShouji        float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji"`
+	AnticoagulantWeichi        float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi"`
+	AnticoagulantZongliang     float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang"`
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id"`
+	DialysisDuration           float64 `gorm:"column:dialysis_duration" json:"dialysis_duration"`
+	ReplacementTotal           float64 `gorm:"column:replacement_total" json:"replacement_total"`
+	ReplacementWay             int64   `gorm:"column:replacement_way" json:"replacement_way"`
+	HemodialysisMachine        int64   `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine"`
+	Remark                     string  `gorm:"column:remark" json:"remark"`
+	Status                     int64   `gorm:"column:status" json:"status"`
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date"`
+	DialysisDurationHour       int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour"`
+	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute"`
+	DialysateFormulation       int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
+	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
+	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration"`
+	Dialyzers                  int64   `gorm:"column:dialyzers" json:"dialyzers"`
+	Blood                      string  `gorm:"column:blood" json:"blood"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	AdminUserId                int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
 }
 
 func (NewDialysisPrescription) TableName() string {

service/auto_create_week_disinfection.go

@@ -15,8 +15,8 @@ var createWeekDisinfectionCronJob *cron.Cron
 
 func init() {
 	createWeekDisinfectionCronJob = cron.New()
-	//spec := "0 0 23 * * ?" // 每天23点执行一次
-	spec := "0 55 23 * * ?" // 每天23点55执行一次
+	spec := "0 50 23 * * ?" // 每天23点执行一次
+	//spec := "0 55 23 * * ?" // 每天23点55执行一次
 	//spec := "0 0 5 * * ?" // 每天23点55执行一次
 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
 	createWeekDisinfectionCronJob.AddFunc(spec, func() {
@@ -31,6 +31,7 @@ func BeginAutoCreateWeekDisinfectionJob() {
 }
 
 func AutoCreateWeekDisinfectionJob() {
+	fmt.Println("开始执行-----------------------------------------------")
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
 	fmt.Println("timeStr:", timeStr)
@@ -173,7 +174,7 @@ func AutoCreateWeekDisinfectionJob() {
 //	return org, err
 //}
 
-//查询当天有排班的所有机构
+// 查询当天有排班的所有机构
 func GetAllOrgID(time int64) (schedule []*models.XtSchedule, err error) {
 
 	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error

service/doctor_schedule_service.go

@@ -686,6 +686,13 @@ func DeleteSchedule(id int64) error {
 	return err
 }
 
+func DeleteScheduleByPatientId(patient_id int64, schedule_date int64, user_org_id int64) (models.XtSchedules, error) {
+
+	schedules := models.XtSchedules{}
+	err := XTWriteDB().Model(&schedules).Where("patient_id = ? and schedule_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return schedules, err
+}
+
 func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []*models.Schedule, err error) {
 
 	likeKey := "%" + keywords + "%"

service/schedule_service.go

@@ -10,7 +10,7 @@ import (
 	"github.com/jinzhu/gorm"
 )
 
-//GetSchedulePartitionPanel 取出排班面板，分区-机号
+// GetSchedulePartitionPanel 取出排班面板，分区-机号
 func GetSchedulePartitionPanel(orgID int64) (partitions []*models.Partition, err error) {
 
 	err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Order("").Find(&partitions).Error
@@ -320,7 +320,7 @@ func UpdateScheduleOne(id int64, schedule models.Schedule) error {
 	return err
 }
 
-//参数一：当前操作的患者的排班     参数二被替换床位对应的排班
+// 参数一：当前操作的患者的排班     参数二被替换床位对应的排班
 func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 	utx := XTWriteDB()
 	//床位
@@ -355,7 +355,6 @@ func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 	schone.IsExport = 9000
 	schtwo.IsExport = 9000
 
-	utx.Model(&models.Schedule{}).Where("id = ?", schone.ID).Updates(map[string]interface{}{"partition_id": schone.PartitionId, "bed_id": schone.BedId, "schedule_type": schone.ScheduleType, "is_export": 9000})
 	utx.Model(&models.Schedule{}).Where("id = ?", schtwo.ID).Updates(map[string]interface{}{"partition_id": schtwo.PartitionId, "bed_id": schtwo.BedId, "schedule_type": schtwo.ScheduleType, "is_export": 9000})
 
 }