11月9日库存管理

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -90,7 +90,9 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/patient/getdialysisparametergoodlist", &DialysisApiController{}, "Get:GetDialysisParameterGoodList")
 
-	beego.Router("/api/patinet/savehisdialysis", &DialysisApiController{}, "Get:SaveHisDialysis")
+	beego.Router("/api/patient/savehisdialysis", &DialysisApiController{}, "Get:SaveHisDialysis")
+
+	beego.Router("/api/patient/gethisdialysisgoodcount", &DialysisApiController{}, "Get:GetHisDialysisGoodCount")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -4276,9 +4278,11 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	_, config := service.FindXTHisRecordByOrgId(orgId)
+
 	goodType, _ := service.GetAllGoodType(orgId)
-	if config.IsOpen == 0 {
+	if config.IsOpen != 1 {
 		list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+		fmt.Println("list2232323223332323232", list)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":     list,
@@ -4583,3 +4587,24 @@ func (this *DialysisApiController) SaveHisDialysis() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *DialysisApiController) GetHisDialysisGoodCount() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type, _ := this.GetInt64("partion_type")
+
+	start_time := this.GetString("selected_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	list, _ := service.GetHisDialysisGoodCount(orgId, schedule_type, partion_type, startTime.Unix())
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}

controllers/dialysis_record_api_controller.go

@@ -1163,6 +1163,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	internal_fistula := this.GetString("internal_fistula")
 	catheter := this.GetString("catheter")
 	cruor := this.GetString("cruor")
+	mission := this.GetString("mission")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1457,7 +1458,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	}()
 
 	//执行下机
-	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor)
+	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 	redis := service.RedisClient()
 	defer redis.Close()
@@ -1736,6 +1737,7 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	internal_fistula := c.GetString("internal_fistula")
 	catheter := c.GetString("catheter")
 	cruor := c.GetString("cruor")
+	mission := c.GetString("mission")
 	if record_id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1782,6 +1784,7 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 		BloodAccessInternalFistula: internal_fistula,
 		Catheter:                   catheter,
 		Cruor:                      cruor,
+		Mission:                    mission,
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -574,6 +574,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
 	fmt.Println("doctorAdvices23344334344433434334343434wode", doctorAdvices)
+
+	lastOrder, _ := service.GetLastDilysisOrder(adminInfo.Org.Id, patientID, date.Unix())
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -606,6 +608,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"team_projects":                  team_projects,
 		"is_advice_open":                 is_advice_open,
 		"prescription_open":              prescriptionConfig.IsOpen,
+		"lastOrder":                      lastOrder,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -1683,6 +1686,7 @@ func (c *DialysisAPIController) Finish() {
 	internal_fistula := c.GetString("blood_access_internal_fistula")
 	catheter := c.GetString("catheter")
 	cruor := c.GetString("cruor")
+	mission := c.GetString("mission")
 	if id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1994,7 +1998,7 @@ func (c *DialysisAPIController) Finish() {
 		return
 	}
 	if dialysisOrder.Stage == 1 {
-		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor)
+		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 		redis := service.RedisClient()
@@ -2090,7 +2094,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	zone_id, _ := this.GetInt64("zone_id")
-
+	elecsign := this.GetString("url")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2279,6 +2283,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		DialysisIrrigation:     dialysis_irrigation,
 		DialysisDialyszers:     dialysis_dialyszers,
 		BloodAccessId:          blood_access_id,
+		Url:                    elecsign,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -3278,6 +3283,7 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 	blood_access_internal_fistula := c.GetString("blood_access_internal_fistula")
 	catheter := c.GetString("catheter")
 	cruor := c.GetString("cruor")
+	mission := c.GetString("mission")
 	if record_id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -3324,6 +3330,7 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 		BloodAccessInternalFistula: blood_access_internal_fistula,
 		Catheter:                   catheter,
 		Cruor:                      cruor,
+		Mission:                    mission,
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)

models/dialysis.go

@@ -842,6 +842,7 @@ type DialysisOrder struct {
 	DialysisDialyszers         string        `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	BloodAccessId              int64         `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
+	Mission                    string        `gorm:"column:mission" json:"mission" form:"mission"`
 }
 
 func (DialysisOrder) TableName() string {

models/schedule_models.go

@@ -351,24 +351,105 @@ func (NewMSchedualPatientVMList) TableName() string {
 }
 
 type VmBloodScheduleTwo 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"`
-	DeviceNumber                *NewMDeviceNumberVM         `gorm:"ForeignKey:BedId" json:"device_number"`
-	SchedualPatient             *NewMSchedualPatientVMList  `gorm:"ForeignKey:PatientId" json:"patient"`
-	HisPrescriptionInfoTemplate HisPrescriptionInfoTemplate `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
+	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"`
+	DeviceNumber               *NewMDeviceNumberVM        `gorm:"ForeignKey:BedId" json:"device_number"`
+	SchedualPatient            *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
+	HisPrescriptionTemplateSix HisPrescriptionTemplateSix `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
 }
 
 func (VmBloodScheduleTwo) TableName() string {
 	return "xt_schedule"
 }
+
+type HisPrescriptionTemplateSix 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"`
+	Type                           int64                             `gorm:"column:type" json:"type" form:"type"`
+	Status                         int64                             `gorm:"column:status" json:"status" form:"status"`
+	Ctime                          int64                             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                          int64                             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Name                           string                            `gorm:"column:name" json:"name" form:"name"`
+	Mode                           int64                             `gorm:"column:mode" json:"mode" form:"mode"`
+	HisPrescriptionInfoTemplateSix []*HisPrescriptionInfoTemplateSix `gorm:"ForeignKey:PTemplateId;AssociationForeignKey:ID" json:"his_prescription_info"`
+}
+
+func (HisPrescriptionTemplateSix) TableName() string {
+	return "his_prescription_template"
+}
+
+type HisPrescriptionInfoTemplateSix 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"`
+	RecordDate                          int64                                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId                           int64                                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status                              int64                                  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                               int64                                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                               int64                                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Type                                int64                                  `gorm:"column:type" json:"type" form:"type"`
+	Creator                             int64                                  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                            int64                                  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	PType                               int64                                  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	PTemplateId                         int64                                  `gorm:"column:p_template_id" json:"p_template_id" form:"p_template_id"`
+	HisPrescriptionProjectTemplateSeven []*HisPrescriptionProjectTemplateSeven `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	MedType                             string                                 `gorm:"column:med_type" json:"med_type" form:"med_type"`
+}
+
+func (HisPrescriptionInfoTemplateSix) TableName() string {
+	return "his_prescription_info_template"
+}
+
+type HisPrescriptionProjectTemplateSeven struct {
+	ID                 int64         `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64         `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64       `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64         `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64         `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64         `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64         `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64         `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64         `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64         `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count              string        `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string        `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string        `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string        `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string        `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string        `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string        `gorm:"column:day" json:"day" form:"day"`
+	Remark             string        `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string        `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64         `gorm:"column:type" json:"type" form:"type"`
+	PrescriptionId     int64         `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	GoodInfo           GoodInfoNight `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_info"`
+	FrequencyType      int64         `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount           int64         `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay            string        `gorm:"column:week_day" json:"week_day" form:"week_day"`
+}
+
+func (HisPrescriptionProjectTemplateSeven) TableName() string {
+	return "his_prescription_project_template"
+}
+
+type GoodInfoNight struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+}
+
+func (GoodInfoNight) TableName() string {
+	return "xt_good_information"
+}

