历史排班

controllers/base_api_controller.go

@@ -73,7 +73,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 10344 //4，809
+		userAdmin.Id = 10579 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id 10344
+		subscibe.OrgId = 10344 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17282 //4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id小英10344或4
+		subscibe.OrgId = 10344 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,8 +336,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17282 //4
+		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/data_api_controller.go

@@ -884,7 +884,7 @@ func (c *DataApiController) UpdateExecutionFrequency() {
 	ef.UpdatedTime = timeNow
 	ef.Name = efdata.Name
 	ef.Code = efdata.Code
-
+	ef.Count = efdata.Count
 	err = service.UpdateExecutionFrequency(ef)
 	if err != nil {
 		utils.ErrorLog("%v", err)

controllers/dialysis_api_controller.go

@@ -141,6 +141,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getgathersetting", &DialysisApiController{}, "Get:GetGatherSetting")
 
 	beego.Router("/api/patient/getdialysisgatherlist", &DialysisApiController{}, "Get:GetDialysisGatherList")
+
+	beego.Router("/api/getpatientdialysisrecordlist", &DialysisApiController{}, "Get:GetPatientDialysisRecordList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -7618,3 +7620,52 @@ func (this *DialysisApiController) GetDialysisGatherList() {
 	})
 	return
 }
+
+func (this *DialysisApiController) GetPatientDialysisRecordList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	var startdateunix 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
+		}
+		startdateunix = theTime.Unix()
+	}
+	var enddateunix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		enddateunix = theTime.Unix()
+	}
+
+	org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	if org_id == 9538 || org_id == 10101 || org_id == 10353 {
+		list, _ := service.GetPatientDialysisRecordList(patient_id, startdateunix, enddateunix)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	} else {
+		list, _ := service.GetPatientDialysisRecordListOne(patient_id, startdateunix, enddateunix)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+
+	return
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -428,6 +428,11 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Remark = lastDialysisPrescription.Remark
 			}
 
