合并代码

conf/app.conf

@@ -2,7 +2,7 @@ appname = 血透
 httpport = 9531
 runmode = dev
 
-
+# 1
 copyrequestbody = true
 sessionon = true
 sessiongcmaxlifetime = 64800

controllers/base_api_controller.go

@@ -3,6 +3,8 @@ package controllers
 import (
 	"XT_New/enums"
 	"XT_New/models"
+
+	//"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -77,7 +79,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 12
+		subscibe.OrgId = 9538
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -87,7 +89,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentOrgId = 9538
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -327,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 12
+		subscibe.OrgId = 9538
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentOrgId = 9538
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/data_api_controller.go

@@ -71,6 +71,7 @@ func (c *DataApiController) CreateConfig() {
 	var dataconfig models.Dataconfig
 	var resultConfig models.ConfigViewModel
 	code := configFormData(&dataconfig, c.Ctx.Input.RequestBody)
+	fmt.Println("code----------", code)
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
 		return
@@ -111,7 +112,7 @@ func (c *DataApiController) CreateConfig() {
 	} else {
 		dataconfig.Order = 0
 	}
-
+	fmt.Println("dataconfig-------------", dataconfig)
 	err = service.CreateConfig(&dataconfig)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
@@ -390,7 +391,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong
@@ -527,7 +528,6 @@ func configChildFormData(dataconfig *models.Dataconfig, data []byte) (code int)
 
 func (c *DataApiController) GetAdviceConfigs() {
 	advice_type, _ := c.GetInt64("type", 0)
-
 	adminUserInfo := c.GetAdminUserInfo()
 	var drugs []models.DrugDic
 	drugways, _, _ := service.GetDrugWayDics(adminUserInfo.CurrentOrgId)

controllers/device_api_controller.go

@@ -652,15 +652,22 @@ func (this *DeviceAPIController) CreateGroup() {
 	}
 
 	adminInfo := this.GetAdminUserInfo()
-	group, createErr := service.CreateDeviceGroup(adminInfo.CurrentOrgId, name)
-	if createErr != nil {
-		this.ErrorLog("创建设备分组失败:%v", createErr)
+	_, errcode := service.GetDeviceGroupName(name, adminInfo.CurrentOrgId)
+	if errcode == gorm.ErrRecordNotFound {
+		group, createErr := service.CreateDeviceGroup(adminInfo.CurrentOrgId, name)
+		if createErr != nil {
+			this.ErrorLog("创建设备分组失败:%v", createErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"group": group,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"group": group,
-	})
+
 }
 
 // /api/device/group/modify [post] ModifyGroup
@@ -687,7 +694,11 @@ func (this *DeviceAPIController) ModifyGroup() {
 
 	group.Name = name
 	group.ModifyTime = time.Now().Unix()
-
+	byName, getGroupErr := service.GetUpdateDeviceGroupByName(name, adminInfo.CurrentOrgId)
+	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 	updateErr := service.UpdateDeviceGroup(group)
 	if updateErr != nil {
 		this.ErrorLog("修改设备分组失败:%v", updateErr)
@@ -787,23 +798,30 @@ func (this *DeviceAPIController) CreateNumber() {
 		return
 	}
 
-	number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID)
-	if createErr != nil {
-		this.ErrorLog("创建机号失败:%v", createErr)
+	_, errcode := service.GetCreateDeviceNumber(num, adminInfo.CurrentOrgId)
+	if errcode == gorm.ErrRecordNotFound {
+		number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID)
+		if createErr != nil {
+			this.ErrorLog("创建机号失败:%v", createErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+			return
+		}
+		numberJson := map[string]interface{}{
+			"id":         number.ID,
+			"number":     number.Number,
+			"zone_id":    number.ZoneID,
+			"group_id":   number.GroupID,
+			"zone_name":  zone.Name,
+			"group_name": group.Name,
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"number": numberJson,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 		return
 	}
-	numberJson := map[string]interface{}{
-		"id":         number.ID,
-		"number":     number.Number,
-		"zone_id":    number.ZoneID,
-		"group_id":   number.GroupID,
-		"zone_name":  zone.Name,
-		"group_name": group.Name,
-	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"number": numberJson,
-	})
+
 }
 
 // /api/device/number/modify [post] ModifyNumber
@@ -856,6 +874,11 @@ func (this *DeviceAPIController) ModifyNumber() {
 	number.Number = num
 	number.ZoneID = zoneID
 	number.GroupID = groupID
+	byName, _ := service.GetDeviceNumberByName(num, adminInfo.CurrentOrgId)
+	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 	updateErr := service.UpdateDeviceNumber(number)
 	if updateErr != nil {
 		this.ErrorLog("修改机号失败:%v", updateErr)

controllers/dialysis_api_controller.go

@@ -3495,6 +3495,8 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 
 	mission := c.GetString("mission")
 	dialysis_summary := c.GetString("dialysis_summary")
+	nursingRecord := c.GetString("nursing_record")
+	specialRecord := c.GetString("special_record")
 	sj_nurse := adminUserInfo.AdminUser.Id
 	zl_nurse := adminUserInfo.AdminUser.Id
 	hd_nurse := adminUserInfo.AdminUser.Id
@@ -3514,6 +3516,8 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		ZlDoctor:        zl_doctor,
 		Status:          1,
 		CreatedTime:     time.Now().Unix(),
+		NursingRecord:   nursingRecord,
+		SpecialRecord:   specialRecord,
 	}
 
 	_, tempTreatmentSummary := service.FindTreatmentSummaryByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)

controllers/inspection_api_controller.go

@@ -226,9 +226,13 @@ func (c *InspectionApiController) CreatePatientInspection() {
 }
 
 func (c *InspectionApiController) EditPatientInspection() {
+	fmt.Println("触发了没有---------------------------------------")
 	patient, _ := c.GetInt64("patient", 0)
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
-
+	dates := c.GetString("dates")
+	projectid := c.GetString("projectid")
+	fmt.Println("日期---", dates)
+	fmt.Println("projectid", projectid)
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -350,6 +350,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	//}
 
 	lastDialysisPrescribe, _ := service.MobileGetLastDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, schedual.ModeId)
+	//fmt.Println("上次透析处方",lastDialysisPrescribe.DialyzerPerfusionApparatus)
 	//if getDialysisPrescribeErr != nil {
 	//	this.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -388,8 +389,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	goodInfos, _ := service.FindAllGoodInfo(adminInfo.Org.Id) //查出所有库存配置的系统类型
 
 	operators, err := service.GetAllStarfEs(adminInfo.Org.Id)
-	fmt.Println("报错-------", err)
-	fmt.Println("op----------------------------------------------------------", operators)
+	fmt.Println("报错", err)
 
 	returnData := map[string]interface{}{
 		"patient":                        patient,
@@ -445,7 +445,10 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 	checkStaffId, _ := c.GetInt64("checkStaff", 0)
 	deboardNurseId, _ := c.GetInt64("deboardNurse", 0)
 	treatDoctor, _ := c.GetInt64("treatDoctor", 0)
-
+	nursingRecord := c.GetString("nursing_record")
+	fmt.Println("护理记录", nursingRecord)
+	specialRecord := c.GetString("special_record")
+	fmt.Println("特殊记录", specialRecord)
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	changeMedicalNurseId = adminUserInfo.AdminUser.Id
@@ -491,6 +494,8 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		ZlDoctor:        treatDoctor,
 		CreatedTime:     time.Now().Unix(),
 		Status:          1,
+		NursingRecord:   nursingRecord,
+		SpecialRecord:   specialRecord,
 	}
 	_, treatmentSummary := service.FindTreatmentSummaryByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if treatmentSummary.ID == 0 { //新增

controllers/patient_api_controller.go

@@ -68,6 +68,7 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patients/export", &PatientApiController{}, "Post:ExportPatients")
 
+	beego.Router("/api/patients/advices/saveditadvices", &PatientApiController{}, "Get:SaveEditAdvices")
 }
 
 //GetPatientsList 取患者列表
@@ -239,7 +240,7 @@ func (c *PatientApiController) CreatePatient() {
 	// patient.Lapseto = 1
 
 	err := service.CreatePatient(&patient, contagions, diseases)
-	fmt.Println("创建病人失败---------------------------------------------err")
+	fmt.Println("创建病人失败err")
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePatient)
 		return
@@ -337,6 +338,7 @@ func (c *PatientApiController) CreatePatient() {
 		MemberPatienttype:        0,
 		MemberTreatement:         0,
 		EquitmentId:              "",
+		UserSysBeforeCount:       patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -2027,7 +2029,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		theEndtTIme = theTime.Unix()
 	}
 
-	advices, total, _ := service.GetDoctorAdviceList(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords)
+	advices, total, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
 	advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
 
 	if len(advices) > 0 {
@@ -3704,3 +3706,29 @@ func IsIdCard(idCard string) (res bool) {
 	res, _ = regexp.Match("^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$|^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9]|X)$", []byte(idCard))
 	return
 }
+
+func (c *PatientApiController) SaveEditAdvices() {
+	adminInfo := c.GetAdminUserInfo()
+	orgid := adminInfo.CurrentOrgId
+	startTime := c.GetString("start_time")
+	fmt.Println("开始时间", startTime)
+	theTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startTime)
+	fmt.Println(theTime.Unix())
+	groupno, _ := c.GetInt64("groupno")
+	fmt.Println("组", groupno)
+	date, _ := c.GetInt64("date")
+	fmt.Println("date", date)
+	patient_id, _ := c.GetInt64("patient_id")
+	fmt.Println("paitent_id", patient_id)
+	advice := models.XtDoctorAdvice{
+		StartTime: theTime.Unix(),
+	}
+	err := service.UpdateDoctorEditAdvice(advice, orgid, groupno, date, patient_id)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice": advice,
+	})
+}

models/dialysis.go

@@ -580,6 +580,8 @@ type TreatmentSummary struct {
 	UpdatedTime       int64  `gorm:"column:updated_time" json:"updated_time"`
 	Creater           int64  `gorm:"column:creater" json:"creater"`
 	Modifier          int64  `gorm:"column:modifier" json:"modifier"`
+	NursingRecord     string `gorm:"column:nursing_record" json:"nursing_record" form:"nursing_record"`
+	SpecialRecord     string `gorm:"column:special_record" json:"special_record" form:"special_record"`
 }
 
 func (TreatmentSummary) TableName() string {

models/patient_models.go

@@ -488,6 +488,7 @@ type XtPatientsNew struct {
 	MemberTreatement             int64   `gorm:"column:member_treatement" json:"member_treatement" form:"member_treatement"`
 	EquitmentId                  string  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	IsExcelExport                int64   `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
 }
 
 func (XtPatientsNew) TableName() string {

models/user_models.go

@@ -457,6 +457,8 @@ type XtTreatmentSummary struct {
 	UpdatedTime       int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
 	Modifier          int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	NursingRecord     string `gorm:"column:nursing_record" json:"nursing_record" form:"nursing_record"`
+	SpecialRecord     string `gorm:"column:special_record" json:"special_record" form:"special_record"`
 }
 
 func (XtTreatmentSummary) TableName() string {

service/device_service.go

@@ -337,6 +337,20 @@ func GetDeviceGroupByID(orgID int64, groupID int64) (*models.DeviceGroup, error)
 	return &group, nil
 }
 
+func GetDeviceGroupName(name string, orgid int64) (*models.DeviceGroup, error) {
+	group := models.DeviceGroup{}
+	err := XTReadDB().Model(&group).Where("name = ? and org_id = ? and status =1", name, orgid).Find(&group).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return &group, nil
+
+}
+
 func CreateDeviceGroup(orgID int64, name string) (*models.DeviceGroup, error) {
 	now := time.Now().Unix()
 	group := models.DeviceGroup{
@@ -353,6 +367,11 @@ func CreateDeviceGroup(orgID int64, name string) (*models.DeviceGroup, error) {
 	return &group, nil
 }
 
+func GetUpdateDeviceGroupByName(name string, orgid int64) (group models.DeviceGroup, err error) {
+	err = XTReadDB().Model(&group).Where("name = ? and org_id = ? and status =1", name, orgid).Find(&group).Error
+	return group, err
+}
+
 func UpdateDeviceGroup(group *models.DeviceGroup) error {
 	err := writeDb.Save(group).Error
 	return err
@@ -427,6 +446,19 @@ func GetDeviceNumberByID(orgID int64, numberID int64) (*models.DeviceNumber, err
 	return &number, nil
 }
 
+func GetCreateDeviceNumber(num string, orgid int64) (*models.DeviceNumber, error) {
+	number := models.DeviceNumber{}
+	err := XTReadDB().Model(&number).Where("number = ? and org_id = ? and status = 1", num, orgid).Find(&number).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return &number, nil
+}
+
 func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64) (*models.DeviceNumber, error) {
 	now := time.Now().Unix()
 	numberModel := models.DeviceNumber{
@@ -445,6 +477,12 @@ func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64)
 	return &numberModel, nil
 }
 
+func GetDeviceNumberByName(num string, orgid int64) (number models.DeviceNumber, err error) {
+
+	err = XTReadDB().Model(&number).Where("number = ? and org_id = ? and status =1", num, orgid).First(&number).Error
+	return number, err
+}
+
 func UpdateDeviceNumber(number *models.DeviceNumber) error {
 	now := time.Now().Unix()
 	number.ModifyTime = now

service/mobile_dialysis_service.go

@@ -446,7 +446,7 @@ func MobileGetDoctorAdvices(orgID int64, patientID int64, recordDate int64) ([]*
 
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
-		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and advice_type = 2", patientID, orgID, recordDate).
+		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 or advice_type = 3)", patientID, orgID, recordDate).
 		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,IF(parent_id>0, parent_id, id) as advice_order,groupno").
 		Order("start_time asc, groupno desc, advice_order desc, id").
 		Scan(&records).Error
@@ -650,16 +650,15 @@ func GetMonitor(orgID int64, patientID int64, id int64) (*models.MonitoringRecor
 }
 
 type MScheduleDoctorAdviceVM struct {
-	ID           int64 `gorm:"column:id" json:"id"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status"`
-
+	ID              int64               `gorm:"column:id" json:"id"`
+	UserOrgId       int64               `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId     int64               `gorm:"column:partition_id" json:"partition_id"`
+	BedId           int64               `gorm:"column:bed_id" json:"bed_id"`
+	PatientId       int64               `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate    int64               `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType    int64               `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId          int64               `gorm:"column:mode_id" json:"mode_id"`
+	Status          int64               `gorm:"column:status" json:"status"`
 	DialysisOrder   *MDialysisOrderVM   `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
 	SchedualPatient *MSchedualPatientVM `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	DeviceNumber    *MDeviceNumberVM    `gorm:"ForeignKey:BedId" json:"device_number"`
@@ -723,6 +722,9 @@ func (MDoctorAdviceVM) TableName() string {
 func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
+	fmt.Println("advicetype", adviceType)
+	fmt.Println("patientType", patientType)
+	fmt.Println("adminUserId", adminUserId)
 	adviceCondition := []interface{}{}
 	if adviceType == 0 {
 		if patientType == 0 {

service/patient_service.go

@@ -719,7 +719,7 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	return
 }
 
-func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string) (advices []*models.DoctorAdvices, total int64, err error) {
+func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.DoctorAdvices, total int64, err error) {
 
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
@@ -752,7 +752,8 @@ func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int6
 		likeKey := "%" + keywords + "%"
 		db = db.Where("x.advice_name LIKE ?", likeKey)
 	}
-	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
 	fmt.Print("err", err)
 	return
 }
@@ -1280,3 +1281,9 @@ func FindPatientExportLog(org_id int64, export_time int64) (errLogs []*models.Ex
 func CreateExportLog(log *models.ExportLog) {
 	writeDb.Create(&log)
 }
+
+func UpdateDoctorEditAdvice(advice models.XtDoctorAdvice, orgid int64, groupno int64, date int64, patientid int64) error {
+
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and groupno = ? and advice_date = ? and patient_id = ?", orgid, groupno, date, patientid).Update(map[string]interface{}{"start_time": advice.StartTime, "updated_time": advice.UpdatedTime}).Error
+	return err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -692,6 +692,8 @@ type SummerVM struct {
 	UpdatedTime       int64  `gorm:"column:updated_time" json:"updated_time"`
 	Creater           int64  `gorm:"column:creater" json:"creater"`
 	Modifier          int64  `gorm:"column:modifier" json:"modifier"`
+	NursingRecord     string `gorm:"column:nursing_record" json:"nursing_record" form:"nursing_record"`
+	SpecialRecord     string `gorm:"column:special_record" json:"special_record" form:"special_record"`
 }
 
 func (SummerVM) TableName() string {