service/dialysis_service.go

@@ -553,8 +553,8 @@ func CreateDialysisRecord(id int64, orgId int64, record *models.DialysisOrder) e
 	return nil
 }
 
-func ModifyDialysisRecord(id int64, finishNurse int64, end_time int64, admin_user_id int64, puncture_point_haematoma int64, internal_fistula string, catheter string, cruor string) error {
-	err := writeDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1 ", id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "stage": 2, "finish_nurse": finishNurse, "end_time": end_time, "finish_creator": admin_user_id, "finish_modifier": admin_user_id, "puncture_point_haematoma": puncture_point_haematoma, "blood_access_internal_fistula": internal_fistula, "catheter": catheter, "cruor": cruor}).Error
+func ModifyDialysisRecord(id int64, finishNurse int64, end_time int64, admin_user_id int64, puncture_point_haematoma int64, internal_fistula string, catheter string, cruor string, mission string) error {
+	err := writeDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1 ", id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "stage": 2, "finish_nurse": finishNurse, "end_time": end_time, "finish_creator": admin_user_id, "finish_modifier": admin_user_id, "puncture_point_haematoma": puncture_point_haematoma, "blood_access_internal_fistula": internal_fistula, "catheter": catheter, "cruor": cruor, "mission": mission}).Error
 	return err
 
 }

service/dialysis_solution_service.go

@@ -294,9 +294,11 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("HisPrescriptionInfoTemplate", func(db *gorm.DB) *gorm.DB {
-				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
-					return db.Where("user_org_id = ? and status = 1 and type =3 ", orgID).Preload("GoodInfo", "org_id = ? and status = 1", orgID)
+			Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+						return db.Where("user_org_id = ? and status = 1 and type = 3", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+					})
 				})
 			})
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
@@ -306,12 +308,45 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("HisPrescriptionInfoTemplate", func(db *gorm.DB) *gorm.DB {
-				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
-					return db.Where("user_org_id = ? and status = 1 and type =3 ", orgID).Preload("GoodInfo", "org_id = ? and status = 1", orgID)
+			Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+						return db.Where("user_org_id = ? and status = 1 and type = 3", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+					})
 				})
 			}).Find(&schedule).Error
 	}
 
 	return schedule, total, err
 }
+
+func GetHisDialysisGoodCount(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleTwo, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
+	if scheduleDate > 0 {
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
+	}
+
+	err = db.
+		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 3", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+				})
+			})
+		}).Find(&schedule).Error
+
+	return schedule, err
+}

service/mobile_dialysis_service.go

@@ -2033,7 +2033,7 @@ func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 func ModifyFinishDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"finish_nurse": order.FinishNurse, "updated_time": updateTime, "end_time": order.EndTime, "finish_modifier": order.FinishModifier, "puncture_point_haematoma": order.PuncturePointHaematoma, "blood_access_internal_fistula": order.BloodAccessInternalFistula, "catheter": order.Catheter, "cruor": order.Cruor}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"finish_nurse": order.FinishNurse, "updated_time": updateTime, "end_time": order.EndTime, "finish_modifier": order.FinishModifier, "puncture_point_haematoma": order.PuncturePointHaematoma, "blood_access_internal_fistula": order.BloodAccessInternalFistula, "catheter": order.Catheter, "cruor": order.Cruor, "mission": order.Mission}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -4109,3 +4109,12 @@ func GetGoodWarehouseOutInfo(orgId int64, patient_id int64, sys_record_time int6
 	err = readDb.Where("org_id = ? and patient_id = ? and sys_record_time = ? and status = 1", orgId, patient_id, sys_record_time).Find(&outifno).Error
 	return outifno, err
 }
+
+func GetLastDilysisOrder(orgid int64, patient_id int64, dialysis_date int64) (models.DialysisOrder, error) {
+
+	order := models.DialysisOrder{}
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and dialysis_date < ? and status= 1", orgid, patient_id, dialysis_date).Last(&order).Error
+
+	return order, err
+}