历史排班

controllers/dialysis_api_controller.go

@@ -362,6 +362,7 @@ func (c *DialysisApiController) PostPrescription() {
 	chaptalization := c.GetString("chaptalization")
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
+	blood_access_part_id := c.GetString("blood_access_part_id")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -482,6 +483,7 @@ func (c *DialysisApiController) PostPrescription() {
 		Chaptalization:             chaptalization,
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
+		BloodAccessPartId:          blood_access_part_id,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -1009,6 +1011,7 @@ func (c *DialysisApiController) PostSoulution() {
 	chaptalization := c.GetString("chaptalization")
 	warsh_count := c.GetString("warsh_count")
 	washing_time := c.GetString("washing_time")
+	blood_access_part_id := c.GetString("blood_access_part_id")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1179,6 +1182,7 @@ func (c *DialysisApiController) PostSoulution() {
 		Chaptalization:             chaptalization,
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
+		BloodAccessPartId:          blood_access_part_id,
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1387,6 +1391,7 @@ func (c *DialysisApiController) PostSoulution() {
 		Chaptalization:             chaptalization,
 		WarshCount:                 warsh_count,
 		WashingTime:                washing_time,
+		BloodAccessPartId:          blood_access_part_id,
 	}
 
 	if solution.Anticoagulant == 0 {

controllers/gobal_config_api_controller.go

@@ -1125,6 +1125,11 @@ func defaultSystemSolutionFormData(solution *models.SystemPrescription, data []b
 		solution.DialysisIrrigation = dialysisIrrigation
 	}
 
+	if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "string" {
+		blood_access_part_id := dataBody["blood_access_part_id"].(string)
+		solution.BloodAccessPartId = blood_access_part_id
+	}
+
 	return
 }
 
@@ -1136,8 +1141,6 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 	idsInters := dataBody["ids"].([]interface{})
 	advice_type, _ := c.GetInt64("advice_type")
 	stop_type, _ := c.GetInt64("stop_type")
-	fmt.Println("advcie_type23323232322332", advice_type)
-	fmt.Println("stop_type33332323223232323", stop_type)
 	if len(idsInters) == 0 {
 		if err != nil {
 			c.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除会员失败:（没有选择会员）")

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1814,6 +1814,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	chaptalization := c.GetString("chaptalization")
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
+	blood_access_part_id := c.GetString("blood_access_part_id")
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1976,6 +1978,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		Chaptalization:             chaptalization,
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
+		BloodAccessPartId:          blood_access_part_id,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3699,6 +3702,7 @@ func (c *DialysisAPIController) PostSolution() {
 	chaptalization := c.GetString("chaptalization")
 	washing_time := c.GetString("washing_time")
 	warsh_count := c.GetString("warsh_count")
+	blood_access_part_id := c.GetString("blood_access_part_id")
 	if mode_id > 0 {
 
 		var str string
@@ -3859,6 +3863,7 @@ func (c *DialysisAPIController) PostSolution() {
 		Chaptalization:             chaptalization,
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
+		BloodAccessPartId:          blood_access_part_id,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3985,6 +3990,7 @@ func (c *DialysisAPIController) PostSolution() {
 		Chaptalization:             chaptalization,
 		WashingTime:                washing_time,
 		WarshCount:                 warsh_count,
+		BloodAccessPartId:          blood_access_part_id,
 	}
 
 	//针对河间咸的
@@ -8106,21 +8112,59 @@ func (c *DialysisAPIController) GetPatientDialysisRecordList() {
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	start_time := time.Now().Format("2006-01-02")
+	//start_time := time.Now().Format("2006-01-02")
 
-	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	start_time := c.GetString("start_time")
 
-	nowTime := time.Now()
-	endTime := nowTime.AddDate(-2, 0, 0)
-	endTimes := endTime.Format("2006-01-02")
-	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", endTimes+" 00:00:00", loc)
+	end_time := c.GetString("end_time")
+
+	fmt.Println("start_timeo2o2o2o2o2o", start_time)
+	fmt.Println("end_Time2o2o2o2ooo22", end_time)
+	var startdateunix int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		fmt.Println("theTim3333333333333333333333e", theTime)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+	var enddateunix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		enddateunix = theTime.Unix()
+	}
+
+	//startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	//nowTime := time.Now()
+
+	//endTime := nowTime.AddDate(-30, 0, 0)
+	//endTimes := endTime.Format("2006-01-02")
+	//endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+
+	if org_id == 10579 {
+		list, _ := service.GetPatientDialysisRecordListOne(id, startdateunix, enddateunix)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	} else {
+		list, _ := service.GetPatientDialysisRecordList(id, startdateunix, enddateunix)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
 
-	list, _ := service.GetPatientDialysisRecordList(id, endtime.Unix(), startime.Unix())
-	fmt.Println("endtime232332322332322323232332", endTime.Unix())
-	c.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
-	})
-	return
 }
 
 func (c *DialysisAPIController) BathDeleteAdviceList() {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -23,6 +23,7 @@ type PatientApiController struct {
 
 func (c *PatientApiController) GetPatientInfoWithDiseases() {
 	id, _ := c.GetInt64("patient", 0)
+
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

controllers/patient_api_controller.go

@@ -1033,6 +1033,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 			Amylaceum:                  solution.Amylaceum,
 			DialysisStrainer:           solution.DialysisStrainer,
 			Chaptalization:             solution.Chaptalization,
+			BloodAccessPartId:          solution.BloodAccessPartId,
 		}
 		service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	}
@@ -4629,6 +4630,10 @@ func childSolutionFormData(solution *models.DialysisSolution, data []byte, metho
 	}
 	solution.Doctor = doctor
 
+	if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "string" {
+		blood_access_part_id, _ := dataBody["blood_access_part_id"].(string)
+		solution.BloodAccessPartId = blood_access_part_id
+	}
 	return
 }
 

controllers/sign_api_controller.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jung-kurt/gofpdf"
-	"github.com/mozillazg/go-pinyin"
 	"io/ioutil"
 	"time"
 )
@@ -659,81 +658,80 @@ func (this *SignApiController) GetEnterPriseDetail() {
 func (this *SignApiController) UploadPrintOrder() {
 
 	fmt.Println("WOOWOWOWOWOWOWOWOWOWOWWOOWOWWO")
-	list, _ := service.GetAllPatientNew(10579)
-	for _, item := range list {
-
-		hans := item.Name // 要转换的汉字字符串
-		// 创建一个拼音转换器
-
-		p := pinyin.NewArgs()
-
-		// 将汉字转为拼音
-		pinyinSlice := pinyin.Pinyin(hans, p)
-
-		// 输出拼音
-		fmt.Println("Pinyin:", pinyinSlice)
-
-		// 获取首字母
-		firstLetter := ""
-		for _, py := range pinyinSlice {
-			if len(py) > 0 {
-				firstLetter += string(py[0][0])
-			}
-		}
-
-		item.FirstLetter = firstLetter
-		service.UpdatePatientNew(item.ID, item.FirstLetter)
-		// 输出首字母
-		//fmt.Println("First Letter:", firstLetter)
-	}
-
-	//pdf := gofpdf.New("P", "mm", "A4", "")
-	//pdf.AddPage()
-	//pdf.Text(5, 10, "血液净化治疗记录单")
+	//list, _ := service.GetAllPatientNew(10188)
+	//for _, item := range list {
 	//
-	//pdf.AddUTF8Font("simfang", "", "D:/go/src/pkg/mod/github.com/jung-kurt/gofpdf@v1.16.2/font/simfang.ttf")
-	//pdf.SetFont("simfang", "", 20)
-	//var title = "血液透析(滤过)记录表单"
-	////表格居中显示
-	//pdf.Text(70, 10, title)
-	//wd := pdf.GetStringWidth(title) + 100
-	//fmt.Println("wd", wd)
-	//pdf.SetY(100)            //先要设置 Y，然后再设置 X。否则，会导致 X 失效
-	//pdf.SetX((210 - wd) / 2) //水平居中的算法
-	//var numuber = "张三"
-	////表格居中显示
-	//pdf.SetFont("", "", 14) // 设置加粗字体和字号
-	//pdf.Text(10, 20, "姓名:"+numuber)
-	//pdf.SetFont("", "", 14) // 设置加粗字体和字号
-	//pdf.Text(35, 20, "性别:"+"男")
-	//pdf.SetFont("", "", 14) // 设置正常字体和字号
-	//pdf.Text(60, 20, "年龄:"+"18")
-	//pdf.SetFont("", "", 14) // 设置正常字体和字号
-	//pdf.Text(90, 20, "门诊:"+"住院")
-	//pdf.SetFont("", "", 14) // 设置正常字体和字号
-	//pdf.Text(120, 20, "病区:"+"A区")
-	//pdf.SetFont("", "", 14) // 设置正常字体和字号
-	//pdf.Text(150, 20, "床号:"+"1号")
-	//pdf.SetFont("", "", 14) // 设置正常字体和字号
-	//pdf.Text(180, 20, "透析号:")
-	//pdf.SetFont("", "", 14) // 设置正常字体和字号
-	//pdf.Text(210, 20, "住院号/门诊号:")
-	//pdf.SetFont("", "", 14) // 设置正常字体和字号
-	////表格居中显示
-	//pdf.SetFont("", "", 14) // 设置加粗字体和字号
-	//pdf.Text(10, 30, "入科方式:"+numuber)
-	//pdf.SetFont("", "", 14) // 设置加粗字体和字号
-	//pdf.Text(60, 30, "诊断:")
+	//	hans := item.Name // 要转换的汉字字符串
+	//	// 创建一个拼音转换器
+	//	p := pinyin.NewArgs()
 	//
-	//pdf.AddUTF8Font("simfang", "", "D:/go/src/pkg/mod/github.com/jung-kurt/gofpdf@v1.16.2/font/simfang.ttf")
-	//pdf.SetFont("simfang", "", 16) // 设置字体、字号
-	//pdf.SetFillColor(200, 200, 200)
-	////// 设置起始位置
-	//var x = 10.0
-	//var y = 40.0
-	//pdf.SetXY(x, y)
-	//// 设置填充颜色
-	//pdf.CellFormat(200, 15, "透析前情况", "1", 0, "CM", false, 0, "") // 使用CellFormat()方法创建表格单元格
+	//	// 将汉字转为拼音
+	//	pinyinSlice := pinyin.Pinyin(hans, p)
+	//
+	//	// 输出拼音
+	//	fmt.Println("Pinyin:", pinyinSlice)
+	//
+	//	// 获取首字母
+	//	firstLetter := ""
+	//	for _, py := range pinyinSlice {
+	//		if len(py) > 0 {
+	//			firstLetter += string(py[0][0])
+	//		}
+	//	}
+	//
+	//	item.FirstLetter = firstLetter
+	//	service.UpdatePatientNew(item.ID, item.FirstLetter)
+	//	// 输出首字母
+	//	//fmt.Println("First Letter:", firstLetter)
+	//}
+
+	pdf := gofpdf.New("P", "mm", "A4", "")
+	pdf.AddPage()
+	pdf.Text(5, 10, "血液净化治疗记录单")
+
+	pdf.AddUTF8Font("simfang", "", "D:/go/src/pkg/mod/github.com/jung-kurt/gofpdf@v1.16.2/font/simfang.ttf")
+	pdf.SetFont("simfang", "", 20)
+	var title = "血液透析(滤过)记录表单"
+	//表格居中显示
+	pdf.Text(70, 10, title)
+	wd := pdf.GetStringWidth(title) + 100
+	fmt.Println("wd", wd)
+	pdf.SetY(100)            //先要设置 Y，然后再设置 X。否则，会导致 X 失效
+	pdf.SetX((210 - wd) / 2) //水平居中的算法
+	var numuber = "张三"
+	//表格居中显示
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(10, 20, "姓名:"+numuber)
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(35, 20, "性别:"+"男")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(60, 20, "年龄:"+"18")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(90, 20, "门诊:"+"住院")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(120, 20, "病区:"+"A区")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(150, 20, "床号:"+"1号")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(180, 20, "透析号:")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	pdf.Text(210, 20, "住院号/门诊号:")
+	pdf.SetFont("", "", 14) // 设置正常字体和字号
+	//表格居中显示
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(10, 30, "入科方式:"+numuber)
+	pdf.SetFont("", "", 14) // 设置加粗字体和字号
+	pdf.Text(60, 30, "诊断:")
+
+	pdf.AddUTF8Font("simfang", "", "D:/go/src/pkg/mod/github.com/jung-kurt/gofpdf@v1.16.2/font/simfang.ttf")
+	pdf.SetFont("simfang", "", 16) // 设置字体、字号
+	pdf.SetFillColor(200, 200, 200)
+	//// 设置起始位置
+	var x = 10.0
+	var y = 40.0
+	pdf.SetXY(x, y)
+	// 设置填充颜色
+	pdf.CellFormat(200, 15, "透析前情况", "1", 0, "CM", false, 0, "") // 使用CellFormat()方法创建表格单元格
 
 	//param1: 单元格的宽,为0时表示一行,单位根据new()里面设置的来
 	//param2: 单元格的高,不能为0,单位根据new()里面设置的来
@@ -792,18 +790,18 @@ func (this *SignApiController) UploadPrintOrder() {
 	//
 	//pdf.Ln(2)
 
-	//if err := pdf.OutputFileAndClose("6.pdf"); err != nil {
-	//	panic(err.Error())
-	//}
+	if err := pdf.OutputFileAndClose("6.pdf"); err != nil {
+		panic(err.Error())
+	}
 
 	// 此处可以继续绘制表格的其他部分，例如内容行等。
 	// ...
 
 	// 保存PDF文档到文件
-	//err := pdf.OutputFileAndClose("treatment_sheet_with_header.pdf")
-	//if err != nil {
-	//	panic(err)
-	//}
+	err := pdf.OutputFileAndClose("treatment_sheet_with_header.pdf")
+	if err != nil {
+		panic(err)
+	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		//"sign":      information,

controllers/sign_weigh_api_controller.go

@@ -40,7 +40,6 @@ type SignWeighAPIController struct {
 // /api/sign/patients [get]
 func (c *SignWeighAPIController) GetPatients() {
 	keywrods := c.GetString("keywords")
-	fmt.Println("关键字" + keywrods)
 	scheduleType, _ := c.GetInt64("schedule_type", 0)
 	needScheduleType, _ := c.GetInt64("need_schedule_type", 0)
 	nowDateTime := time.Now()
@@ -314,7 +313,6 @@ func (c *SignWeighAPIController) EditPatientSign() {
 
 func (c *SignWeighAPIController) GetPatientList() {
 	patientID, _ := c.GetInt64("patient_id", 0)
-	fmt.Println("patientID是设么", patientID)
 	adminUserInfo := c.GetAdminUserInfo()
 	nowDateTime := time.Now()
 	nowDate := nowDateTime.Format("2006-01-02")
@@ -325,8 +323,10 @@ func (c *SignWeighAPIController) GetPatientList() {
 	datetime := theTime.Unix()
 
 	list := service.GetPatientInformationList(adminUserInfo.CurrentOrgId, patientID, datetime)
+	dryWeight, _ := service.GetPatientLastDryWeight(patientID, adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patientlist": list,
+		"dryWeight":   dryWeight,
 	})
 	return
 }
@@ -473,10 +473,16 @@ func (c *SignWeighAPIController) Sighdata() {
 
 	} else if errord == nil {
 		service.Updatesignweigh(&sighForm, patientID, adminUserInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"signs": sighForm,
+		})
 	} else {
 
 		service.Updatesignweigh(&sighForm, patientID, adminUserInfo.CurrentOrgId)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"signs": sighForm,
+		})
 	}
 	return
 }

models/dialysis.go

@@ -903,6 +903,24 @@ func (XtDialysisOrder) TableName() string {
 	return "xt_dialysis_order"
 }
 
+type XtScheduleSixTy 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"`
+	DialysisMachineName string `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	Remark              string `gorm:"column:remark" json:"remark" form:"remark"`
+}
+
 type XtDialysisOrders struct {
 	ID             int64  `gorm:"column:id" json:"id" form:"id"`
 	DialysisDate   int64  `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`

models/gobal_models.go

@@ -84,6 +84,7 @@ type SystemPrescription struct {
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 }
 
 func (SystemPrescription) TableName() string {

models/patient_models.go

@@ -379,6 +379,7 @@ type DialysisPrescription struct {
 	Chaptalization             string        `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
 	WarshCount                 string        `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
 	WashingTime                string        `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
+	BloodAccessPartId          string        `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -599,6 +600,7 @@ type DialysisSolution struct {
 	Chaptalization             string  `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
 	WarshCount                 string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
 	WashingTime                string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
+	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 }
 
 func (DialysisSolution) TableName() string {

service/mobile_dialysis_service.go

@@ -192,6 +192,7 @@ type MSchedualPatientVMList struct {
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (MSchedualPatientVMList) TableName() string {
@@ -269,6 +270,7 @@ type MSchedualPatientVM struct {
 	FirstTreatmentDate      int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
 	ContactName             string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount      int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	FirstLetter             string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (MSchedualPatientVM) TableName() string {
@@ -4020,6 +4022,25 @@ func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64
 	return order, err
 }
 
+func GetPatientDialysisRecordListOne(patientid int64, startime int64, endtime int64) (order []*models.XtScheduleSixTy, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	//table := XTReadDB().Table("xt_schedule as s")
+	//fmt.Println(table)
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	if startime > 0 {
+		db = db.Where("x.schedule_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.schedule_date <= ?", endtime)
+	}
+
+	err = db.Select("x.id,x.schedule_date,x.schedule_type,x.mode_id").Find(&order).Error
+	return order, err
+}
+
 func BatchDeleteAdvice(ids []string) (err error) {
 
 	if len(ids) == 1 {

service/patient_service.go

@@ -21,7 +21,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
-		db = db.Where("p.name LIKE ? OR p.dialysis_no LIKE ?", likeKey, likeKey)
+		db = db.Where("p.name LIKE ? OR p.dialysis_no LIKE ? OR p.first_letter LIKE ?", likeKey, likeKey, likeKey)
 	}
 
 	if schedulType > 0 {
@@ -2020,7 +2020,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer, "chaptalization": prescription.Chaptalization}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer, "chaptalization": prescription.Chaptalization, "blood_access_part_id": prescription.BloodAccessPartId}).Error
 	return err
 }
 

service/schedule_service.go

@@ -689,7 +689,7 @@ func GetSchedualPatientsByKeywords(keywords string, org_id int64, startime int64
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("TreatmentMode", "status = 1 ").
-		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ? OR p.first_letter LIKE ?)", likeKey, likeKey, likeKey).
 		Where("s.user_org_id=? and s.schedule_date >= ? and s.schedule_date <= ? and s.status=1", org_id, startime, endtime).
 		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").
 		Order("schedule_date asc").

service/sign_weigh_service.go

@@ -15,7 +15,7 @@ func GetSignPatients(orgId int64, keywords string, dateTime, schedule_type int64
 		Preload("PredialysisEvaluation", "user_org_id = ? and  assessment_date = ?", orgId, dateTime)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		db = db.Where("p.name LIKE ? OR p.dialysis_no LIKE ? ", likekey, likekey)
+		db = db.Where("p.name LIKE ? OR p.dialysis_no LIKE ? OR first_letter LIKE ?", likekey, likekey, likekey)
 	}
 	db = db.Where("p.status=1")
 
@@ -149,6 +149,14 @@ func GetPatientInformationList(orgid, patientId int64, datetime int64) *models.P
 	return &pre
 }
 
+func GetPatientLastDryWeight(patient_id int64, org_id int64) (models.SgjPatientDryweight, error) {
+
+	dryweight := models.SgjPatientDryweight{}
+	err := readDb.Model(&models.SgjPatientDryweight{}).Where("patient_id = ? and user_org_id = ? and status =1", patient_id, org_id).Last(&dryweight).Error
+
+	return dryweight, err
+}
+
 func GetInforByPatient(orgid, patientId int64, datetime int64) *models.AssessmentAfterDislysis {
 	var ass models.AssessmentAfterDislysis
 	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id=? and user_org_id=? and assessment_date=?", patientId, orgid, datetime).First(&ass).Error