+			//恒泰
+			if adminUserInfo.Org.Id == 10490 {
+				newprescribe.Remark = ""
+			}
+
 			//针对普宁和揭阳
 			if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10599 {
 				prescriptionTwenty, _ := service.GetLastDialysisPrescriptionTwenty(newprescribe.PatientId, newprescribe.RecordDate, newprescribe.UserOrgId)
@@ -524,9 +529,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Status = 1
-				if adminUserInfo.Org.Id != 10490 {
-					newprescribe.Remark = lastDialysisPrescribe.Remark
-				} else {
+				//if adminUserInfo.Org.Id != 10490 {
+				//	newprescribe.Remark = lastDialysisPrescribe.Remark
+				//} else {
+				//	newprescribe.Remark = ""
+				//}
+				if adminUserInfo.Org.Id == 10490 {
 					newprescribe.Remark = ""
 				}
 
@@ -1226,7 +1234,126 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 			if daySchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				sc["mode"] = daySchedule[0].Schedule.ModeId
+				var mode = "HD"
+				if daySchedule[0].Schedule.ModeId == 1 {
+					mode = "HD"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 2 {
+					mode = "HDF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 3 {
+					mode = "HD+HP"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 4 {
+					mode = "HP"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 5 {
+					mode = "HF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 6 {
+					mode = "SCUF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 7 {
+					mode = "IUF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 8 {
+					mode = "HFHD"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 9 {
+					mode = "HFHD+HP"
+				}
+				if daySchedule[0].Schedule.ModeId == 10 {
+					mode = "PHF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 11 {
+					mode = "HFR"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 12 {
+					mode = "HDF+HP"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 13 {
+					mode = "CRRT"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 14 {
+					mode = "腹水回输"
+				}
+				if daySchedule[0].Schedule.ModeId == 19 {
+					mode = "IUF+HD"
+				}
+				if daySchedule[0].Schedule.ModeId == 20 {
+					mode = "UF"
+				}
+				if daySchedule[0].Schedule.ModeId == 21 {
+					mode = "HD+"
+				}
+				if daySchedule[0].Schedule.ModeId == 22 {
+					mode = "血浆胆红素吸附+HDF"
+				}
+				if daySchedule[0].Schedule.ModeId == 23 {
+					mode = "血浆胆红素吸附"
+				}
+				if daySchedule[0].Schedule.ModeId == 24 {
+					mode = "I-HDF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 25 {
+					mode = "HD高通"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 26 {
+					mode = "CVVH"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 27 {
+					mode = "CVVHD"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 28 {
+					mode = "CVVHDF"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 29 {
+					mode = "PE"
+				}
+
+				if daySchedule[0].Schedule.ModeId == 30 {
+					mode = "血浆胆红素吸附+HP"
+				}
+				if daySchedule[0].Schedule.ModeId == 31 {
+					mode = "HPD"
+				}
+				if daySchedule[0].Schedule.ModeId == 32 {
+					mode = "HDP"
+				}
+				if daySchedule[0].Schedule.ModeId == 33 {
+					mode = "HFD"
+				}
+				if daySchedule[0].Schedule.ModeId == 34 {
+					mode = "HDF100"
+				}
+				if daySchedule[0].Schedule.ModeId == 35 {
+					mode = "HDF600"
+				}
+				if daySchedule[0].Schedule.ModeId == 36 {
+					mode = "HDF800"
+				}
+				if daySchedule[0].Schedule.ModeId == 37 {
+					mode = "HDF1000"
+				}
+
+				sc["mode"] = mode
 				sc["data"] = daySchedule
 			} else {
 				sc["code"] = 1
@@ -1254,7 +1381,125 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 			if nextSchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				sc["mode"] = nextSchedule[0].Schedule.ModeId
+				var mode = "HD"
+				if nextSchedule[0].Schedule.ModeId == 1 {
+					mode = "HD"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 2 {
+					mode = "HDF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 3 {
+					mode = "HD+HP"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 4 {
+					mode = "HP"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 5 {
+					mode = "HF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 6 {
+					mode = "SCUF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 7 {
+					mode = "IUF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 8 {
+					mode = "HFHD"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 9 {
+					mode = "HFHD+HP"
+				}
+				if nextSchedule[0].Schedule.ModeId == 10 {
+					mode = "PHF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 11 {
+					mode = "HFR"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 12 {
+					mode = "HDF+HP"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 13 {
+					mode = "CRRT"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 14 {
+					mode = "腹水回输"
+				}
+				if nextSchedule[0].Schedule.ModeId == 19 {
+					mode = "IUF+HD"
+				}
+				if nextSchedule[0].Schedule.ModeId == 20 {
+					mode = "UF"
+				}
+				if nextSchedule[0].Schedule.ModeId == 21 {
+					mode = "HD+"
+				}
+				if nextSchedule[0].Schedule.ModeId == 22 {
+					mode = "血浆胆红素吸附+HDF"
+				}
+				if nextSchedule[0].Schedule.ModeId == 23 {
+					mode = "血浆胆红素吸附"
+				}
+				if nextSchedule[0].Schedule.ModeId == 24 {
+					mode = "I-HDF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 25 {
+					mode = "HD高通"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 26 {
+					mode = "CVVH"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 27 {
+					mode = "CVVHD"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 28 {
+					mode = "CVVHDF"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 29 {
+					mode = "PE"
+				}
+
+				if nextSchedule[0].Schedule.ModeId == 30 {
+					mode = "血浆胆红素吸附+HP"
+				}
+				if nextSchedule[0].Schedule.ModeId == 31 {
+					mode = "HPD"
+				}
+				if nextSchedule[0].Schedule.ModeId == 32 {
+					mode = "HDP"
+				}
+				if nextSchedule[0].Schedule.ModeId == 33 {
+					mode = "HFD"
+				}
+				if nextSchedule[0].Schedule.ModeId == 34 {
+					mode = "HDF100"
+				}
+				if nextSchedule[0].Schedule.ModeId == 35 {
+					mode = "HDF600"
+				}
+				if nextSchedule[0].Schedule.ModeId == 36 {
+					mode = "HDF800"
+				}
+				if nextSchedule[0].Schedule.ModeId == 37 {
+					mode = "HDF1000"
+				}
+				sc["mode"] = mode
 				sc["data"] = nextSchedule
 			} else {
 				sc["code"] = 1
@@ -1265,65 +1510,65 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		}
 	}
 
-	switch sc["mode"] {
-	case 1:
-		sc["mode"] = "HD"
-		break
-	case 2:
-		sc["mode"] = "HDF"
-		break
-	case 3:
-		sc["mode"] = "HD+HP"
-		break
-	case 4:
-		sc["mode"] = "HP"
-		break
-	case 5:
-		sc["mode"] = "HF"
-		break
-	case 6:
-		sc["mode"] = "SCUF"
-		break
-	case 7:
-		sc["mode"] = "IUF"
-		break
-	case 8:
-		sc["mode"] = "HFHD"
-		break
-	case 9:
-		sc["mode"] = "HFHD+HP"
-		break
-	case 10:
-		sc["mode"] = "PHF"
-		break
-	case 11:
-		sc["mode"] = "HFR"
-		break
-	case 12:
-		sc["mode"] = "HDF+HP"
-		break
-	case 13:
-		sc["mode"] = "CRRT"
-		break
-	case 14:
-		sc["mode"] = "腹水回输"
-		break
-	case 15:
-		sc["mode"] = "HD前置换"
-		break
-	case 16:
-		sc["mode"] = "HD后置换"
-		break
-	case 17:
-		sc["mode"] = "HDF前置换"
-		break
-	case 18:
-		sc["mode"] = "HDF后置换"
-		break
-	default:
-		sc["mode"] = "HD"
-		break
-	}
+	//switch sc["mode"] {
+	//case 1:
+	//	sc["mode"] = "HD"
+	//	break
+	//case 2:
+	//	sc["mode"] = "HDF"
+	//	break
+	//case 3:
+	//	sc["mode"] = "HD+HP"
+	//	break
+	//case 4:
+	//	sc["mode"] = "HP"
+	//	break
+	//case 5:
+	//	sc["mode"] = "HF"
+	//	break
+	//case 6:
+	//	sc["mode"] = "SCUF"
+	//	break
+	//case 7:
+	//	sc["mode"] = "IUF"
+	//	break
+	//case 8:
+	//	sc["mode"] = "HFHD"
+	//	break
+	//case 9:
+	//	sc["mode"] = "HFHD+HP"
+	//	break
+	//case 10:
+	//	sc["mode"] = "PHF"
+	//	break
+	//case 11:
+	//	sc["mode"] = "HFR"
+	//	break
+	//case 12:
+	//	sc["mode"] = "HDF+HP"
+	//	break
+	//case 13:
+	//	sc["mode"] = "CRRT"
+	//	break
+	//case 14:
+	//	sc["mode"] = "腹水回输"
+	//	break
+	//case 15:
+	//	sc["mode"] = "HD前置换"
+	//	break
+	//case 16:
+	//	sc["mode"] = "HD后置换"
+	//	break
+	//case 17:
+	//	sc["mode"] = "HDF前置换"
+	//	break
+	//case 18:
+	//	sc["mode"] = "HDF后置换"
+	//	break
+	//default:
+	//	sc["mode"] = "HD"
+	//	break
+	//}
 
 	// 获取患者透前干体重或者获取患者透前体重
 	var dry_weight map[string]interface{}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -399,7 +399,7 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 	}
 
 	//针对百霖和贝尔
-	if orgid == 10138 || orgid == 10278 || orgid == 3877 {
+	if orgid == 10138 || orgid == 10278 || orgid == 3877 || orgid == 10585 {
 		//获取今日的排班数据
 		list, _ := service.GetMobileScheduleListByScheduleDate(orgid, startTime)
 		for _, item := range list {
@@ -409,6 +409,30 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 		}
 	}
 
+	//查询排班里面的空透析器
+	if orgid == 10375 {
+
+		schedulesFive, _ := service.GetMobileScheduleListByScheduleDateOne(orgid, startTime)
+
+		for _, item := range schedulesFive {
+			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+			var DialysisMachineName string
+			if len(solution.DialysisDialyszers) > 0 {
+				DialysisMachineName = solution.DialysisDialyszers
+			}
+			if len(solution.DialyzerPerfusionApparatus) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+			}
+
+			if len(solution.DialysisIrrigation) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+			}
+			item.DialysisMachineName = DialysisMachineName
+			service.UpdateSchOne(item.ID, item.DialysisMachineName)
+		}
+
+	}
+
 	// stockType, _ := service.GetStockType(orgid)
 	//zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 	// if err != nil {
@@ -522,6 +546,10 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 			if len(advice) > 0 {
 				service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)
 			}
+			project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, org_id)
+			if len(project) > 0 {
+				service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, org_id)
+			}
 		}
 		redis := service.RedisClient()
 		//处方

controllers/schedule_api_controller.go

@@ -2012,11 +2012,15 @@ func (c *ScheduleApiController) DeleteSchedule() {
 		}
 	}
 
-	if adminINfo.CurrentOrgId == 10206 {
+	if adminINfo.CurrentOrgId == 10206 || adminINfo.CurrentOrgId == 10344 {
 		hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 		if len(hisAdvice) > 0 {
 			service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 		}
+		if len(project) > 0 {
+			service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		}
 	}
 
 	redis := service.RedisClient()
@@ -4559,7 +4563,7 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	}
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 
-	if adminInfo.CurrentOrgId == 10346 {
+	if adminInfo.CurrentOrgId == 10346 || adminInfo.CurrentOrgId == 10585 {
 
 		if len(schdules) > 0 {
 			//获取长期医嘱里面的透析器灌流器
@@ -4570,6 +4574,30 @@ func (c *ScheduleApiController) GetScheduleOne() {
 
 		}
 	}
+
+	//查询排班里面的空透析器
+	if adminInfo.CurrentOrgId == 10375 {
+
+		schedulesFive, _ := service.GetWeekScheduleFive(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
+
+		for _, item := range schedulesFive {
+			solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+			var DialysisMachineName string
+			if len(solution.DialysisDialyszers) > 0 {
+				DialysisMachineName = solution.DialysisDialyszers
+			}
+			if len(solution.DialyzerPerfusionApparatus) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialyzerPerfusionApparatus
+			}
+
+			if len(solution.DialysisIrrigation) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + solution.DialysisIrrigation
+			}
+			item.DialysisMachineName = DialysisMachineName
+			service.UpdateSchOne(item.ID, item.DialysisMachineName)
+		}
+
+	}
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days":           days,

models/schedule_models.go

@@ -168,21 +168,21 @@ type Partition struct {
 }
 
 type Search_Schedule 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"`
-
-	Patient string `gorm:"-" json:"patient" form:"patient"`
+	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"`
+	DialysisMachineName string `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	Patient             string `gorm:"-" json:"patient" form:"patient"`
 }
 
 func (Search_Schedule) TableName() string {

service/doctor_schedule_service.go

@@ -819,6 +819,23 @@ func GetMobileScheduleListByScheduleDate(org_id int64, schedule_date int64) (sch
 	return schedule, err
 }
 
+func GetMobileScheduleListByScheduleDateOne(org_id int64, schedule_date int64) (schedule []*models.Search_Schedule, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status= 1 and dialysis_machine_name=''")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if schedule_date > 0 {
+		db = db.Where("schedule_date=?", schedule_date)
+	}
+
+	err = db.Find(&schedule).Error
+
+	return schedule, err
+}
+
 func DeleteStaffScheduleById(id int64, user_org_id int64) (err error) {
 
 	schedule := models.StaffSchedule{}

service/pharmacy_service.go

@@ -1035,7 +1035,6 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 				err = fmt.Errorf("!:%v", err)
 				return
 			}
-			//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
 			//查询默认仓库
 			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
 			//查询默认仓库剩余多少库存
@@ -1051,6 +1050,9 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 			UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
 			//扣减库存
 			UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
+			//退药
+			UpdateHisPrescriptionInfo(v.PatientId, v.AdviceDate, v.UserOrgId)
 		}
 	}
 
@@ -2210,3 +2212,11 @@ func UpdateAdviceFlow(id int64) error {
 	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and status = 1 and is_medicine =0", id).Update(map[string]interface{}{"is_medicine": 1}).Error
 	return err
 }
+
+func UpdateHisPrescriptionInfo(patient_id int64, advice_date int64, user_org_id int64) error {
+
+	err = XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("patient_id = ? and advice_date = ? and user_org_id= ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+
+	err = XTWriteDB().Model(&models.HisPrintPrescription{}).Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, advice_date, user_org_id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+	return err
+}

service/schedule_service.go

@@ -129,6 +129,29 @@ func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, schedule
 	return
 }
 
+func GetWeekScheduleFive(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.ScheduleTwo, err error) {
+
+	db := readDb.Table("xt_schedule as s").Where("s.status=1 and s.dialysis_machine_name='")
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
+		Order("updated_time asc").
+		Find(&schedules).Error
+	return
+}
+
+func UpdateSchOne(id int64, dialysis_machine_name string) (err error) {
+	err = writeDb.Model(&models.ScheduleTwo{}).Where("status=1 AND id = ?", id).Updates(map[string]interface{}{"dialysis_machine_name": dialysis_machine_name}).Error
+	return
+}
+
 func GetScheduleTotalCount(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.MySchedule, err error) {
 
 	db := readDb.Table("xt_schedule as s").Where("status= 1 and (mode_id = 2 or mode_id= 3)")
@@ -1775,6 +1798,21 @@ func GetHisDoctorAdviceListTwenty(patient_id int64, schedule_date int64, user_or
 	return advice, err
 }
 
+func GetHisPrescriptionProjectList(patient_id int64, record_date int64, user_org_id int64) (project []*models.HisPrescriptionProject, err error) {
+	err = XTReadDB().Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Find(&project).Error
+	return project, err
+}
+
+func UpdateProjectObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("patient_id = ? and record_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+
+	err = XTWriteDB().Model(&models.HisPrescription{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id =?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+
+	err = XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("patient_id = ? and status=1 and record_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error
+	return err
+}
+
 func UpdateAdviceObj(patient_id int64, schedule_date int64, user_org_id int64) (err error) {
 
 	err = XTWriteDB().Model(&models.XtDoctorAdvice{}).Where("patient_id = ? and advice_date =? and status=1 and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 9}).Error