添加新字段

controllers/dialysis_api_controller.go

@@ -139,6 +139,10 @@ func (c *DialysisApiController) PostPrescription() {
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 	preImpules, _ := c.GetFloat("pre_impulse", 0)
 	fmt.Println("========================================================", preImpules)
+
+	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
+	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
+
 	// var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -216,6 +220,8 @@ func (c *DialysisApiController) PostPrescription() {
 		Package:                    safe_package,
 		ALiquid:                    a_liquid,
 		PreImpulse:                 preImpules,
+		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
+		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -1481,6 +1487,9 @@ func (c *DialysisApiController) PostSoulution() {
 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 
+	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
+	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
+
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1569,6 +1578,9 @@ func (c *DialysisApiController) PostSoulution() {
 		TubingHemodialysis:         tubing_hemodialysis,
 		Package:                    safe_package,
 		ALiquid:                    a_liquid,
+
+		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
+		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -3198,6 +3210,11 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
 	phinholing := c.GetString("pinholing")
 
+	catheter_suture := c.GetString("catheter_suture")
+	catheter_suture_other := c.GetString("catheter_suture_other")
+	edema := c.GetString("edema")
+	urine_volume, _ := c.GetFloat("urine_volume", 0)
+
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -3249,6 +3266,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		PunctureNeedle:                 puncture_needle,
 		HumorExcessiveSymptom:          humor_excessive_symptom,
 		Phinholing:                     phinholing,
+		CatheterSuture:                 catheter_suture,
+		CatheterSutureOther:            catheter_suture_other,
+		Edema:                          edema,
+		UrineVolume:                    urine_volume,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -3311,7 +3332,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 && templateInfo.TemplateId == 22 {
+			if templateInfo.TemplateId == 17 && templateInfo.TemplateId == 22 && templateInfo.TemplateId == 21 {
 				dewater_amount = dewater_amount * 1000
 			}
 			if dewater_amount <= 0 {

controllers/dialysis_record_api_controller.go

@@ -499,15 +499,15 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringNurse:           adminUserInfo.AdminUser.Id,
 			Conductivity:              monitorParam.Conductivity,
 			DisplacementFlowQuantity:  monitorParam.DisplacementFlowQuantity,
-			Status:                    1,
-			CreatedTime:               time.Now().Unix(),
-			UpdatedTime:               time.Now().Unix(),
-			BloodOxygenSaturation:     monitorParam.BloodOxygenSaturation,
-			Creator:                   adminUserInfo.AdminUser.Id,
-			Heparin:                   monitorParam.Heparin,
-			DialysateFlow:             monitorParam.DialysateFlow,
-			Urr:                       monitorParam.Urr,
-			BloodSugar:                monitorParam.BloodSugar,
+			Status:                1,
+			CreatedTime:           time.Now().Unix(),
+			UpdatedTime:           time.Now().Unix(),
+			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
+			Creator:               adminUserInfo.AdminUser.Id,
+			Heparin:               monitorParam.Heparin,
+			DialysateFlow:         monitorParam.DialysateFlow,
+			Urr:                   monitorParam.Urr,
+			BloodSugar:            monitorParam.BloodSugar,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -600,6 +600,8 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	blood_drawing, _ := this.GetInt64("blood_drawing")
 	schedual_type, _ := this.GetInt64("schedual_type")
 
+	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
+
 	bedID, _ := this.GetInt64("bed")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2141,6 +2143,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		Creator:       adminUserInfo.AdminUser.Id,
 		Modifier:      adminUserInfo.AdminUser.Id,
 		SchedualType:  schedual_type,
+		WashpipeNurse: washpipe_nurse,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -2431,6 +2434,8 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	puncture_nurse, _ := this.GetInt64("puncture_nurse")
 	bedID, _ := this.GetInt64("bed")
 	start_time := this.GetString("start_time")
+	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
+
 	schedual_type, _ := this.GetInt64("schedual_type")
 
 	if record_id == 0 {
@@ -2560,6 +2565,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		Creator:       adminUserInfo.AdminUser.Id,
 		Modifier:      adminUserInfo.AdminUser.Id,
 		SchedualType:  schedual_type,
+		WashpipeNurse: washpipe_nurse,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1033,6 +1033,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 	pre_impulse, parseDateErr := c.GetFloat("pre_impulse", 0)
 	fmt.Println("预冲量====", pre_impulse)
+	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
+	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
@@ -1113,6 +1116,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		ALiquid:                    a_liquid,
 		TargetKtv:                  target_ktv,
 		PreImpulse:                 pre_impulse,
+		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
+		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2563,6 +2568,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	bedID, _ := this.GetInt64("bed")
 	start_time := this.GetString("start_time")
+	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
 
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2740,6 +2746,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		Creator:       adminUserInfo.AdminUser.Id,
 		Modifier:      adminUserInfo.AdminUser.Id,
 		SchedualType:  schedual_type,
+		WashpipeNurse: washpipe_nurse,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
@@ -4254,6 +4261,9 @@ func (c *DialysisAPIController) PostSolution() {
 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 
+	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
+	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
+
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -4322,28 +4332,30 @@ func (c *DialysisAPIController) PostSolution() {
 		DialyzerPerfusionApparatus: dialyzerPerfusionApparatus,
 		BodyFluid:                  body_fluid,
 
-		SpecialMedicine:      special_medicine,
-		SpecialMedicineOther: special_medicine_other,
-		DisplaceLiquiPart:    displace_liqui_part,
-		DisplaceLiquiValue:   displace_liqui_value,
-		BloodAccess:          blood_access,
-		Ultrafiltration:      ultrafiltration,
-		BodyFluidOther:       body_fluid_other,
-		ReplacementTotal:     replacement_total,
-		Niprocart:            niprocart,
-		Jms:                  jms,
-		FistulaNeedleSet:     fistula_needle_set,
-		FistulaNeedleSet16:   fistula_needle_set_16,
-		Hemoperfusion:        hemoperfusion,
-		DialyserSterilised:   dialyser_sterilised,
-		Filtryzer:            filtryzer,
-		TargetKtv:            target_ktv,
-		Dialyzers:            dialyzers,
-		Injector:             injector,
-		Bloodlines:           bloodlines,
-		TubingHemodialysis:   tubing_hemodialysis,
-		Package:              safe_package,
-		ALiquid:              a_liquid,
+		SpecialMedicine:           special_medicine,
+		SpecialMedicineOther:      special_medicine_other,
+		DisplaceLiquiPart:         displace_liqui_part,
+		DisplaceLiquiValue:        displace_liqui_value,
+		BloodAccess:               blood_access,
+		Ultrafiltration:           ultrafiltration,
+		BodyFluidOther:            body_fluid_other,
+		ReplacementTotal:          replacement_total,
+		Niprocart:                 niprocart,
+		Jms:                       jms,
+		FistulaNeedleSet:          fistula_needle_set,
+		FistulaNeedleSet16:        fistula_needle_set_16,
+		Hemoperfusion:             hemoperfusion,
+		DialyserSterilised:        dialyser_sterilised,
+		Filtryzer:                 filtryzer,
+		TargetKtv:                 target_ktv,
+		Dialyzers:                 dialyzers,
+		Injector:                  injector,
+		Bloodlines:                bloodlines,
+		TubingHemodialysis:        tubing_hemodialysis,
+		Package:                   safe_package,
+		ALiquid:                   a_liquid,
+		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
+		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -5657,6 +5669,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	bedID, _ := this.GetInt64("bed")
 	start_time := this.GetString("start_time")
 	schedual_type, _ := this.GetInt64("schedual_type")
+	washpipe_nurse, _ := this.GetInt64("washpipe_nurse")
 
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
@@ -5784,6 +5797,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		PunctureNurse: puncture_nurse,
 		Creator:       adminUserInfo.AdminUser.Id,
 		Modifier:      adminUserInfo.AdminUser.Id,
+		WashpipeNurse: washpipe_nurse,
 		SchedualType:  schedual_type,
 	}
 

controllers/mobile_api_controllers/login_api_controller.go

@@ -32,8 +32,8 @@ func (this *LoginAPIController) LoginByPwd() {
 		return
 	}
 	ip := utils.GetIP(this.Ctx.Request)
-	//ssoDomain := beego.AppConfig.String("sso_domain")
-	ssoDomain := "http://localhost:8091"
+	ssoDomain := beego.AppConfig.String("sso_domain")
+	//ssoDomain := "http://localhost:8091"
 	api := ssoDomain + "/m/login/pwd"
 	values := make(url.Values)
 	values.Set("mobile", mobile)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -886,7 +886,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 {
 			dewater_amount = dewater_amount * 1000
 
 		}
@@ -1664,6 +1664,27 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		pinholing := dataBody["pinholing"].(string)
 		evaluation.Phinholing = pinholing
 	}
+
+	if dataBody["catheter_suture"] != nil && reflect.TypeOf(dataBody["catheter_suture"]).String() == "string" {
+		catheter_suture := dataBody["catheter_suture"].(string)
+		evaluation.CatheterSuture = catheter_suture
+	}
+
+	if dataBody["catheter_suture_other"] != nil && reflect.TypeOf(dataBody["catheter_suture_other"]).String() == "string" {
+		catheter_suture_other := dataBody["catheter_suture_other"].(string)
+		evaluation.CatheterSutureOther = catheter_suture_other
+	}
+
+	if dataBody["urine_volume"] != nil && reflect.TypeOf(dataBody["urine_volume"]).String() == "string" {
+		urine_volume, _ := strconv.ParseFloat(dataBody["urine_volume"].(string), 64)
+		evaluation.UrineVolume = urine_volume
+	}
+
+	if dataBody["edema"] != nil && reflect.TypeOf(dataBody["edema"]).String() == "string" {
+		edema := dataBody["edema"].(string)
+		evaluation.Edema = edema
+	}
+
 	return
 }
 

controllers/schedule_api_controller.go

@@ -36,6 +36,10 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/export", &ScheduleApiController{}, "post:ExportSchedule")
 	beego.Router("/api/schedule_template/export", &ScheduleApiController{}, "post:ExportScheduleTemplate")
 
+	beego.Router("/api/schedule_template/search", &ScheduleApiController{}, "get:SearchTemplateSchedulePatients")
+
+	beego.Router("/api/schedule_template/cancel", &ScheduleApiController{}, "post:CancelScheduleTemplate")
+
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -1280,7 +1284,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 		if len(schedules) > 0 {
 			schedule_date := time.Now().Format("2006-01-02")
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
-			clear_schedule_date := date.Unix() //根据日期去清除，该日期以及未来的排班数据
+			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
 			err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				for _, item := range schedules {
@@ -1858,3 +1862,29 @@ func GetWeekString(week string) string {
 	}
 	return weekStr
 }
+
+func (c *ScheduleApiController) SearchTemplateSchedulePatients() {
+	template_id, _ := c.GetInt64("template_id", 0)
+	keywords := c.GetString("keywords")
+	adminInfo := c.GetAdminUserInfo()
+	scheduleItems, _ := service.GetTemplateSchedualPatientsByKeywords(keywords, adminInfo.CurrentOrgId, template_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"schdules": scheduleItems,
+	})
+}
+
+func (c *ScheduleApiController) CancelScheduleTemplate() {
+	item_id, _ := c.GetInt64("id")
+	adminInfo := c.GetAdminUserInfo()
+	err := service.UpdateNewScheduleTemplateStatus(item_id, adminInfo.CurrentOrgId)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "取消成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExportError)
+		return
+	}
+}

models/common_models.go

@@ -100,6 +100,7 @@ type SgjDialysisOrder struct {
 	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
 	Number         int64  `gorm:"column:number" json:"number" form:"number"`
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
 func (SgjDialysisOrder) TableName() string {
@@ -284,6 +285,8 @@ type BloodDialysisPrescription struct {
 	IdCardNo                   string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	TotalDialysis              int64   `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
 	UserSysBeforeCount         int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 }
 
 func (BloodDialysisPrescription) TableName() string {

models/dialysis.go

@@ -268,6 +268,10 @@ type PredialysisEvaluation struct {
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other"`
 	HumorExcessiveSymptom          int64   `gorm:"column:humor_excessive_symptom" json:"humor_excessive_symptom"`
 	Phinholing                     string  `gorm:"column:pinholing" json:"pinholing" form:"pinholing"`
+	CatheterSuture                 string  `gorm:"column:catheter_suture" json:"catheter_suture" form:"catheter_suture"`
+	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
+	UrineVolume                    float64 `gorm:"column:urine_volume" json:"urine_volume" form:"urine_volume"`
+	Edema                          string  `gorm:"column:edema" json:"edema" form:"edema"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -718,6 +722,7 @@ type DialysisOrder struct {
 	FinishModifier int64         `gorm:"column:finish_modifier" json:"finish_modifier"`
 	SchedualType   int64         `gorm:"column:schedual_type" json:"schedual_type"`
 	UserAdminRole  UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:StartNurse;"`
+	WashpipeNurse  int64         `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -748,6 +753,7 @@ type XtDialysisOrder struct {
 	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
 	Number         int64  `gorm:"column:number" json:"number" form:"number"`
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
 func (XtDialysisOrder) TableName() string {

models/monitor_models.go

@@ -133,6 +133,7 @@ type MonitorDialysisOrder struct {
 	FinishCreator  int64        `gorm:"column:finish_creator" json:"finish_creator"`
 	FinishModifier int64        `gorm:"column:finish_modifier" json:"finish_modifier"`
 	SchedualType   int64        `gorm:"column:schedual_type" json:"schedual_type"`
+	WashpipeNurse  int64        `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
 func (MonitorDialysisOrder) TableName() string {

models/patient_models.go

@@ -221,6 +221,8 @@ type DialysisPrescription struct {
 	ALiquid                    int64         `gorm:"column:a_liquid" json:"a_liquid"`
 	UserAdminRole              UserAdminRole `json:"role" gorm:"foreignkey:AdminUserId;AssociationForeignKey:Creater;"`
 	PreImpulse                 float64       `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
+	AnticoagulantStopTimeMin   int64         `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	AnticoagulantStopTimeHour  int64         `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 }
 
 func (DialysisPrescription) TableName() string {

models/user_models.go

@@ -189,6 +189,8 @@ type XtDialysisPrescription struct {
 	TubingHemodialysis         int64   `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis" form:"tubing_hemodialysis"`
 	Package                    int64   `gorm:"column:package" json:"package" form:"package"`
 	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid" form:"a_liquid"`
+	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 }
 
 func (XtDialysisPrescription) TableName() string {
@@ -267,6 +269,8 @@ type XtDialysisPrescriptions struct {
 	Package                    int64   `gorm:"column:package" json:"package" form:"package"`
 	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid" form:"a_liquid"`
 	UserName                   string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 }
 
 type XtDialysisSolution struct {

service/mobile_dialysis_service.go

@@ -237,6 +237,7 @@ type MDialysisOrderVM struct {
 	FinishCreator     int64                      `gorm:"column:finish_creator" json:"finish_creator"`
 	FinishModifier    int64                      `gorm:"column:finish_modifier" json:"finish_modifier"`
 	SchedualType      int64                      `gorm:"column:schedual_type" json:"schedual_type"`
+	WashpipeNurse     int64                      `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
 func (MDialysisOrderVM) TableName() string {
@@ -251,11 +252,12 @@ type MDialysisOrderVMList struct {
 	// PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
 	Stage int64 `gorm:"column:stage" json:"stage"`
 	// Remark         string `gorm:"column:remark" json:"remark"`
-	BedID        int64            `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse   int64            `gorm:"column:start_nurse" json:"start_nurse"`
-	Status       int64            `gorm:"column:status" json:"status"`
-	DeviceNumber *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
-	Creator      int64            `gorm:"column:creator" json:"creator"`
+	BedID         int64            `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse    int64            `gorm:"column:start_nurse" json:"start_nurse"`
+	Status        int64            `gorm:"column:status" json:"status"`
+	DeviceNumber  *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
+	Creator       int64            `gorm:"column:creator" json:"creator"`
+	WashpipeNurse int64            `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
 func (MDialysisOrderVMList) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -99,6 +99,7 @@ type DialysisOrderVM struct {
 	FinishCreator  int64           `gorm:"column:finish_creator" json:"finish_creator"`
 	FinishModifier int64           `gorm:"column:finish_modifier" json:"finish_modifier"`
 	SchedualType   int64           `gorm:"column:schedual_type" json:"schedual_type"`
+	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 }
 
 func (DialysisOrderVM) TableName() string {
@@ -189,6 +190,8 @@ type PrescriptionVM struct {
 	TubingHemodialysis         int64   `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis"`
 	Package                    int64   `gorm:"column:package" json:"package"`
 	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid"`
+	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 }
 
 func (PrescriptionVM) TableName() string {
@@ -256,6 +259,10 @@ type AssessmentBeforeDislysisVM struct {
 	LastPostDialysisOther          string  `gorm:"column:last_post_dialysis_other" json:"last_post_dialysis_other"`
 	SymptomBeforeDialysisOther     string  `gorm:"column:symptom_before_dialysis_other" json:"symptom_before_dialysis_other"`
 	DialysisInterphaseOther        string  `gorm:"column:dialysis_interphase_other" json:"dialysis_interphase_other"`
+	CatheterSuture                 string  `gorm:"column:catheter_suture" json:"catheter_suture" form:"catheter_suture"`
+	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
+	UrineVolume                    float64 `gorm:"column:urine_volume" json:"urine_volume" form:"urine_volume"`
+	Edema                          string  `gorm:"column:edema" json:"edema" form:"edema"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {

service/schedule_service.go

@@ -415,3 +415,66 @@ func GetDialysisOrderByBedId(orgID, start, bed_id int64, schedule_type int64) (s
 	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).First(&schedule).Error
 	return
 }
+
+type VMDeviceNumber 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     int8              `json:"-"`
+	CreateTime int64             `gorm:"column:ctime" json:"-"`
+	ModifyTime int64             `gorm:"column:mtime" json:"-"`
+	DeviceZone models.DeviceZone `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneID;"`
+}
+
+func (VMDeviceNumber) TableName() string {
+	return "xt_device_number"
+}
+
+type VMPatientScheduleTemplateItem struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgID          int64 `gorm:"column:org_id" json:"-" form:"org_id"`
+	TemplateID     int64 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	DeviceNumberID int64 `gorm:"column:device_number_id" json:"device_number_id" form:"device_number_id"`
+	PatientID      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	TreatMode      int64 `gorm:"column:treat_mode" json:"treat_mode" form:"treat_mode"` // 治疗模式
+	Weekday        int8  `gorm:"column  :weekday" json:"weekday" form:"weekday"`        // 周一-周日 1-7
+	TimeType       int8  `gorm:"column:time_type" json:"time_type" form:"time_type"`    // 上下晚 123
+	Status         int8  `gorm:"column:status" json:"status" form:"status"`
+	CreateTime     int64 `gorm:"column:ctime" json:"-" form:"ctime"`
+	ModifyTime     int64 `gorm:"column:mtime" json:"-" form:"mtime"`
+	IsExport       int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+
+	Patient      string         `gorm:"-" json:"patient" form:"patient"`
+	DeviceNumber VMDeviceNumber `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:DeviceNumberID;"`
+
+	PatientInfectiousDiseases []*models.InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+}
+
+func (VMPatientScheduleTemplateItem) TableName() string {
+	return "xt_patient_schedule_template_item"
+}
+
+func GetTemplateSchedualPatientsByKeywords(keywords string, org_id int64, template_id int64) (schedule []*VMPatientScheduleTemplateItem, err error) {
+	likeKey := "%" + keywords + "%"
+
+	err = readDb.
+		Table("xt_patient_schedule_template_item as s").
+		Preload("PatientInfectiousDiseases", "status = 1 ").
+		Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id = ? AND status = 1", org_id).Preload("DeviceZone", "org_id = ? AND status = 1", org_id)
+		}).
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).
+		Where("s.template_id = ? AND s.org_id=?  and s.status=1", template_id, org_id).
+		Select("s.id, s.org_id, s.template_id, s.device_number_id, s.patient_id, s.treat_mode, s.weekday, s.time_type, s.status, s.ctime, s.mtime, p.name as patient").
+		Order("weekday asc").
+		Find(&schedule).Error
+	return
+
+}
+
+func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
+	err = readDb.Model(&models.PatientScheduleTemplateItem{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}

service/statistics_service/index_models.go

@@ -16,6 +16,8 @@ type VMDialysisPrescription struct {
 	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute"`
 	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 }
 
 func (VMDialysisPrescription) TableName() string {