11月9日库存管理

controllers/dialysis_api_controller.go

@@ -93,6 +93,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/savehisdialysis", &DialysisApiController{}, "Get:SaveHisDialysis")
 
 	beego.Router("/api/patient/gethisdialysisgoodcount", &DialysisApiController{}, "Get:GetHisDialysisGoodCount")
+
+	beego.Router("/api/schedule/getpatientshedule", &DialysisApiController{}, "Get:GetPatientSchedule")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -301,6 +303,9 @@ func (c *DialysisApiController) PostPrescription() {
 	epo_count, _ := c.GetFloat("epo_count", 0)
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	is_water, _ := c.GetInt64("is_water")
+	drhy_water := c.GetString("drhy_water")
+	dry_water_hour := c.GetString("dry_water_hour")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -402,6 +407,9 @@ func (c *DialysisApiController) PostPrescription() {
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		AdminUserId:                admin_user_id,
+		IsWater:                    is_water,
+		DrhyWater:                  drhy_water,
+		DryWaterHour:               dry_water_hour,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -627,6 +635,9 @@ func (c *DialysisApiController) PostSoulution() {
 	preImpules, parseDateErr := strconv.ParseFloat(impulse, 64)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	fmt.Println("", preImpules)
+	is_water, _ := c.GetInt64("is_water")
+	dry_water_hour := c.GetString("dry_water_hour")
+	drhy_water := c.GetString("drhy_water")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -740,6 +751,9 @@ func (c *DialysisApiController) PostSoulution() {
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		PreImpulse:                 preImpules,
 		AdminUserId:                admin_user_id,
+		IsWater:                    is_water,
+		DryWaterHour:               dry_water_hour,
+		DrhyWater:                  drhy_water,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -4608,3 +4622,17 @@ func (this *DialysisApiController) GetHisDialysisGoodCount() {
 	})
 	return
 }
+
+func (this *DialysisApiController) GetPatientSchedule() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	patient_id, _ := this.GetInt64("patient_id")
+	schedule_date, _ := this.GetInt64("schedule_date")
+
+	schedulePatient, _ := service.GetScheduleByPatient(patient_id, schedule_date, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedulePatient": schedulePatient,
+	})
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1358,6 +1358,21 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	is_water := c.GetString("is_water")
+	var is_war int64
+	if is_water == "是" {
+		is_war = 1
+	}
+	if is_water == "否" {
+		is_war = 2
+	}
+	if is_water == "请选择" {
+		is_war = 0
+	}
+	drhy_water := c.GetString("drhy_water")
+
+	dry_water_hour := c.GetString("dry_water_hour")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1464,6 +1479,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		AdminUserId:                admin_user_id,
+		IsWater:                    is_war,
+		DrhyWater:                  drhy_water,
+		DryWaterHour:               dry_water_hour,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1814,7 +1832,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2404,6 +2422,10 @@ func (this *DialysisAPIController) StartDialysis() {
 	if newdialysisRecord.ID > 0 {
 		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 {
 			record.Temperature = 36.5
+			//var pressure string
+			//pressure = "-"
+			//floatPressure, _ := strconv.ParseFloat(pressure, 64)
+			//record.ArterialPressure = floatPressure
 		}
 		err := service.CreateMonitor(&record)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
@@ -2551,6 +2573,21 @@ func (c *DialysisAPIController) PostSolution() {
 	pre_impulse := c.GetString("pre_impulse")
 	impulse, _ := strconv.ParseFloat(pre_impulse, 64)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	is_water := c.GetString("is_water")
+	var is_war int64
+	if is_water == "是" {
+		is_war = 1
+	}
+	if is_water == "否" {
+		is_war = 2
+	}
+	if is_water == "请选择" {
+		is_war = 0
+	}
+	drhy_water := c.GetString("drhy_water")
+	dry_water_hour := c.GetString("dry_water_hour")
+
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2658,6 +2695,9 @@ func (c *DialysisAPIController) PostSolution() {
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		PreImpulse:                 impulse,
 		AdminUserId:                admin_user_id,
+		IsWater:                    is_war,
+		DrhyWater:                  drhy_water,
+		DryWaterHour:               dry_water_hour,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -6904,3 +6944,15 @@ func (this *DialysisAPIController) GetPatientSign() {
 		"dialysisOrder": dialysisOrder,
 	})
 }
+
+func (this *DialysisAPIController) GetScheduleByPatient() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	schedule_date, _ := this.GetInt64("schedule_date")
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	schedule, _ := service.GetScheduleByPatient(patient_id, schedule_date, orgid)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -170,4 +170,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/savepatientsign", &DialysisAPIController{}, "Post:SavePatientSign")
 	beego.Router("/m/api/getpatientsign", &DialysisAPIController{}, "Get:GetPatientSign")
 
+	beego.Router("/m/api/patient/getschedulebypatient", &DialysisAPIController{}, "Get:GetScheduleByPatient")
+
 }

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -518,8 +518,7 @@ func (this *StaffScheduleApiController) GetSchedulePatient() {
 	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
 	weekStart := theStarTime.Unix()
 	weekEnd := theEndTime.Unix()
-
-	patients, _ := service.GetPatientWithScheduleAndSolution(adminInfo.Org.Id, keywords, weekStart, weekEnd, schedule, contagion)
+	patients, _ := service.GetPatientWithScheduleAndSolutionTwo(adminInfo.Org.Id, keywords, weekStart, weekEnd, schedule, contagion)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,

models/device_models.go

@@ -1153,3 +1153,24 @@ type SgjDeviceNumber struct {
 func (SgjDeviceNumber) TableName() string {
 	return "xt_device_number"
 }
+
+type XtScheduleSix 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"`
+	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+}
+
+func (XtScheduleSix) TableName() string {
+
+	return "xt_schedule"
+}

models/patient_models.go

@@ -322,6 +322,9 @@ type DialysisPrescription struct {
 	EpoCount                   float64       `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     float64       `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 	AdminUserId                int64         `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	IsWater                    int64         `gorm:"column:is_water" json:"is_water" form:"is_water"`
+	DrhyWater                  string        `gorm:"column:drhy_water" json:"drhy_water" form:"drhy_water"`
+	DryWaterHour               string        `gorm:"column:dry_water_hour" json:"dry_water_hour" form:"dry_water_hour"`
 }
 
 func (DialysisPrescription) TableName() string {

service/dialysis_service.go

@@ -1805,3 +1805,10 @@ func GetPatientSign(patient_id int64, dialysis_date int64, orgid int64) (models.
 	err := XTReadDB().Where("patient_id=? and dialysis_date = ? and user_org_id = ? and status = 1", patient_id, dialysis_date, orgid).Find(&order).Error
 	return order, err
 }
+
+func GetScheduleByPatient(patient_id int64, schedule_date int64, orgid int64) (models.XtScheduleSix, error) {
+
+	schedule := models.XtScheduleSix{}
+	err := XTReadDB().Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, orgid).Find(&schedule).Error
+	return schedule, err
+}

service/schedule_service.go

@@ -66,6 +66,20 @@ func GetPatientWithScheduleAndSolution(orgID int64, keywords string, weekStart,
 	return
 }
 
+func GetPatientWithScheduleAndSolutionTwo(orgID int64, keywords string, weekStart, weekEnd, schedule, contagion int64) (patients []*models.Patients, err error) {
+	db := readDb.Table("xt_patients as p").
+		Preload("DialysisSolutions", "user_org_id=? and initiate_mode=1 and affirm_state=1 and parent_id=0 and status=1", orgID).
+		//Preload("Schedules", "user_org_id=? and schedule_date>=? and schedule_date<= ? and status=1", orgID, weekStart, weekEnd).
+		Where("p.user_org_id=? and p.lapseto=1 and p.status=1", orgID)
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("p.name LIKE ?", likeKey)
+	}
+
+	err = db.Find(&patients).Error
+	return
+}
+
 func GetWeekSchedule(orgID int64, start, end int64) (schedules []*models.Schedule, err error) {
 
 	err = readDb.Table("xt_schedule as s").Preload("PatientInfectiousDiseases", "status = 1 ").