11月9日库存管理

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -441,7 +441,15 @@ func (c *DialysisApiController) PostPrescription() {
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if dialysisPrescription.ID == 0 { //新增
 		if mode_id > 0 {
-			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			var str string
+			//查找该机构用的是什么透析器
+			filedConfig, _ := service.GetFiledConfig(adminUserInfo.CurrentOrgId)
+			if filedConfig.ID > 0 {
+				str = dialyzerPerfusionApparatus
+			} else {
+				str = dialysis_dialyszers + "/" + dialysis_irrigation
+			}
+			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 		}
 
 		prescription.Creater = adminUserInfo.AdminUser.Id
@@ -483,7 +491,15 @@ func (c *DialysisApiController) PostPrescription() {
 
 	} else { //修改
 		if mode_id > 0 {
-			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			var str string
+			//查找该机构用的是什么透析器
+			filedConfig, _ := service.GetFiledConfig(adminUserInfo.CurrentOrgId)
+			if filedConfig.ID > 0 {
+				str = dialyzerPerfusionApparatus
+			} else {
+				str = dialysis_dialyszers + "/" + dialysis_irrigation
+			}
+			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 		}
 
 		//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -672,7 +688,15 @@ func (c *DialysisApiController) PostSoulution() {
 	}
 
 	if mode_id > 0 {
-		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+		var str string
+		//查找该机构用的是什么透析器
+		filedConfig, _ := service.GetFiledConfig(adminUserInfo.CurrentOrgId)
+		if filedConfig.ID > 0 {
+			str = dialyzerPerfusionApparatus
+		} else {
+			str = dialysis_dialyszers + "/" + dialysis_irrigation
+		}
+		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 	}
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1413,6 +1413,18 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	//	}
 	//}
 
+	if mode_id > 0 {
+		var str string
+		//查找该机构用的是什么透析器
+		filedConfig, _ := service.GetFiledConfig(adminUserInfo.Org.Id)
+		if filedConfig.ID > 0 {
+			str = dialyzerPerfusionApparatus
+		} else {
+			str = dialysis_dialyszers + "/" + dialysis_irrigation
+		}
+		service.ModifyScheduleMode(mode_id, id, recordDate.Unix(), adminUserInfo.Org.Id, str)
+	}
+
 	//TODO 需要根据角色去判断
 
 	prescription := models.DialysisPrescription{
@@ -2664,7 +2676,16 @@ func (c *DialysisAPIController) PostSolution() {
 	water_machine := c.GetString("water_machine")
 	dialysis_remark := c.GetString("dialysis_remark")
 	if mode_id > 0 {
-		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
+
+		var str string
+		//查找该机构用的是什么透析器
+		filedConfig, _ := service.GetFiledConfig(adminUserInfo.Org.Id)
+		if filedConfig.ID > 0 {
+			str = dialyzerPerfusionApparatus
+		} else {
+			str = dialysis_dialyszers + "/" + dialysis_irrigation
+		}
+		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -454,12 +454,14 @@ func (this *StaffScheduleApiController) UpdatePatientScheduleById() {
 		for index, _ := range list {
 			fmt.Println("index2322332", index)
 			schedule := models.XtSchedule{
-				PatientId: list[0].PatientId,
-				ModeId:    list[0].ModeId,
+				PatientId:           list[0].PatientId,
+				ModeId:              list[0].ModeId,
+				DialysisMachineName: list[0].DialysisMachineName,
 			}
 			xtSchedule := models.WeekSchedule{
-				PatientId: list[1].PatientId,
-				ModeId:    list[1].ModeId,
+				PatientId:           list[1].PatientId,
+				ModeId:              list[1].ModeId,
+				DialysisMachineName: list[1].DialysisMachineName,
 			}
 			err = service.UpdateStaffSchedule(list[1].ID, schedule)
 			fmt.Println("errrrrrrr2323323232323", err)
@@ -888,30 +890,43 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 		}
 		//调换位置
 		sch := models.Schedule{
-			PatientId: schedule.PatientId,
-			ModeId:    schedule.ModeId,
+			PatientId:           schedule.PatientId,
+			ModeId:              schedule.ModeId,
+			DialysisMachineName: schedule.DialysisMachineName,
 		}
 		service.UpdateScheduleById(id, sch)
 
 		schedu := models.Schedule{
-			PatientId: patient_id,
-			ModeId:    mode_id,
+			PatientId:           patient_id,
+			ModeId:              mode_id,
+			DialysisMachineName: schedule.DialysisMachineName,
 		}
 		service.UpdateScheduleById(schedule.ID, schedu)
 	} else {
+		var str string
+		//查找该机构用的是什么透析器
+		filedConfig, _ := service.GetFiledConfig(org_id)
+		if filedConfig.ID > 0 {
+			solutionType, _ := service.GetLastDialysisSolutionType(org_id, patient_id, mode_id)
+			str = solutionType.DialyzerPerfusionApparatus
+		} else {
+			solutionType, _ := service.GetLastDialysisSolutionType(org_id, patient_id, mode_id)
+			str = solutionType.DialysisDialyszers + "/" + solutionType.DialysisIrrigation
+		}
 		xtSchedule := models.Schedule{
-			UserOrgId:    org_id,
-			PartitionId:  numberlist.ZoneId,
-			BedId:        bed_id,
-			PatientId:    patient_id,
-			ScheduleDate: schedule_date,
-			ScheduleType: schedule_type,
-			ScheduleWeek: schedule_week,
-			ModeId:       mode_id,
-			Status:       1,
-			CreatedTime:  time.Now().Unix(),
-			UpdatedTime:  0,
-			IsExport:     20000,
+			UserOrgId:           org_id,
+			PartitionId:         numberlist.ZoneId,
+			BedId:               bed_id,
+			PatientId:           patient_id,
+			ScheduleDate:        schedule_date,
+			ScheduleType:        schedule_type,
+			ScheduleWeek:        schedule_week,
+			ModeId:              mode_id,
+			Status:              1,
+			CreatedTime:         time.Now().Unix(),
+			UpdatedTime:         0,
+			IsExport:            20000,
+			DialysisMachineName: str,
 		}
 		service.DeleteSchedule(id)
 		service.CreateSchedule(&xtSchedule)

controllers/schedule_api_controller.go

@@ -1141,11 +1141,8 @@ func (c *ScheduleApiController) GetWeekPanels() {
 	}
 
 	if data == 1 {
-		fmt.Println(ids)
 
 		partitions, _ := service.GetSchedulePartitionPanelOne(adminInfo.CurrentOrgId, ids)
-		fmt.Println("````~~")
-		fmt.Println(partitions)
 
 		returnData["partitions"] = partitions
 	}
@@ -3296,10 +3293,13 @@ func (this *ScheduleApiController) GetNextWeekDayScheduleOne() {
 	for _, item := range schedule {
 		order, _ := service.GetLastDialysisOrder(adminUserInfo.CurrentOrgId, item.PatientId, theStartTIme)
 		item.XtDialysisOrderSix = order
+		solutionLastWeek, _ := service.GetDialysisSolutionLastWeek(adminUserInfo.CurrentOrgId, item.PatientId, item.ModeId)
+		item.DialysisSolution = solutionLastWeek
 		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
 
 			dialysisprescription, _ := service.GetLastDialysisSolution(adminUserInfo.CurrentOrgId, item.PatientId, item.ModeId, item.ScheduleDate)
 			item.DialysisPrescription = dialysisprescription
+
 		}
 
 	}
@@ -3349,6 +3349,9 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 		hisDoctorAdvice, _ := service.GetHisDoctorAdviceListLastWeek(item.UserOrgId, item.PatientId, item.ScheduleDate)
 
 		item.HisDoctorAdviceInfo = hisDoctorAdvice
+
+		solutionLastWeek, _ := service.GetDialysisSolutionLastWeek(item.UserOrgId, item.PatientId, item.ModeId)
+		item.DialysisSolution = solutionLastWeek
 	}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

models/device_models.go

@@ -117,18 +117,18 @@ func (DeviceZone) TableName() string {
 }
 
 type DeviceZonePb struct {
-	ID         int64  `gorm:"column:id" json:"id"`
-	OrgID      int64  `gorm:"column:org_id" json:"-"`
-	Name       string `json:"name"`
-	Type       int    `json:"type"`
-	TotalBed   int	  `json:"total_bed"`
-	SwBed      int	  `json:"sw_bed"`
-	XwBed      int	  `json:"xw_bed"`
-	WsBed      int	  `json:"ws_bed"`
-	CreateTime int64  `gorm:"column:ctime" json:"-"`
-	ModifyTime int64  `gorm:"column:mtime" json:"-"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	DeviceNumber   []*DeviceNumberPb   `json:"device" gorm:"foreignkey:ZoneID;AssociationForeignKey:ID;"`
+	ID           int64             `gorm:"column:id" json:"id"`
+	OrgID        int64             `gorm:"column:org_id" json:"-"`
+	Name         string            `json:"name"`
+	Type         int               `json:"type"`
+	TotalBed     int               `json:"total_bed"`
+	SwBed        int               `json:"sw_bed"`
+	XwBed        int               `json:"xw_bed"`
+	WsBed        int               `json:"ws_bed"`
+	CreateTime   int64             `gorm:"column:ctime" json:"-"`
+	ModifyTime   int64             `gorm:"column:mtime" json:"-"`
+	Status       int64             `gorm:"column:status" json:"status" form:"status"`
+	DeviceNumber []*DeviceNumberPb `json:"device" gorm:"foreignkey:ZoneID;AssociationForeignKey:ID;"`
 }
 
 func (DeviceZonePb) TableName() string {
@@ -136,14 +136,14 @@ func (DeviceZonePb) TableName() string {
 }
 
 type DialysisSolutionPb struct {
-	UserOrgId                  int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId                  int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	DialysisDialyszers         string                `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
-	DialysisIrrigation         string                `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-	DialyzerPerfusionApparatus string                `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
-	ModeName                   string                `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
-	ModeId                     int64                 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Anticoagulant              int64                 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	UserOrgId                  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	ModeName                   string `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Anticoagulant              int64  `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
 }
 
 func (DialysisSolutionPb) TableName() string {
@@ -151,15 +151,15 @@ func (DialysisSolutionPb) TableName() string {
 }
 
 type DeviceNumberPb struct {
-	ID         int64      `gorm:"column:id" json:"id"`
-	OrgID      int64      `gorm:"column:org_id" json:"-"`
-	Number     string     `gorm:"column:number" json:"number"`
-	GroupID    int64      `gorm:"column:group_id" json:"group_id"`
-	ZoneID     int64      `gorm:"column:zone_id" json:"zone_id"`
-	Status     int64      `gorm:"column:status" json:"status" form:"status"`
-	CreateTime int64      `gorm:"column:ctime" json:"-"`
-	ModifyTime int64      `gorm:"column:mtime" json:"-"`
-	Sort       int64      `gorm:"column:sort" json:"sort" form:"sort"`
+	ID         int64             `gorm:"column:id" json:"id"`
+	OrgID      int64             `gorm:"column:org_id" json:"-"`
+	Number     string            `gorm:"column:number" json:"number"`
+	GroupID    int64             `gorm:"column:group_id" json:"group_id"`
+	ZoneID     int64             `gorm:"column:zone_id" json:"zone_id"`
+	Status     int64             `gorm:"column:status" json:"status" form:"status"`
+	CreateTime int64             `gorm:"column:ctime" json:"-"`
+	ModifyTime int64             `gorm:"column:mtime" json:"-"`
+	Sort       int64             `gorm:"column:sort" json:"sort" form:"sort"`
 	Schedule   []*BlodSchedulePb `json:"schedule" gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
 }
 
@@ -168,21 +168,21 @@ func (DeviceNumberPb) TableName() string {
 }
 
 type BlodSchedulePb 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"`
-	DialysisMachineName       string                    `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
-	VmBloodPatients           VmBloodPatients           `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
-	BloodDialysisOrder        BloodPatientDialysisOrder `json:"order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	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"`
+	DialysisMachineName       string                      `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	VmBloodPatients           VmBloodPatients             `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	BloodDialysisOrder        BloodPatientDialysisOrder   `json:"order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	BloodDialysisPrescription BloodDialysisPrescriptionPb `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
-	DialysisSolution 		  DialysisSolutionPb `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
+	DialysisSolution          DialysisSolutionPb          `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
 }
 
 func (BlodSchedulePb) TableName() string {
@@ -190,19 +190,19 @@ func (BlodSchedulePb) TableName() string {
 }
 
 type BloodDialysisPrescriptionPb 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"`
-	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Remark                     string  `gorm:"column:remark" json:"remark" form:"remark"`
-	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
-	AnticoagulantShouji        float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
-	AnticoagulantWeichi        float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
-	AnticoagulantZongliang     float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
-	AnticoagulantGaimingcheng  string  `gorm:"column:anticoagulant_gaimingcheng" json:"anticoagulant_gaimingcheng" form:"anticoagulant_gaimingcheng"`
-	AnticoagulantGaijiliang    string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
-	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
-	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	ModeId                    int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Anticoagulant             int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji       float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantWeichi       float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang    float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	AnticoagulantGaimingcheng string  `gorm:"column:anticoagulant_gaimingcheng" json:"anticoagulant_gaimingcheng" form:"anticoagulant_gaimingcheng"`
+	AnticoagulantGaijiliang   string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
+	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 (BloodDialysisPrescriptionPb) TableName() string {

models/patient_models.go

@@ -1764,3 +1764,19 @@ type NewDialysisPrescription struct {
 func (NewDialysisPrescription) TableName() string {
 	return "xt_dialysis_prescription"
 }
+
+type NewDialysisSolutionOne 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"`
+	PatientId                  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                     int64  `gorm:"column:status" json:"status" form:"status"`
+	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"`
+	SolutionStatus             int64  `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
+}
+
+func (NewDialysisSolutionOne) TableName() string {
+	return "xt_dialysis_solution"
+}

models/schedule_models.go

@@ -120,20 +120,20 @@ func (Search_Schedule) TableName() string {
 }
 
 type WeekSchedule 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"`
-
+	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"`
 	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
 	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`

service/device_service.go

@@ -833,7 +833,7 @@ func GetPartionId(bed_id int64, org_id int64) (models.XtDeviceNumber, error) {
 
 func UpdateScheduleById(id int64, schedule models.Schedule) error {
 
-	err := XTWriteDB().Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "is_export": 10000}).Error
+	err := XTWriteDB().Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "is_export": 10000, "dialysis_machine_name": schedule.DialysisMachineName}).Error
 	return err
 }
 

service/dialysis_service.go

@@ -1109,9 +1109,9 @@ func BatchCheckOldDoctorAdvice(m *models.DoctorAdvice, ids []string, org_id int6
 	return err
 }
 
-func ModifyScheduleMode(mode_id int64, patient_id int64, recordDate int64, org_id int64) {
+func ModifyScheduleMode(mode_id int64, patient_id int64, recordDate int64, org_id int64, dialysis_machine_name string) {
 	ut := writeDb.Begin()
-	err = writeDb.Model(&models.Schedule{}).Where("status = 1   AND user_org_id = ? AND patient_id = ? AND schedule_date = ? ", org_id, patient_id, recordDate).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "mode_id": mode_id}).Error
+	err = writeDb.Model(&models.Schedule{}).Where("status = 1   AND user_org_id = ? AND patient_id = ? AND schedule_date = ?", org_id, patient_id, recordDate).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "mode_id": mode_id, "dialysis_machine_name": dialysis_machine_name}).Error
 	if err != nil {
 		ut.Rollback()
 		return
@@ -2044,3 +2044,10 @@ func GetTodayInforMation(orgid int64, record_date int64) (list []*NewDeviceInfor
 	err = UserReadDB().Where("user_org_id = ? and date = ? and status = 1", orgid, record_date).Find(&list).Error
 	return list, err
 }
+
+func GetFiledConfig(orgid int64) (models.FiledConfig, error) {
+
+	config := models.FiledConfig{}
+	err := XTReadDB().Where("filed_name = 'dialyzer_perfusion_apparatus' and org_id = ? and module =1 and is_show = 1", orgid).First(&config).Error
+	return config, err
+}

service/doctor_schedule_service.go

@@ -707,13 +707,13 @@ func GetStaffScheduleById(ids []string) (schedule []*models.XtSchedule, err erro
 
 func UpdateStaffSchedule(nextid int64, schedule models.XtSchedule) error {
 
-	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
+	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "dialysis_machine_name": schedule.DialysisMachineName}).Error
 	return err
 }
 
 func UpdateStaffScheduleOne(nextid int64, schedule models.WeekSchedule) error {
 
-	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
+	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId, "dialysis_machine_name": schedule.DialysisMachineName}).Error
 	return err
 }
 

service/schedule_service.go

@@ -970,12 +970,21 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	if orgID > 0 {
 		db = db.Where("s.user_org_id = ?", orgID)
 	}
-	if startime > 0 {
-		db = db.Where("s.schedule_date >= ?", startime)
+	if weektype == 0 {
+		if startime > 0 {
+			db = db.Where("s.schedule_date >= ?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("s.schedule_date <= ?", endtime)
+		}
 	}
-	if endtime > 0 {
-		db = db.Where("s.schedule_date <= ?", endtime)
+
+	if weektype > 0 {
+		if record_date > 0 {
+			db = db.Where("s.schedule_date = ?", record_date)
+		}
 	}
+
 	if weektime > 0 {
 		db = db.Where("s.schedule_type = ?", weektime)
 	}
@@ -987,9 +996,7 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	}
 	err = db.
 		Preload("DeviceZone", "status = 1 ").
-		Preload("DeviceNumber", "status = 1 ").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Order("id asc")
-	}).Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Preload("DeviceNumber", "status = 1 ").Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		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, p.name as patient,p.id_card_no as id_card_no,p.dialysis_no as dialysis_no,p.gender as gender,p.phone as phone").
 		Order("s.partition_id desc").
 		Find(&schedules).Error
@@ -1155,7 +1162,7 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
 
 	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
-		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
+		return db.Where("user_org_id = ? and status = 1 and  assessment_date>=1672502400  and assessment_date < ?", orgid, endtime)
 	}).Find(&schedule).Error
 	return schedule, err
 }
@@ -1300,7 +1307,7 @@ func GetLastDialysisOrder(org_id int64, patient_id int64, dialysis_date int64) (
 func GetLastDialysisSolution(org_id int64, patient_id int64, mode_id int64, schedule_date int64) (models.NewDialysisPrescription, error) {
 
 	dialysisprescription := models.NewDialysisPrescription{}
-	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date<?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and record_date>=1672502400 and record_date<?", org_id, patient_id, mode_id, schedule_date).Order("id desc").First(&dialysisprescription).Error
 	return dialysisprescription, err
 
 }
@@ -1317,18 +1324,37 @@ func GetHisDoctorAdviceListLastWeek(org_id int64, patient_id int64, schedule_dat
 	return advice, err
 }
 
+func GetDialysisSolutionLastWeek(user_org_id int64, patient_id int64, mode_id int64) (models.DialysisSolution, error) {
+
+	solution := models.DialysisSolution{}
+
+	err := XTReadDB().Where("user_org_id =? and status = 1 and patient_id = ? and mode_id = ? and solution_status = 1", user_org_id, patient_id, mode_id).Find(&solution).Error
+
+	return solution, err
+}
+
 func GetNextWeekDayScheduleSix(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string, record_date int64) (schedules []*models.WeekScheduleSeven, err error) {
 
 	db := XTReadDB().Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
 		db = db.Where("s.user_org_id = ?", orgID)
 	}
-	if startime > 0 {
-		db = db.Where("s.schedule_date >= ?", startime)
+	if weektype == 0 {
+		if startime > 0 {
+			db = db.Where("s.schedule_date >= ?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("s.schedule_date <= ?", endtime)
+		}
 	}
-	if endtime > 0 {
-		db = db.Where("s.schedule_date <= ?", endtime)
+
+	if weektype > 0 {
+		if record_date > 0 {
+			db = db.Where("s.schedule_date = ?", record_date)
+		}
+
 	}
+
 	if weektime > 0 {
 		db = db.Where("s.schedule_type = ?", weektime)
 	}
@@ -1343,9 +1369,7 @@ func GetNextWeekDayScheduleSix(weektype int64, weektime int64, startime int64, e
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("XtAssessmentBeforeDislysis", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 and assessment_date = ?", record_date)
-		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Order("id asc")
-	}).Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		}).Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		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, p.name as patient,p.id_card_no as id_card_no,p.dialysis_no as dialysis_no,p.gender as gender,p.phone as phone").
 		Order("s.partition_id desc").
 		Find(&schedules).Error
@@ -1358,3 +1382,11 @@ func GetAssessmentBeforListLastWeek(schedule_date int64, patient_id int64, org_i
 	err := XTReadDB().Where("assessment_date = ? and patient_id = ? and user_org_id =? and status = 1", schedule_date, patient_id, org_id).Find(&dislysis).Error
 	return dislysis, err
 }
+
+func GetLastDialysisSolutionType(org_id int64, patient_id int64, mode_id int64) (models.NewDialysisSolutionOne, error) {
+
+	dialysisprescription := models.NewDialysisSolutionOne{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and mode_id = ? and status = 1 and solution_status =1", org_id, patient_id, mode_id).First(&dialysisprescription).Error
+	return dialysisprescription, err
+
+}