耗材参数

controllers/dialysis_api_controller.go

@@ -1214,6 +1214,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.Lapse = data.Lapse
 	assessment.Consciousness = data.Consciousness
 	assessment.Fallrisk = data.Fallrisk
+	assessment.MachineRun = data.MachineRun
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {

controllers/doctors_api_controller.go

@@ -725,13 +725,20 @@ func (this *DoctorsApiController) GetInspectionItemlist() {
 
 func (this *DoctorsApiController) GetInitDateList() {
 	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	end_time := this.GetString("end_time")
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 
-	prescription_list, _ := service.GetDialysisPrescriptionDataList(patient_id)
-	befor_list, err := service.GetDialysisBeforInitDateList(patient_id)
-	after_list, err := service.GetDialysisAssementAfter(patient_id)
-	//统计透析次数
-	modelist, err := service.GetDialysisDialysisMode(patient_id)
+	prescription_list, _ := service.GetDialysisPrescriptionDataList(patient_id, startTime.Unix(), endTime.Unix())
+	befor_list, err := service.GetDialysisBeforInitDateList(patient_id, startTime.Unix(), endTime.Unix())
+	after_list, err := service.GetDialysisAssementAfter(patient_id, startTime.Unix(), endTime.Unix())
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//统计透析次数
+	modelist, err := service.GetDialysisDialysisMode(patient_id, startTime.Unix(), endTime.Unix(), orgId)
+
 	docList, _ := service.GetAllDoctorThree(orgId)
 	stockType, err := service.GetStockType(orgId)
 
@@ -755,8 +762,9 @@ func (this *DoctorsApiController) GetInitDateList() {
 func (this *DoctorsApiController) SaveCreationInspection() {
 
 	title := this.GetString("title")
-	dry_weight, _ := this.GetFloat("dry_weight")
-	fmt.Println("hhhhhhhhhhhhh", dry_weight)
+
+	dryWeight := this.GetString("dry_weight")
+	dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
 	dialysis_count, _ := this.GetInt64("dialysis_count")
 	hd_count, _ := this.GetInt64("hd_count")
 	hdf_count, _ := this.GetInt64("hdf_count")
@@ -765,19 +773,22 @@ func (this *DoctorsApiController) SaveCreationInspection() {
 	dialzer_apparatus := this.GetString("dialzer_apparatus")
 	perfusion_apparatus := this.GetString("perfusion_apparatus")
 	anticoagulant, _ := this.GetInt64("anticoagulant")
-	fmt.Println(anticoagulant)
-	kalium, _ := this.GetFloat("kalium")
-	autunite, _ := this.GetFloat("autunite")
-	natrium, _ := this.GetFloat("natrium")
+	kaliumstr := this.GetString("kalium")
+	kalium, _ := strconv.ParseFloat(kaliumstr, 64)
+
+	autunitestr := this.GetString("autunite")
+	autunite, _ := strconv.ParseFloat(autunitestr, 64)
+	natriumstr := this.GetString("natrium")
+	natrium, _ := strconv.ParseFloat(natriumstr, 64)
 	hour, _ := this.GetInt64("hour")
 	minute, _ := this.GetInt64("minute")
-	befor_weight, _ := this.GetFloat("befor_weight")
-	after_weight, _ := this.GetFloat("after_weight")
+	beforWeight := this.GetString("befor_weight")
+	befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
+	afterWeight := this.GetString("after_weight")
+	after_weight, _ := strconv.ParseFloat(afterWeight, 64)
 	befor_pressure := this.GetString("befor_pressure")
 	template_summary_content := this.GetString("template_summary_content")
 	template_plan_content := this.GetString("template_plan_content")
-	template_inspection_content := this.GetString("template_inspection_content")
-	fmt.Println("hhhh232233232232332232323", template_inspection_content)
 	admin_user_id, _ := this.GetInt64("admin_user_id")
 	record_time := this.GetString("record_time")
 	timeLayout := "2006-01-02"
@@ -790,43 +801,46 @@ func (this *DoctorsApiController) SaveCreationInspection() {
 	patient_id, _ := this.GetInt64("patient_id")
 	fmt.Println("patient_id", patient_id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	inspect_date := this.GetString("inspect_date")
+	project_id := this.GetString("project_id")
 	summary := models.XtTemplateSummary{
-		StartYear:                 0,
-		StartMonth:                0,
-		Radio:                     0,
-		Quarter:                   0,
-		DryWeight:                 dry_weight,
-		DialysisCount:             dialysis_count,
-		HdCount:                   hd_count,
-		HdfCount:                  hdf_count,
-		HpCount:                   hp_count,
-		OtherCount:                other_count,
-		DialzerApparatus:          dialzer_apparatus,
-		PerfusionApparatus:        perfusion_apparatus,
-		Anticoagulant:             anticoagulant,
-		Kalium:                    kalium,
-		Autunite:                  autunite,
-		Natrium:                   natrium,
-		Hour:                      hour,
-		Minute:                    minute,
-		BeforWeight:               befor_weight,
-		AfterWeight:               after_weight,
-		BeforPressure:             befor_pressure,
-		AfterPressure:             after_pressure,
-		TemplateSummaryId:         template_summary_id,
-		TemplateSummaryContent:    template_summary_content,
-		TemplatePlanId:            template_plan_id,
-		TemplatePlanContent:       template_plan_content,
-		TemplateInspectionId:      template_inspection_id,
-		TemplateInspectionContent: template_inspection_content,
-		AdminUserId:               admin_user_id,
-		RecordTime:                recordTime.Unix(),
-		PatientId:                 patient_id,
-		UserOrgId:                 orgId,
-		Status:                    1,
-		Ctime:                     time.Now().Unix(),
-		Mtime:                     0,
-		Title:                     title,
+		StartYear:              0,
+		StartMonth:             0,
+		Radio:                  0,
+		Quarter:                0,
+		DryWeight:              dry_weight,
+		DialysisCount:          dialysis_count,
+		HdCount:                hd_count,
+		HdfCount:               hdf_count,
+		HpCount:                hp_count,
+		OtherCount:             other_count,
+		DialzerApparatus:       dialzer_apparatus,
+		PerfusionApparatus:     perfusion_apparatus,
+		Anticoagulant:          anticoagulant,
+		Kalium:                 kalium,
+		Autunite:               autunite,
+		Natrium:                natrium,
+		Hour:                   hour,
+		Minute:                 minute,
+		BeforWeight:            befor_weight,
+		AfterWeight:            after_weight,
+		BeforPressure:          befor_pressure,
+		AfterPressure:          after_pressure,
+		TemplateSummaryId:      template_summary_id,
+		TemplateSummaryContent: template_summary_content,
+		TemplatePlanId:         template_plan_id,
+		TemplatePlanContent:    template_plan_content,
+		TemplateInspectionId:   template_inspection_id,
+		AdminUserId:            admin_user_id,
+		RecordTime:             recordTime.Unix(),
+		PatientId:              patient_id,
+		UserOrgId:              orgId,
+		Status:                 1,
+		Ctime:                  time.Now().Unix(),
+		Mtime:                  0,
+		Title:                  title,
+		InspectDate:            inspect_date,
+		ProjectId:              project_id,
 	}
 
 	err := service.CreateSummary(&summary)
@@ -841,8 +855,14 @@ func (this *DoctorsApiController) SaveCreationInspection() {
 
 func (this *DoctorsApiController) GetTemplateSummaryList() {
 	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	end_time := this.GetString("end_time")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, err := service.GetTemplateSummaryList(patient_id, orgId)
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	list, err := service.GetTemplateSummaryList(patient_id, orgId, startTime.Unix(), endTime.Unix())
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list": list,
@@ -855,9 +875,14 @@ func (this *DoctorsApiController) GetTemplateSummaryDetail() {
 
 	id, _ := this.GetInt64("id")
 	list, err := service.GetTemplateSummaryDetail(id)
+
+	ids := strings.Split(list.ProjectId, ",")
+	datelist := strings.Split(list.InspectDate, ",")
+	inspectlist, err := service.GetInspectionItemlist(list.PatientId, datelist, ids)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": list,
+			"list":        list,
+			"inspectlist": inspectlist,
 		})
 		return
 	}
@@ -867,12 +892,16 @@ func (this *DoctorsApiController) GetTemplateSummaryPrintDetail() {
 
 	id, _ := this.GetInt64("id")
 	list, err := service.GetTemplateSummaryPrintDetail(id)
+	ids := strings.Split(list.ProjectId, ",")
+	datelist := strings.Split(list.InspectDate, ",")
+	inspectlist, err := service.GetInspectionItemlist(list.PatientId, datelist, ids)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	doctorList, _ := service.GetAllDoctorThree(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
-			"doctorList": doctorList,
+			"list":        list,
+			"doctorList":  doctorList,
+			"inspectlist": inspectlist,
 		})
 		return
 	}
@@ -882,8 +911,9 @@ func (this *DoctorsApiController) UpdateTempalteSummary() {
 
 	id, _ := this.GetInt64("id")
 	title := this.GetString("title")
-	dry_weight, _ := this.GetFloat("dry_weight")
-	fmt.Println("hhhhhhhhhhhhh", dry_weight)
+
+	dryWeight := this.GetString("dry_weight")
+	dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
 	dialysis_count, _ := this.GetInt64("dialysis_count")
 	hd_count, _ := this.GetInt64("hd_count")
 	hdf_count, _ := this.GetInt64("hdf_count")
@@ -892,19 +922,22 @@ func (this *DoctorsApiController) UpdateTempalteSummary() {
 	dialzer_apparatus := this.GetString("dialzer_apparatus")
 	perfusion_apparatus := this.GetString("perfusion_apparatus")
 	anticoagulant, _ := this.GetInt64("anticoagulant")
-	fmt.Println(anticoagulant)
-	kalium, _ := this.GetFloat("kalium")
-	autunite, _ := this.GetFloat("autunite")
-	natrium, _ := this.GetFloat("natrium")
+	kaliumstr := this.GetString("kalium")
+	kalium, _ := strconv.ParseFloat(kaliumstr, 64)
+
+	autunitestr := this.GetString("autunite")
+	autunite, _ := strconv.ParseFloat(autunitestr, 64)
+	natriumstr := this.GetString("natrium")
+	natrium, _ := strconv.ParseFloat(natriumstr, 64)
 	hour, _ := this.GetInt64("hour")
 	minute, _ := this.GetInt64("minute")
-	befor_weight, _ := this.GetFloat("befor_weight")
-	after_weight, _ := this.GetFloat("after_weight")
+	beforWeight := this.GetString("befor_weight")
+	befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
+	afterWeight := this.GetString("after_weight")
+	after_weight, _ := strconv.ParseFloat(afterWeight, 64)
 	befor_pressure := this.GetString("befor_pressure")
 	template_summary_content := this.GetString("template_summary_content")
 	template_plan_content := this.GetString("template_plan_content")
-	template_inspection_content := this.GetString("template_inspection_content")
-	fmt.Println("hhhh232233232232332232323", template_inspection_content)
 	admin_user_id, _ := this.GetInt64("admin_user_id")
 	record_time := this.GetString("record_time")
 	timeLayout := "2006-01-02"
@@ -917,44 +950,47 @@ func (this *DoctorsApiController) UpdateTempalteSummary() {
 	patient_id, _ := this.GetInt64("patient_id")
 	fmt.Println("patient_id", patient_id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	inspect_date := this.GetString("inspect_date")
+	project_id := this.GetString("project_id")
 	summary := models.XtTemplateSummary{
-		ID:                        id,
-		StartYear:                 0,
-		StartMonth:                0,
-		Radio:                     0,
-		Quarter:                   0,
-		DryWeight:                 dry_weight,
-		DialysisCount:             dialysis_count,
-		HdCount:                   hd_count,
-		HdfCount:                  hdf_count,
-		HpCount:                   hp_count,
-		OtherCount:                other_count,
-		DialzerApparatus:          dialzer_apparatus,
-		PerfusionApparatus:        perfusion_apparatus,
-		Anticoagulant:             anticoagulant,
-		Kalium:                    kalium,
-		Autunite:                  autunite,
-		Natrium:                   natrium,
-		Hour:                      hour,
-		Minute:                    minute,
-		BeforWeight:               befor_weight,
-		AfterWeight:               after_weight,
-		BeforPressure:             befor_pressure,
-		AfterPressure:             after_pressure,
-		TemplateSummaryId:         template_summary_id,
-		TemplateSummaryContent:    template_summary_content,
-		TemplatePlanId:            template_plan_id,
-		TemplatePlanContent:       template_plan_content,
-		TemplateInspectionId:      template_inspection_id,
-		TemplateInspectionContent: template_inspection_content,
-		AdminUserId:               admin_user_id,
-		RecordTime:                recordTime.Unix(),
-		PatientId:                 patient_id,
-		UserOrgId:                 orgId,
-		Status:                    1,
-		Ctime:                     time.Now().Unix(),
-		Mtime:                     0,
-		Title:                     title,
+		ID:                     id,
+		StartYear:              0,
+		StartMonth:             0,
+		Radio:                  0,
+		Quarter:                0,
+		DryWeight:              dry_weight,
+		DialysisCount:          dialysis_count,
+		HdCount:                hd_count,
+		HdfCount:               hdf_count,
+		HpCount:                hp_count,
+		OtherCount:             other_count,
+		DialzerApparatus:       dialzer_apparatus,
+		PerfusionApparatus:     perfusion_apparatus,
+		Anticoagulant:          anticoagulant,
+		Kalium:                 kalium,
+		Autunite:               autunite,
+		Natrium:                natrium,
+		Hour:                   hour,
+		Minute:                 minute,
+		BeforWeight:            befor_weight,
+		AfterWeight:            after_weight,
+		BeforPressure:          befor_pressure,
+		AfterPressure:          after_pressure,
+		TemplateSummaryId:      template_summary_id,
+		TemplateSummaryContent: template_summary_content,
+		TemplatePlanId:         template_plan_id,
+		TemplatePlanContent:    template_plan_content,
+		TemplateInspectionId:   template_inspection_id,
+		AdminUserId:            admin_user_id,
+		RecordTime:             recordTime.Unix(),
+		PatientId:              patient_id,
+		UserOrgId:              orgId,
+		Status:                 1,
+		Ctime:                  time.Now().Unix(),
+		Mtime:                  0,
+		Title:                  title,
+		ProjectId:              project_id,
+		InspectDate:            inspect_date,
 	}
 	err := service.UpdateTempalteSummary(&summary)
 	if err == nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -863,6 +863,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	lapse, _ := c.GetInt64("lapse")
 	consciousness, _ := c.GetInt64("consciousness")
 	fallrisk, _ := c.GetInt64("fallrisk")
+	machine_run := c.GetString("machine_run")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -963,6 +964,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		LeaveOfficeMethod:            leave_office_method,
 		Consciousness:                consciousness,
 		Fallrisk:                     fallrisk,
+		MachineRun:                   machine_run,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2825,7 +2825,18 @@ func (this *NewDialysisApiController) GetTreateSummary() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	creater, _ := this.GetInt64("creater")
-	list, total, err := service.GetTreateSummary(startTimeUnix.Unix(), endTimeUnix.Unix(), limit, page, creater)
+	patient_id, _ := this.GetInt64("patient_id")
+	list, total, err := service.GetTreateSummary(startTimeUnix.Unix(), endTimeUnix.Unix(), limit, page, creater, patient_id)
+	//var inspectionTemplate []*models.VmInspection
+	for _, item := range list {
+		ids := strings.Split(item.ProjectId, ",")
+		datelist := strings.Split(item.InspectDate, ",")
+		itemlist, _ := service.GetInspectionItemlist(item.PatientId, datelist, ids)
+		for _, it := range itemlist {
+			item.Children = append(item.Children, it)
+		}
+	}
+	fmt.Println("hhhhhhhhhhhhh99999999999999", list)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

models/dialysis.go

@@ -631,6 +631,7 @@ type AssessmentAfterDislysis struct {
 	Lapse                           int64   `gorm:"column:lapse" json:"lapse" form:"lapse"`
 	Consciousness                   int64   `gorm:"column:consciousness" json:"consciousness" form:"consciousness"`
 	Fallrisk                        int64   `gorm:"column:fallrisk" json:"fallrisk" form:"fallrisk"`
+	MachineRun                      string  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

models/patient_models.go

@@ -1038,44 +1038,47 @@ func (ExportLog) TableName() string {
 }
 
 type XtTemplateSummary struct {
-	ID                        int64      `gorm:"column:id" json:"id" form:"id"`
-	StartYear                 int64      `gorm:"column:start_year" json:"start_year" form:"start_year"`
-	StartMonth                int64      `gorm:"column:start_month" json:"start_month" form:"start_month"`
-	Radio                     int64      `gorm:"column:radio" json:"radio" form:"radio"`
-	Quarter                   int64      `gorm:"column:quarter" json:"quarter" form:"quarter"`
-	DryWeight                 float64    `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
-	DialysisCount             int64      `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
-	HdCount                   int64      `gorm:"column:hd_count" json:"hd_count" form:"hd_count"`
-	HdfCount                  int64      `gorm:"column:hdf_count" json:"hdf_count" form:"hdf_count"`
-	HpCount                   int64      `gorm:"column:hp_count" json:"hp_count" form:"hp_count"`
-	OtherCount                int64      `gorm:"column:other_count" json:"other_count" form:"other_count"`
-	DialzerApparatus          string     `gorm:"column:dialzer_apparatus" json:"dialzer_apparatus" form:"dialzer_apparatus"`
-	PerfusionApparatus        string     `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
-	Anticoagulant             int64      `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
-	Kalium                    float64    `gorm:"column:kalium" json:"kalium" form:"kalium"`
-	Autunite                  float64    `gorm:"column:autunite" json:"autunite" form:"autunite"`
-	Natrium                   float64    `gorm:"column:natrium" json:"natrium" form:"natrium"`
-	Hour                      int64      `gorm:"column:hour" json:"hour" form:"hour"`
-	Minute                    int64      `gorm:"column:minute" json:"minute" form:"minute"`
-	BeforWeight               float64    `gorm:"column:befor_weight" json:"befor_weight" form:"befor_weight"`
-	AfterWeight               float64    `gorm:"column:after_weight" json:"after_weight" form:"after_weight"`
-	BeforPressure             string     `gorm:"column:befor_pressure" json:"befor_pressure" form:"befor_pressure"`
-	AfterPressure             string     `gorm:"column:after_pressure" json:"after_pressure" form:"after_pressure"`
-	TemplateSummaryId         int64      `gorm:"column:template_summary_id" json:"template_summary_id" form:"template_summary_id"`
-	TemplateSummaryContent    string     `gorm:"column:template_summary_content" json:"template_summary_content" form:"template_summary_content"`
-	TemplatePlanId            int64      `gorm:"column:template_plan_id" json:"template_plan_id" form:"template_plan_id"`
-	TemplatePlanContent       string     `gorm:"column:template_plan_content" json:"template_plan_content" form:"template_plan_content"`
-	TemplateInspectionId      int64      `gorm:"column:template_inspection_id" json:"template_inspection_id" form:"template_inspection_id"`
-	TemplateInspectionContent string     `gorm:"column:template_inspection_content" json:"template_inspection_content" form:"template_inspection_content"`
-	AdminUserId               int64      `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	RecordTime                int64      `gorm:"column:record_time" json:"record_time" form:"record_time"`
-	PatientId                 int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	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"`
-	Title                     string     `gorm:"column:title" json:"title" form:"title"`
-	Patients                  VmPatients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	ID                        int64           `gorm:"column:id" json:"id" form:"id"`
+	StartYear                 int64           `gorm:"column:start_year" json:"start_year" form:"start_year"`
+	StartMonth                int64           `gorm:"column:start_month" json:"start_month" form:"start_month"`
+	Radio                     int64           `gorm:"column:radio" json:"radio" form:"radio"`
+	Quarter                   int64           `gorm:"column:quarter" json:"quarter" form:"quarter"`
+	DryWeight                 float64         `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	DialysisCount             int64           `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
+	HdCount                   int64           `gorm:"column:hd_count" json:"hd_count" form:"hd_count"`
+	HdfCount                  int64           `gorm:"column:hdf_count" json:"hdf_count" form:"hdf_count"`
+	HpCount                   int64           `gorm:"column:hp_count" json:"hp_count" form:"hp_count"`
+	OtherCount                int64           `gorm:"column:other_count" json:"other_count" form:"other_count"`
+	DialzerApparatus          string          `gorm:"column:dialzer_apparatus" json:"dialzer_apparatus" form:"dialzer_apparatus"`
+	PerfusionApparatus        string          `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
+	Anticoagulant             int64           `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	Kalium                    float64         `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	Autunite                  float64         `gorm:"column:autunite" json:"autunite" form:"autunite"`
+	Natrium                   float64         `gorm:"column:natrium" json:"natrium" form:"natrium"`
+	Hour                      int64           `gorm:"column:hour" json:"hour" form:"hour"`
+	Minute                    int64           `gorm:"column:minute" json:"minute" form:"minute"`
+	BeforWeight               float64         `gorm:"column:befor_weight" json:"befor_weight" form:"befor_weight"`
+	AfterWeight               float64         `gorm:"column:after_weight" json:"after_weight" form:"after_weight"`
+	BeforPressure             string          `gorm:"column:befor_pressure" json:"befor_pressure" form:"befor_pressure"`
+	AfterPressure             string          `gorm:"column:after_pressure" json:"after_pressure" form:"after_pressure"`
+	TemplateSummaryId         int64           `gorm:"column:template_summary_id" json:"template_summary_id" form:"template_summary_id"`
+	TemplateSummaryContent    string          `gorm:"column:template_summary_content" json:"template_summary_content" form:"template_summary_content"`
+	TemplatePlanId            int64           `gorm:"column:template_plan_id" json:"template_plan_id" form:"template_plan_id"`
+	TemplatePlanContent       string          `gorm:"column:template_plan_content" json:"template_plan_content" form:"template_plan_content"`
+	TemplateInspectionId      int64           `gorm:"column:template_inspection_id" json:"template_inspection_id" form:"template_inspection_id"`
+	TemplateInspectionContent string          `gorm:"column:template_inspection_content" json:"template_inspection_content" form:"template_inspection_content"`
+	AdminUserId               int64           `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	RecordTime                int64           `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	PatientId                 int64           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	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"`
+	Title                     string          `gorm:"column:title" json:"title" form:"title"`
+	ProjectId                 string          `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	InspectDate               string          `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Patients                  VmPatients      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	Children                  []*VmInspection `gorm:"column:children" json:"children" form:"children"`
 }
 
 func (XtTemplateSummary) TableName() string {

service/patientmanage_service.go

@@ -1679,55 +1679,55 @@ func GetInspectionItemlist(patientid int64, inspect_date []string, projectid []s
 	return inspection, err
 }
 
-func GetDialysisBeforInitDateList(patient_id int64) (models.PredialysisEvaluation, error) {
+func GetDialysisBeforInitDateList(patient_id int64, startime int64, endtime int64) (models.PredialysisEvaluation, error) {
 	befor := models.PredialysisEvaluation{}
 	db := XTReadDB().Model(&befor).Where("status = 1")
 	if patient_id > 0 {
-		db = db.Where("patient_id = ? and assessment_date>=1627747200 and assessment_date<=1630339200 ", patient_id)
+		db = db.Where("patient_id = ? and assessment_date>=? and assessment_date<=? ", patient_id, startime, endtime)
 	}
 
 	err = db.Last(&befor).Error
 	return befor, err
 }
 
-func GetDialysisPrescriptionDataList(patient_id int64) (models.DialysisPrescription, error) {
+func GetDialysisPrescriptionDataList(patient_id int64, startime int64, endtime int64) (models.DialysisPrescription, error) {
 
 	prescription := models.DialysisPrescription{}
 	db := XTReadDB().Model(&prescription).Where("status = 1")
 	if patient_id > 0 {
-		db = db.Where("patient_id = ? and record_date>=1627747200 and record_date<=1630339200", patient_id)
+		db = db.Where("patient_id = ? and record_date>=? and record_date<=?", patient_id, startime, endtime)
 	}
 	err = db.Last(&prescription).Error
 	return prescription, err
 }
 
-func GetDialysisAssementAfter(patient_id int64) (models.AssessmentAfterDislysis, error) {
+func GetDialysisAssementAfter(patient_id int64, startime int64, endtime int64) (models.AssessmentAfterDislysis, error) {
 
 	after := models.AssessmentAfterDislysis{}
 	db := XTReadDB().Model(&after).Where("status = 1")
 	if patient_id > 0 {
-		db = db.Where("patient_id = ? and assessment_date>=1627747200 and assessment_date<=1630339200", patient_id)
+		db = db.Where("patient_id = ? and assessment_date>=? and assessment_date<=?", patient_id, startime, endtime)
 	}
 	err = db.Last(&after).Error
 	return after, err
 }
 
-func GetDialysisDialysisMode(patient_id int64) (counts []*models.PatientPrescriptionCountStruct, err error) {
+func GetDialysisDialysisMode(patient_id int64, startime int64, endtime int64, orgid int64) (counts []*models.PatientPrescriptionCountStruct, err error) {
 
 	db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
 	table := readDb.Table("xt_schedule as s").Where("s.status = 1")
 	fmt.Println(table)
 	p := readDb.Table("xt_patients as p").Where("p.status = 1")
 	fmt.Println(p)
-	//if starttime > 0 {
-	//  db = db.Where("o.dialysis_date >=?", starttime)
-	//}
-	//if endtime > 0 {
-	//  db = db.Where("o.dialysis_date<=?", endtime)
-	//}
-	//if orgid > 0 {
-	//  db = db.Where("o.user_org_id = ?", orgid)
-	//}
+	if startime > 0 {
+		db = db.Where("o.dialysis_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("o.dialysis_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("o.user_org_id = ?", orgid)
+	}
 	if patient_id > 0 {
 		db = db.Where("o.patient_id = ?", patient_id)
 	}
@@ -1747,9 +1747,21 @@ func UpdateTempalteSummary(summary *models.XtTemplateSummary) error {
 	return err
 }
 
-func GetTemplateSummaryList(patientid int64, orgid int64) (summary []*models.XtTemplateSummary, err error) {
-
-	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and status = 1", patientid, orgid).Find(&summary).Error
+func GetTemplateSummaryList(patientid int64, orgid int64, startime int64, endtime int64) (summary []*models.XtTemplateSummary, err error) {
+	db := XTReadDB().Model(&summary).Where("status = 1")
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if patientid > 0 {
+		db = db.Where("patient_id = ?", patientid)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Order("ctime desc").Find(&summary).Error
 	return summary, err
 }
 
@@ -1766,7 +1778,7 @@ func GetTemplateSummaryPrintDetail(id int64) (models.XtTemplateSummary, error) {
 	return summary, err
 }
 
-func GetTreateSummary(startime int64, endtime int64, limit int64, page int64, creater int64) (list []*models.XtTemplateSummary, total int64, err error) {
+func GetTreateSummary(startime int64, endtime int64, limit int64, page int64, creater int64, patient_id int64) (list []*models.XtTemplateSummary, total int64, err error) {
 
 	db := XTReadDB().Model(&list).Where("status = 1")
 	offset := (page - 1) * limit
@@ -1779,6 +1791,9 @@ func GetTreateSummary(startime int64, endtime int64, limit int64, page int64, cr
 	if creater > 0 {
 		db = db.Where("admin_user_id = ?", creater)
 	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 	return list, total, err
 }