11月9日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 #dev/prod
 

controllers/dialysis_api_controller.go

@@ -3804,7 +3804,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -3832,7 +3832,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

controllers/dialysis_record_api_controller.go

@@ -1135,6 +1135,15 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				record.TransmembranePressure = 60
 			}
 
+			//针对兰溪人民医院的需求
+			if adminUserInfo.CurrentOrgId == 10432 {
+				befor, _ := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+				record.SystolicBloodPressure = befor.SystolicBloodPressure
+				record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+				record.Temperature = befor.Temperature
+				record.PulseFrequency = befor.PulseFrequency
+			}
+
 			err := service.CreateMonitor(&record)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 
@@ -1398,8 +1407,8 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 {
-		fmt.Println("进来2332233333333333333333333333333333333我的")
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 {
+
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			pre := models.PredialysisEvaluation{

controllers/doctors_api_controller.go

@@ -88,112 +88,67 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way)
-	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way)
-
-	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
-	//project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
-	for _, item := range project {
-		index := 0
-		for _, subItem := range item.HisPrescriptionTeamProject {
-
-			if subItem.HisProject.CostClassify != 3 {
-				subItem.IsCheckTeam = 2
-				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
-			}
+	config, _ := service.GetHisDoctorConfig(orgID)
+	project_config, _ := service.GetHisProjectConfig(orgID)
 
-			if subItem.HisProject.CostClassify == 3 {
-				subItem.IsCheckTeam = 1
-				index = index + 1
-				if index == 1 {
-					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+	if config.IsOpen == 0 || config.IsOpen == 2 {
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way)
+		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
+		if err != nil {
+			c.ErrorLog("获取排班信息失败:%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		} else {
+			filtedScheduals := []*service.MScheduleDoctorAdviceVM{}
+			for _, schedual := range scheduals {
+				if len(schedual.DoctorAdvices) > 0 {
+					filtedScheduals = append(filtedScheduals, schedual)
 				}
 			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"scheduals":      filtedScheduals,
+				"adminUser":      adminUser,
+				"config":         config,
+				"project_config": project_config,
+			})
 		}
 	}
-	//for _, item := range project {
-	//	index := 0
-	//	for _, subItem := range item.HisPrescriptionTeamProject {
-	//
-	//		//获取所有的患者
-	//		patients, _ := service.GetAllPatientListByListTwo(orgID)
-	//
-	//		//获取所有床位
-	//		numberList, _ := service.GetAllDeviceNumberByListOne(orgID)
-	//
-	//		//获取透析处方
-	//		prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
-	//
-	//		//获取上机
-	//		dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
-	//		for key, item := range project {
-	//			for _, patient := range patients {
-	//				if item.PatientId == patient.ID {
-	//					project[key].SchedualPatient = patient
-	//					break
-	//				}
-	//			}
-	//			// 获取床位信息
-	//			for _, it := range numberList {
-	//				if item.BedId == it.ID {
-	//					project[key].DeviceNumber = it
-	//					break
-	//				}
-	//			}
-	//
-	//			// 获取处方
-	//			for _, it := range prescriptions {
-	//				if item.PatientId == it.PatientId {
-	//					project[key].Prescription = it
-	//					break
-	//				}
-	//			}
-	//
-	//			//获取上机
-	//			for _, it := range dialysisOrders {
-	//				if item.PatientId == it.PatientId {
-	//					project[key].DialysisOrder = it
-	//					break
-	//				}
-	//			}
-	//		}
-	//		if subItem.HisProject.CostClassify != 3 {
-	//			subItem.IsCheckTeam = 2
-	//			item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
-	//		}
-	//
-	//		if subItem.HisProject.CostClassify == 3 {
-	//			subItem.IsCheckTeam = 1
-	//			index = index + 1
-	//			if index == 1 {
-	//				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
-	//			}
-	//		}
-	//	}
-	//}
-	config, _ := service.GetHisDoctorConfig(orgID)
-	project_config, _ := service.GetHisProjectConfig(orgID)
+	if config.IsOpen == 1 {
+		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way)
+		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
+		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
+		for _, item := range project {
+			index := 0
+			for _, subItem := range item.HisPrescriptionTeamProject {
+
+				if subItem.HisProject.CostClassify != 3 {
+					subItem.IsCheckTeam = 2
+					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+				}
 
-	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
-	if err != nil {
-		c.ErrorLog("获取排班信息失败:%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	} else {
-		filtedScheduals := []*service.MScheduleDoctorAdviceVM{}
-		for _, schedual := range scheduals {
-			if len(schedual.DoctorAdvices) > 0 {
-				filtedScheduals = append(filtedScheduals, schedual)
+				if subItem.HisProject.CostClassify == 3 {
+					subItem.IsCheckTeam = 1
+					index = index + 1
+					if index == 1 {
+						item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+					}
+				}
 			}
 		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"scheduals":      filtedScheduals,
-			"adminUser":      adminUser,
-			"hisAdvices":     hisAdvices,
-			"config":         config,
-			"project_config": project_config,
-			"project":        project,
-		})
+
+		if err != nil {
+			c.ErrorLog("获取排班信息失败:%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"adminUser":      adminUser,
+				"hisAdvices":     hisAdvices,
+				"config":         config,
+				"project_config": project_config,
+				"project":        project,
+			})
+		}
 	}
+
 }
 
 func (c *DoctorsApiController) GetAllDoctorAndNurse() {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1825,7 +1825,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 || adminUserInfo.Org.Id == 10430 {
+	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 || adminUserInfo.Org.Id == 10432 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2377,7 +2377,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			//针对肇庆三鹤血液透析中心
 
-			if template.TemplateId == 43 {
+			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			}
 
@@ -2410,9 +2410,10 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+
 		//如果有数据就插入
 		if errcode == nil {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
@@ -2435,7 +2436,17 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.VenousPressure = 80
 			record.TransmembranePressure = 60
 		}
+		//针对兰溪人民医院的需求
+		if adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 9671 {
+			befor, _ := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+			record.SystolicBloodPressure = befor.SystolicBloodPressure
+			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+			record.Temperature = befor.Temperature
+			record.PulseFrequency = befor.PulseFrequency
+			record.BreathingRate = befor.BreathingRate
+		}
 		err := service.CreateMonitor(&record)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 
 		redis := service.RedisClient()
@@ -3034,9 +3045,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
-				fmt.Println("ultrafiltration_rate2332323223322332q", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			//if template.TemplateId == 47 {
@@ -3064,7 +3074,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -4090,15 +4100,16 @@ func (c *DialysisAPIController) GetSolution() {
 	solution, err := service.MobileGetDialysisSolutionByModeIdSeven(adminUserInfo.Org.Id, patient_id, mode_id)
 	prescription, err := service.MobileGetLastDialysisPrescribeByModeIdSeven(adminUserInfo.Org.Id, patient_id, mode_id)
 	system_prescription, err := service.MobileGetSystemDialysisPrescribeByModeIdSeven(adminUserInfo.Org.Id, mode_id)
-
+	dialysisPrescription, _ := service.MobileGetLastDialysisPrescription(patient_id, adminUserInfo.Org.Id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"solution":            solution,
-		"prescription":        prescription,
-		"system_prescription": system_prescription,
+		"solution":             solution,
+		"prescription":         prescription,
+		"system_prescription":  system_prescription,
+		"dialysisPrescription": dialysisPrescription,
 	})
 
 }
@@ -7002,7 +7013,7 @@ func (this *DialysisAPIController) GetScheduleTypeByIdList() {
 		}
 		startdateunix = theTime.Unix()
 	}
-	fmt.Println("startdateunix", startdateunix)
+
 	list, _ := service.GetScheduleTypeById(org_id, startdateunix, schedule_type)
 	scheduals, _ := service.MobileGetDialysisScheduals(org_id, startdateunix, schedule_type)
 	devices, _ := service.GetAllDevicetByListSix(org_id)

controllers/print_data_api_controller.go

@@ -36,43 +36,87 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
-	schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
-	for _, item := range schedules {
-		list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-		if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
-			item.Count = list.Count
+
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 {
+		schedules, getScheduleErr := service.GetSchedulesSix(adminUserInfo.CurrentOrgId, idStrs)
+		for _, item := range schedules {
+			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+				item.Count = list.Count
+			}
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+				item.Patient.TotalDialysis = listOne.Count
+				item.Count = listOne.Count
+			}
+		}
+		if getScheduleErr != nil {
+			this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
-		if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
-			listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
-			item.Patient.TotalDialysis = listOne.Count
-			item.Count = listOne.Count
+		medicalStaffs, getMedicalStaffErr := service.GetMedicalStaffs(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		if getMedicalStaffErr != nil {
+			this.ErrorLog("获取医护人员失败:%v", getMedicalStaffErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
-	}
-	if getScheduleErr != nil {
-		this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
 
-	medicalStaffs, getMedicalStaffErr := service.GetMedicalStaffs(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
-	if getMedicalStaffErr != nil {
-		this.ErrorLog("获取医护人员失败:%v", getMedicalStaffErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+		adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedules":      schedules,
+			"medical_staffs": medicalStaffs,
+			"users":          adminUser,
+			"templateInfo":   templateInfo,
+			"name":           name,
+		})
 	}
 
-	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
-	name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
-	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 {
+		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
+		for _, item := range schedules {
+			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+				item.Count = list.Count
+			}
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+				item.Patient.TotalDialysis = listOne.Count
+				item.Count = listOne.Count
+			}
+		}
+		if getScheduleErr != nil {
+			this.ErrorLog("获取打印透析记录失败：%v", getScheduleErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		medicalStaffs, getMedicalStaffErr := service.GetMedicalStaffs(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		if getMedicalStaffErr != nil {
+			this.ErrorLog("获取医护人员失败:%v", getMedicalStaffErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		name, getScheduleErr := service.GetAllName(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+		templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedules":      schedules,
+			"medical_staffs": medicalStaffs,
+			"users":          adminUser,
+			"templateInfo":   templateInfo,
+			"name":           name,
+		})
+	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"schedules":      schedules,
-		"medical_staffs": medicalStaffs,
-		"users":          adminUser,
-		"templateInfo":   templateInfo,
-		"name":           name,
-	})
 }
 
 func (this *PrintDataAPIController) StockRecordPrintData() {

models/dialysis.go

@@ -1233,3 +1233,22 @@ type DialysisScheduleSeven struct {
 func (DialysisScheduleSeven) TableName() string {
 	return "xt_schedule"
 }
+
+type DialysisOrderTwenty struct {
+	ID           int64        `gorm:"column:id" json:"id"`
+	DialysisDate int64        `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId    int64        `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId    int64        `gorm:"column:patient_id" json:"patient_id"`
+	Stage        int64        `gorm:"column:stage" json:"stage"`
+	Remark       string       `gorm:"column:remark" json:"remark"`
+	BedID        int64        `gorm:"column:bed_id" json:"bed_id"`
+	Status       int64        `gorm:"column:status" json:"status"`
+	DeviceNumber DeviceNumber `gorm:"ForeignKey:BedID"`
+	StartTime    int64        `gorm:"column:start_time" json:"start_time"`
+	SchedualType int64        `gorm:"column:schedual_type" json:"schedual_type"`
+	ZoneId       int64        `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+}
+
+func (DialysisOrderTwenty) TableName() string {
+	return "xt_dialysis_order"
+}

models/patient_models.go

@@ -1607,3 +1607,30 @@ type XtScheduleList struct {
 func (XtScheduleList) TableName() string {
 	return "xt_schedule"
 }
+
+type DialysisPrescriptionTwenty 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"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id"`
+	Anticoagulant              int64  `gorm:"column:anticoagulant" json:"anticoagulant"`
+	DialysateFormulation       int64  `gorm:"column:dialysate_formulation" json:"dialysate_formulation"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+}
+
+func (DialysisPrescriptionTwenty) TableName() string {
+	return "xt_dialysis_prescription"
+}
+
+type DialysisPrescriptionThrity 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"`
+	Remark    string `gorm:"column:remark" json:"remark" form:"remark"`
+}
+
+func (DialysisPrescriptionThrity) TableName() string {
+	return "xt_dialysis_prescription"
+}

models/schedule_models.go

@@ -477,3 +477,28 @@ type GoodInfoNight struct {
 func (GoodInfoNight) TableName() string {
 	return "xt_good_information"
 }
+
+type ScheduleTwenty 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"`
+	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"`
+	DialysisOrderTwenty DialysisOrderTwenty `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+}
+
+func (ScheduleTwenty) TableName() string {
+	return "ScheduleTwenty"
+}

service/doctor_schedule_service.go

@@ -588,7 +588,7 @@ func GetAllMobileZone(orgid int64) (zone []*models.DeviceZone, err error) {
 	return zone, err
 }
 
-func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int64) (schedule []*models.Schedule, err error) {
+func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int64) (schedule []*models.ScheduleTwenty, err error) {
 
 	db := XTReadDB().Table("xt_schedule as s")
 	if zoneid > 0 {
@@ -599,7 +599,7 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	}
 	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
 		return XTReadDB().Model(&models.DeviceNumber{}).Where("status = 1 AND org_id = ?", orgid).Order("sort asc")
-	}).Preload("DialysisOrder", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
+	}).Preload("DialysisOrderTwenty", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
 		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,p.name as patient").Find(&schedule).Error
 	return schedule, err
 }

service/mobile_dialysis_service.go

@@ -1270,21 +1270,21 @@ func GetMonitor(orgID int64, patientID int64, id int64) (*models.MonitoringRecor
 }
 
 type MScheduleDoctorAdviceVM struct {
-	ID                     int64                            `gorm:"column:id" json:"id"`
-	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId                  int64                            `gorm:"column:bed_id" json:"bed_id"`
-	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate           int64                            `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status                 int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
-	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	DoctorAdvices          []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
-	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
-	DialysisAssesmentBefor *models.DialysisAssesmentBefor   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
+	ID                     int64                              `gorm:"column:id" json:"id"`
+	UserOrgId              int64                              `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId            int64                              `gorm:"column:partition_id" json:"partition_id"`
+	BedId                  int64                              `gorm:"column:bed_id" json:"bed_id"`
+	PatientId              int64                              `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate           int64                              `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType           int64                              `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                 int64                              `gorm:"column:mode_id" json:"mode_id"`
+	Status                 int64                              `gorm:"column:status" json:"status"`
+	DialysisOrder          *MDialysisOrderVM                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient        *MSchedualPatientVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber           *MDeviceNumberVM                   `gorm:"ForeignKey:BedId" json:"device_number"`
+	DoctorAdvices          []*MDoctorAdviceVM                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	Prescription           *models.DialysisPrescriptionTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	DialysisAssesmentBefor *models.DialysisAssesmentBefor     `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
 }
 
 func (MScheduleDoctorAdviceVM) TableName() string {
@@ -1292,20 +1292,20 @@ func (MScheduleDoctorAdviceVM) TableName() string {
 }
 
 type MScheduleDoctorAdviceVMOne struct {
-	ID              int64                            `gorm:"column:id" json:"id"`
-	UserOrgId       int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId     int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId           int64                            `gorm:"column:bed_id" json:"bed_id"`
-	PatientId       int64                            `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate    int64                            `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType    int64                            `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId          int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status          int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder   *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
-	SchedualPatient *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber    *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	DoctorAdvices   []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
-	Prescription    *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	ID              int64                              `gorm:"column:id" json:"id"`
+	UserOrgId       int64                              `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId     int64                              `gorm:"column:partition_id" json:"partition_id"`
+	BedId           int64                              `gorm:"column:bed_id" json:"bed_id"`
+	PatientId       int64                              `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate    int64                              `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType    int64                              `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId          int64                              `gorm:"column:mode_id" json:"mode_id"`
+	Status          int64                              `gorm:"column:status" json:"status"`
+	DialysisOrder   *MDialysisOrderVM                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient *MSchedualPatientVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber    *MDeviceNumberVM                   `gorm:"ForeignKey:BedId" json:"device_number"`
+	DoctorAdvices   []*MDoctorAdviceVM                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	Prescription    *models.DialysisPrescriptionTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
 	//DialysisAssesmentBefor *models.DialysisAssesmentBefor   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysisassesmentbefor"`
 }
 
@@ -3029,21 +3029,21 @@ func (HisMScheduleDoctorAdviceVMOne) TableName() string {
 }
 
 type HisMScheduleProjectVM struct {
-	ID                         int64                            `gorm:"column:id" json:"id"`
-	UserOrgId                  int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId                int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId                      int64                            `gorm:"column:bed_id" json:"bed_id"`
-	PatientId                  int64                            `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate               int64                            `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType               int64                            `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId                     int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status                     int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder              *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
-	SchedualPatient            *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber               *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	Prescription               *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
-	HisPrescriptionProject     []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
-	HisPrescriptionTeamProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"team_project"`
+	ID                         int64                              `gorm:"column:id" json:"id"`
+	UserOrgId                  int64                              `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId                int64                              `gorm:"column:partition_id" json:"partition_id"`
+	BedId                      int64                              `gorm:"column:bed_id" json:"bed_id"`
+	PatientId                  int64                              `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate               int64                              `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType               int64                              `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                     int64                              `gorm:"column:mode_id" json:"mode_id"`
+	Status                     int64                              `gorm:"column:status" json:"status"`
+	DialysisOrder              *MDialysisOrderVM                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient            *MSchedualPatientVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber               *MDeviceNumberVM                   `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription               *models.DialysisPrescriptionTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisPrescriptionProject     []*models.HisPrescriptionProject   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	HisPrescriptionTeamProject []*models.HisPrescriptionProject   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"team_project"`
 }
 
 func (HisMScheduleProjectVM) TableName() string {
@@ -4062,6 +4062,13 @@ func MobileGetLastDialysisPrescribeByModeIdSeven(orgID int64, patientID int64, m
 	return &record, nil
 }
 
+func MobileGetLastDialysisPrescription(patientID int64, orgID int64) (models.DialysisPrescriptionThrity, error) {
+
+	prescription := models.DialysisPrescriptionThrity{}
+	err := readDb.Model(&prescription).Where("patient_id = ? and user_org_id = ? and status = 1 and remark<>''", patientID, orgID).Last(&prescription).Error
+	return prescription, err
+}
+
 func MobileGetSystemDialysisPrescribeByModeIdSeven(orgID int64, mode_id int64) (*models.SystemPrescription, error) {
 	var record models.SystemPrescription
 	err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).First(&record).Error
@@ -4128,3 +4135,10 @@ func GetLastDilysisOrder(orgid int64, patient_id int64, dialysis_date int64) (mo
 
 	return order, err
 }
+
+func GetFistMonitor(orgid int64, patient_id int64, dialysis_date int64) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	err := XTReadDB().Where("org_id = ? and patient_id = ? and monitoring_date = ? and status = 1", orgid, patient_id, dialysis_date).Find(&record).Error
+	return record, err
+}

service/patient_service.go

@@ -2619,7 +2619,7 @@ func GetAllDeviceNumberByListOne(orgID int64) (number []*MDeviceNumberVM, err er
 	}
 }
 
-func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
+func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionTwenty, err error) {
 
 	redis := RedisClient()
 	defer redis.Close()
@@ -2628,7 +2628,7 @@ func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions
 	prescriptions_list_all, _ := redis.Get(key).Result()
 
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DialysisPrescriptionList{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		err = readDb.Model(&models.DialysisPrescriptionTwenty{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2699,3 +2699,9 @@ func GetDialysisSolutionDetailList(orgid int64, patient_id int64, mode_id int64,
 	err = db.Count(&total).Offset(offset).Limit(limit).Find(&solution).Order("created_time desc").Error
 	return solution, total, err
 }
+
+func UpdateDialysisBefor(dislysis models.XtAssessmentBeforeDislysis, id int64) error {
+
+	err := XTWriteDB().Model(&models.XtAssessmentBeforeDislysis{}).Where("id = ? and status= 1", id).Update(map[string]interface{}{"systolic_blood_pressure": dislysis.SystolicBloodPressure, "diastolic_blood_pressure": dislysis.DiastolicBloodPressure}).Error
+	return err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -757,3 +757,140 @@ type SummerVM struct {
 func (SummerVM) TableName() string {
 	return "xt_treatment_summary"
 }
+
+type PatientVMOne 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"`
+	UserId                    int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                    string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType               int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber           string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                    int64  `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                   int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId               int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                      string `gorm:"column:name" json:"name" form:"name"`
+	Alias                     string `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                    int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                    string `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace               string `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	IdCardNo                  string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                  int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Height                    int64  `gorm:"column:height" json:"height" form:"height"`
+	Rh                        int64  `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate    int64  `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	Phone                     string `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone             string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone             string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations         string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress               string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                  string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress               string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	ReceivingDate             int64  `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis   int64  `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate         int64  `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital     string `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition      string `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	HospitalFirstDialysisDate int64  `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	TotalDialysis             int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	Diagnose                  string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                    string `gorm:"column:remark" json:"remark" form:"remark"`
+	PatientComplains          string `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory            string `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory               string `gorm:"column:past_history" json:"past_history"`           // 既往史
+	Status                    int64  `gorm:"column:status" json:"status" form:"status"`
+	Age                       int64  `gorm:"column:age" json:"age"`
+	DialysisAge               int64  `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	TellPhone                 string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate        int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	UserSysBeforeCount        int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+}
+
+func (PatientVMOne) TableName() string {
+	return "xt_patients"
+}
+
+type ScheduleVMSix struct {
+	ID                       int64                       `gorm:"column:id" json:"id"`
+	PatientID                int64                       `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate             int64                       `gorm:"column:schedule_date" json:"schedule_date"`
+	BedID                    int64                       `gorm:"column:bed_id" json:"bed_id"`
+	PartitionId              int64                       `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	Patient                  *PatientVMSix               `gorm:"ForeignKey:PatientID" json:"patient"`
+	DialysisOrder            DialysisOrderVM             `gorm:"ForeignKey:DialysisDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"dialysis_order"`
+	Prescription             PrescriptionVM              `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"prescription"`
+	ReceiveAssessment        ReceiveAssessmentVM         `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"receive_assessment"`
+	XtReceiveTreatmentAsses  *XtReceiveTreatmentAsses    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"xt_receive_assessment"`
+	AssessmentBeforeDislysis AssessmentBeforeDislysisVM  `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_before_dislysis"`
+	AssessmentAfterDislysis  AssessmentAfterDislysisVM   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"assessment_after_dislysis"`
+	MonitoringRecords        []*MonitoringRecordVM       `gorm:"ForeignKey:MonitoringDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"monitor_records"`
+	DeviceNumber             *DeviceNumberVM             `gorm:"ForeignKey:BedID" json:"device_number"`
+	DeviceZone               *DeviceZoneVM               `gorm:"ForeignKey:PartitionId" json:"device_zone"`
+	Advices                  []*DoctorAdviceVM           `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientId" json:"advices"`
+	DoubleCheck              *DoubleCheckVM              `gorm:"ForeignKey:CheckDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"check"`
+	Summer                   *SummerVM                   `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
+	LastAfterWeight          XtAssessmentAfterDislysisVM `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+	Count                    int64
+}
+
+func (ScheduleVMSix) TableName() string {
+	return "xt_schedule"
+}
+
+type PatientVMSix 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"`
+	UserId                    int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                    string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType               int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber           string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                    int64  `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                   int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId               int64  `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                      string `gorm:"column:name" json:"name" form:"name"`
+	Alias                     string `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                    int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                    string `gorm:"column:nation" json:"nation" form:"nation"`
+	IdCardNo                  string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                  int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Height                    int64  `gorm:"column:height" json:"height" form:"height"`
+	EducationLevel            int64  `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                int64  `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                     string `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone             string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone             string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations         string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress               string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                  string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress               string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                  int64  `gorm:"column:children" json:"children" form:"children"`
+	IsHospitalFirstDialysis   int64  `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate         int64  `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital     string `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition      string `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	HospitalFirstDialysisDate int64  `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	TotalDialysis             int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	Evaluate                  string `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                  string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                    string `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId              int64  `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                string `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	PatientComplains          string `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory            string `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory               string `gorm:"column:past_history" json:"past_history"`           // 既往史
+	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"`
+	Age                       int64  `gorm:"column:age" json:"age"`
+	DialysisAge               int64  `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	TellPhone                 string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate        int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	UserSysBeforeCount        int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+}
+
+func (PatientVMSix) TableName() string {
+	return "xt_patients"
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -321,3 +321,47 @@ func GetWarehouseCancelPrintList(orgid int64, startime int64, endtime int64) (ca
 	err = db.Select("x.ctime,x.good_id,sum(x.count) as count,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&cancel).Error
 	return cancel, err
 }
+
+func GetSchedulesSix(orgID int64, schIDs []string) ([]*ScheduleVMSix, error) {
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	var schedules []*ScheduleVMSix
+	db := p_service.XTReadDB()
+	err := db.Model(&ScheduleVMSix{}).
+		Preload("Patient", "user_org_id = ? AND status = 1", orgID).
+		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1", orgID).Preload("DeviceNumber", "org_id = ? AND status = 1", orgID)
+		}).
+		Preload("Prescription", "user_org_id = ? AND status = 1", orgID).
+		Preload("ReceiveAssessment", "user_org_id = ? AND status = 1", orgID).
+		Preload("XtReceiveTreatmentAsses", "user_org_id = ? AND status = 1", orgID).
+		Preload("AssessmentBeforeDislysis", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? AND status = 1", orgID)
+		}).
+		Preload("AssessmentAfterDislysis", "user_org_id = ? AND status = 1", orgID).
+		Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, recordDate.Unix())
+		}).Preload("MonitoringRecords", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? AND status = 1", orgID).
+			Order("operate_time asc")
+	}).
+		Preload("DeviceNumber", "org_id = ?", orgID).
+		Preload("DeviceZone", "org_id = ?", orgID).
+		Preload("DoubleCheck", "user_org_id = ? AND status = 1", orgID).
+		Preload("Summer", "user_org_id = ? AND status = 1", orgID).
+		Preload("Advices", func(db *gorm.DB) *gorm.DB {
+			return db.Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, drug_spec_unit,advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").
+				Where("user_org_id = ? AND advice_type = 2 AND status = 1", orgID).
+				Order("start_time asc, groupno desc, advice_order desc, id asc")
+		}).Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date asc").
+		Find(&schedules).
+		Error
+	if err != nil {
+		return nil, err
+	}
+	for _, item := range schedules {
+		dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
+		item.Patient.TotalDialysis = dialysis_count
+	}
+	return schedules, nil
+}