1

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

.idea/XT_New.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/XT_New.iml" filepath="$PROJECT_DIR$/.idea/XT_New.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 # 1
@@ -141,7 +141,7 @@ aliquid = 83
 
 [dev]
 mobile_token_expiration_second = 3600
-httpdomain = http://api.xt.test.sgjyun.com
+httpdomain = http://new_mobile.xt.api.sgjyun.com
 sso_domain = https://testsso.sgjyun.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 

controllers/base_api_controller.go

@@ -2,7 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
+	//"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -65,10 +65,10 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 400
-		userAdmin.Mobile = "13535547901"
-
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 400
+		//userAdmin.Mobile = "13535547901"
+		//
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
 		//userAdmin.IsSuperAdmin = false
@@ -77,7 +77,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 +87,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
@@ -316,32 +316,32 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		// var userAdmin models.AdminUser
-		// userAdmin.Id = 400
-		// userAdmin.Mobile = "13535547901"
-		// //userAdmin.Id = 597
-		// //userAdmin.Mobile = "19874122664"
-		// userAdmin.IsSuperAdmin = false
-		// userAdmin.Status = 1
-		// userAdmin.CreateTime = 1530786071
-		// userAdmin.ModifyTime = 1530786071
-		// var subscibe models.ServeSubscibe
-		// subscibe.ID = 1
-		// subscibe.OrgId = 12
-		// subscibe.PeriodStart = 1538035409
-		// subscibe.PeriodEnd = 1569571409
-		// subscibe.State = 1
-		// subscibe.Status = 1
-		// subscibe.CreatedTime = 1538035409
-		// subscibe.UpdatedTime = 1538035409
-		// subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		// subscibes[4] = &subscibe
-		// var adminUserInfo service.AdminUserInfo
-		// adminUserInfo.CurrentOrgId = 12
-		// adminUserInfo.CurrentAppId = 18
-		// adminUserInfo.AdminUser = &userAdmin
-		// adminUserInfo.Subscibes = subscibes
-		// this.SetSession("admin_user_info", &adminUserInfo)
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 400
+		//userAdmin.Mobile = "13535547901"
+		////userAdmin.Id = 597
+		////userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 9538
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 9538
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
 
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		this.StopRun()

controllers/data_api_controller.go

@@ -220,11 +220,14 @@ func (c *DataApiController) UpdateChildConfig() {
 	dataconfig.CreatedTime = time.Now().Format("2006-01-02 15:04:05")
 	dataconfig.UpdatedTime = time.Now().Format("2006-01-02 15:04:05")
 	dataconfig.Remark = string(dataBody["remark"].(string))
-	if dataBody["order"] != nil {
-		dataconfig.Order = int64(dataBody["order"].(float64))
-	} else {
-		dataconfig.Order = 0
-	}
+	dataconfig.Order = int64(dataBody["orders"].(float64))
+	fmt.Println("dataconfitg------", dataconfig.Order)
+	//if dataBody["orders"] != nil {
+	//	dataconfig.Order = int64(dataBody["orders"].(float64))
+	//	fmt.Println("dataconfig",dataconfig.Order)
+	//} else {
+	//	dataconfig.Order = 0
+	//}
 	configOrgId := int64(dataBody["org_id"].(float64))
 
 	// 验证关键字段的值是否重复

controllers/device_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/utils"
+	"github.com/jinzhu/gorm"
 	"time"
 
 	"XT_New/enums"
@@ -525,15 +526,22 @@ func (this *DeviceAPIController) CreateZone() {
 	}
 
 	adminInfo := this.GetAdminUserInfo()
-	zone, createErr := service.CreateDeviceZone(adminInfo.CurrentOrgId, name, type_)
-	if createErr != nil {
-		this.ErrorLog("创建设备分区失败:%v", createErr)
+	_, errcode := service.GetZoneByName(name, adminInfo.CurrentOrgId)
+	fmt.Println("errcode=----------", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		zone, createErr := service.CreateDeviceZone(adminInfo.CurrentOrgId, name, type_)
+		if createErr != nil {
+			this.ErrorLog("创建设备分区失败:%v", createErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"zone": zone,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"zone": zone,
-	})
 }
 
 // /api/device/zone/modify [post] ModifyZone
@@ -564,6 +572,11 @@ func (this *DeviceAPIController) ModifyZone() {
 	zone.Type = type_
 	zone.ModifyTime = time.Now().Unix()
 
+	byName, _ := service.GetZoneByNameOne(name, adminInfo.CurrentOrgId)
+	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 	updateErr := service.UpdateDeviceZone(zone)
 	if updateErr != nil {
 		this.ErrorLog("修改设备分区失败:%v", updateErr)

controllers/dialysis_api_controller.go

@@ -3072,18 +3072,6 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
-	_, evaluation := service.FindPredialysisEvaluationByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
-
-	if evaluation.ID > 0 {
-		if evaluation.WeightBefore > 0 && assessment.WeightAfter > 0 {
-			if (evaluation.WeightBefore-evaluation.AdditionalWeight)-(assessment.WeightAfter-assessment.AdditionalWeight) > 0 {
-				assessment.WeightLoss = (evaluation.WeightBefore - evaluation.AdditionalWeight) - (assessment.WeightAfter - assessment.AdditionalWeight)
-			} else {
-				assessment.WeightLoss = 0
-			}
-		}
-	}
-
 	if assessment.ID > 0 {
 
 		if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -3955,6 +3943,8 @@ func (c *DialysisApiController) CreateMonitor() {
 
 	displacement_flow_quantity, _ := c.GetFloat("displacement_flow_quantity", 0)
 
+	heparin, _ := c.GetFloat("heparin", 0)
+
 	ktv, _ := c.GetFloat("ktv", 0)
 	symptom := c.GetString("symptom")
 	dispose := c.GetString("dispose")
@@ -4010,6 +4000,7 @@ func (c *DialysisApiController) CreateMonitor() {
 		UserOrgId:                 adminUserInfo.CurrentOrgId,
 		Conductivity:              conductivity,
 		DisplacementFlowQuantity:  displacement_flow_quantity,
+		Heparin:                   heparin,
 	}
 
 	err := service.CreateMonitor(&monitorRecord)
@@ -4323,7 +4314,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//获取医嘱内容
 	doctor, err := service.FindDoctor(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 	DoctorName, err := service.FindDoctorName(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
-	fmt.Print("err-----------------------------------------------------------------", err)
+	//fmt.Print("err-----------------------------------------------------------------", err)
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	doctorAdevieInfo, err := service.FindDoctorAdviceByInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取上次的透后体重
@@ -4359,8 +4350,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
 	//相关操作对应的操作人
-	operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
-
+	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
+	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"xtdate":                  xtdate,

controllers/dialysis_record_api_controller.go

@@ -391,6 +391,7 @@ type EditMonitorParamObject struct {
 	Conductivity             float64 `json:"conductivity"`
 	DisplacementFlowQuantity float64 `json:"displacement_flow_quantity"`
 	BloodOxygenSaturation    string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Heparin                  float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -494,6 +495,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			UpdatedTime:           time.Now().Unix(),
 			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
 			Creator:               adminUserInfo.AdminUser.Id,
+			Heparin:               monitorParam.Heparin,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -553,6 +555,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.UpdatedTime = time.Now().Unix()
 		monitor.Modify = adminUserInfo.AdminUser.Id
 		monitor.BloodOxygenSaturation = monitorParam.BloodOxygenSaturation
+		monitor.Heparin = monitorParam.Heparin
 		updateErr := service.UpdateMonitor(monitor)
 		if updateErr != nil {
 			this.ErrorLog("修改透析监测记录失败:%v", updateErr)

controllers/gobal_config_api_controller.go

@@ -31,7 +31,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/stock/automaticreduce/isopen", &GobalConfigApiController{}, "post:PostStockConfig")
 	beego.Router("/api/automaticreduce/get", &GobalConfigApiController{}, "get:GetConfig")
 
-	beego.Router("/api/print/template/commit", &GobalConfigApiController{}, "post:PostPrintTemplate")
+	beego.Router("/api/print/template/commit", &GobalConfigApiController{}, "post:PostPrintTemplateTwo")
+
 	beego.Router("/api/print/template/get", &GobalConfigApiController{}, "get:GetPrintTemplate")
 
 	beego.Router("/api/dataupload/config/commit", &GobalConfigApiController{}, "post:PostConfig")
@@ -952,6 +953,7 @@ func (c *GobalConfigApiController) GetOrgs() {
 	var orgs []*models.Org
 	adminUser, err := service.GetHomeData(adminUserInfo.AdminUser.Id)
 	creator, err := service.GetCreator(id, orgId)
+	admin, err := service.GetSuperAdmin(id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -970,6 +972,7 @@ func (c *GobalConfigApiController) GetOrgs() {
 		"orgs":      orgs,
 		"adminUser": adminUser,
 		"creator":   creator,
+		"admin":     admin,
 	})
 
 }

controllers/manage_api_controller.go

@@ -1058,14 +1058,14 @@ func (this *MachineApiController) SaveInformation() {
 	//fmt.Println("透析时长", dialysis_time)
 
 	//hyperfiletration := dataBody["hyperfiltratio"].(string)
-	hyperfiltratios := int64(dataBody["hyperfiltratio"].(float64))
-	hyperfiletration := strconv.FormatInt(hyperfiltratios, 10)
-	//fmt.Println("实际超滤量", hyperfiletration)
+	hyperfiletration := dataBody["hyperfiltratio"].(float64)
+	//hyperfiletration := strconv.FormatInt(hyperfiltratios, 10)
+	fmt.Println("实际超滤量", hyperfiletration)
 
 	//weight_loss := dataBody["weight_loss"].(string)
-	weightloss := int64(dataBody["weight_loss"].(float64))
-	weight_loss := strconv.FormatInt(weightloss, 10)
-	//fmt.Println("体重减少", weight_loss)
+	weight_loss := dataBody["weight_loss"].(float64)
+	//weight_loss := strconv.FormatInt(weightloss, 10)
+	fmt.Println("体重减少", weight_loss)
 
 	warining_value := dataBody["warning_value"].(string)
 	fmt.Println("预警值", warining_value)
@@ -2303,9 +2303,9 @@ func (this *MachineApiController) UpdateForm() {
 	dialysis_time := dataBody["dialysis_time"].(string)
 	fmt.Println("透析时长", dialysis_time)
 
-	hyperfiletration := dataBody["hyperfiltratio"].(string)
+	hyperfiletration := dataBody["hyperfiltratio"].(float64)
 	fmt.Println("实际超滤量", hyperfiletration)
-	weight_loss := dataBody["weight_loss"].(string)
+	weight_loss := dataBody["weight_loss"].(float64)
 	fmt.Println("体重减少", weight_loss)
 	warining_value := dataBody["warning_value"].(string)
 	fmt.Println("预警值", warining_value)
@@ -2470,7 +2470,7 @@ func (this *MachineApiController) QueryInfo() {
 	fmt.Println("page", page)
 	adminUser := this.GetAdminUserInfo()
 	orgId := adminUser.CurrentOrgId
-	infor, total, err := service.QueryInfo(zone, bed, startdate, endtimes, orgId, limit, page)
+	infor, total, err := service.QueryInfo(bed, startdate, endtimes, orgId, limit, page)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")
 		return
@@ -2553,7 +2553,7 @@ func (this *MachineApiController) GetBedForm() {
 	fmt.Println("id", id)
 	addmacher, err := service.GetZoneForm(id)
 	bed, err := service.GetZoneId(addmacher.BedId, orgId)
-
+	fmt.Println("bed--------------------", bed.ZoneID)
 	number, err := service.GetBedForm(bed.ZoneID)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -366,7 +366,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	//dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminInfo.Org.Id, patientID)
 
-	operators, _ := service.GetAllAdminUserES(adminInfo.Org.Id, adminInfo.App.Id)
+	//operators, _ := service.GetAllAdminUserES(adminInfo.Org.Id, adminInfo.App.Id)
 
 	if getLPEErr != nil {
 		this.ErrorLog("获取上一次透前评估失败:%v", getLPEErr)
@@ -387,6 +387,10 @@ func (this *DialysisAPIController) DialysisRecord() {
 	goodTypes, _ := service.FindAllGoodTypeByType(1)          //查出所有库存配置的系统类型
 	goodInfos, _ := service.FindAllGoodInfo(adminInfo.Org.Id) //查出所有库存配置的系统类型
 
+	operators, err := service.GetAllStarfEs(adminInfo.Org.Id)
+	fmt.Println("报错-------", err)
+	fmt.Println("op----------------------------------------------------------", operators)
+
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -816,17 +820,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
 	//todayTimeStamp := today_time.Unix()
 
-	_, evaluation := service.FindPredialysisEvaluationByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
-
-	if evaluation.ID > 0 {
-		if evaluation.WeightBefore > 0 && weightAfter > 0 {
-			if (evaluation.WeightBefore-evaluation.AdditionalWeight)-(weightAfter-additionalWeight) > 0 {
-				weightReduce = (evaluation.WeightBefore - evaluation.AdditionalWeight) - (weightAfter - additionalWeight)
-			} else {
-				weightReduce = 0
-			}
-		}
-	}
+	//_, evaluation := service.FindPredialysisEvaluationByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 
 	assessmentAfterDislysis := models.AssessmentAfterDislysis{
 		UserOrgId:                    adminUserInfo.Org.Id,
@@ -6257,3 +6251,11 @@ func (c *DialysisAPIController) GetSchedule() {
 	})
 
 }
+
+func (c *DialysisAPIController) GetPatientId() {
+	id, _ := c.GetInt64("id")
+	patientId, _ := service.GetPatientId(id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patient": patientId,
+	})
+}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -86,6 +86,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	blood_oxygen_saturation := this.GetString("blood_oxygen_saturation")
 	result := this.GetString("result")
 	monitoringNurse, _ := this.GetInt64("monitoring_nurse")
+	heparin, _ := this.GetFloat("heparin")
 
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
@@ -136,6 +137,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		BloodOxygenSaturation:     blood_oxygen_saturation,
 		Creator:                   adminInfo.AdminUser.Id,
 		Modify:                    0,
+		Heparin:                   heparin,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -224,6 +226,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitoringNurse, _ := this.GetInt64("monitoring_nurse")
 	conductivity, _ := this.GetFloat("conductivity")
 	displacement_flow_quantity, _ := this.GetFloat("displacement_flow_quantity")
+	heparin, _ := this.GetFloat("heparin")
 
 	adminInfo := this.GetMobileAdminUserInfo()
 
@@ -279,6 +282,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.DisplacementFlowQuantity = displacement_flow_quantity
 	monitor.BloodOxygenSaturation = blood_oxygen_saturation
 	monitor.Modify = adminInfo.AdminUser.Id
+	monitor.Heparin = heparin
 
 	err = service.UpdateMonitor(monitor)
 	if err != nil {

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -108,4 +108,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/schedule/get", &DialysisAPIController{}, "Get:GetSchedule")
 
+	beego.Router("/m/api/getPatientid", &DialysisAPIController{}, "Get:GetPatientId")
+
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2080,7 +2080,6 @@ func (c *PatientApiController) GetDoctorAdvices() {
 }
 
 func (c *PatientApiController) GetPrintDialysisOrder() {
-	fmt.Println("触发-------------------------")
 	xtno := c.GetString("xtno")
 	xtdate := c.GetString("xtdate")
 
@@ -2152,7 +2151,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	receiverTreatmentAccess, _ := service.FindReceiverTreatmentAccessRecordById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
 	//相关操作对应的操作人
-	operators, _ := service.GetAdminUserES(adminUserInfo.Org.Id, adminUserInfo.App.Id, operatorIDs)
+	//operators, _ := service.GetAdminUserES(adminUserInfo.Org.Id, adminUserInfo.App.Id, operatorIDs)
+	operators, err := service.GetAllStarfEs(adminUserInfo.Org.Id)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -2513,11 +2513,6 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 			return
 		}
-		//TODO 根据路由来做权限
-		//if !adminUserInfo.AdminUser.IsSuperAdmin && advice.AdviceDoctor != adminUserInfo.AdminUser.Id {
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//	return
-		//}
 
 		advice.Status = 0
 		advice.UpdatedTime = time.Now().Unix()
@@ -2572,12 +2567,13 @@ func (c *PatientApiController) DelDoctorAdvice() {
 		advice.UpdatedTime = time.Now().Unix()
 		advice.Status = 0
 		advice.GroupNo = groupno
+		advice.Modifier = adminUserInfo.AdminUser.Id
 
 		var err error
 		if groupno > 0 {
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
 		} else {
-			err = service.BatchDeleteDoctorAdvice(ids)
+			err = service.BatchDeleteDoctorAdvice(ids, adminUserInfo.AdminUser.Id)
 		}
 
 		if err != nil {

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -555,6 +555,13 @@ func (this *NewDialysisApiController) SavePatient() {
 }
 
 func (this *NewDialysisApiController) GetPatientDetail() {
+	nowDateTime := time.Now()
+	nowDate := nowDateTime.Format("2006-01-02")
+	nowDate += " 00:00:00"
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", nowDate, loc)
+	nowdate := theTime.Unix()
 	id, _ := this.GetInt64("id")
 	//获取病人详情信息
 	detail, err := service.GetPatientDetailTwo(id)
@@ -574,6 +581,7 @@ func (this *NewDialysisApiController) GetPatientDetail() {
 		"diseases":       diseases,
 		"slowDiseases":   slowDiseases,
 		"cronicDiseases": cronicDiseases,
+		"nowdate":        nowdate,
 	})
 }
 
@@ -1837,21 +1845,28 @@ func (this *NewDialysisApiController) SavePartition() {
 	fmt.Println("分区型号", zonetype)
 	strInt64 := strconv.FormatInt(zonetype, 10)
 	typeid, _ := strconv.Atoi(strInt64)
-	zone := models.DeviceZone{
-		Name:       name,
-		Type:       typeid,
-		OrgID:      adminInfo.Org.Id,
-		Status:     1,
-		CreateTime: time.Now().Unix(),
-	}
-	err := service.CreatedZone(&zone)
-	if err != nil {
+	_, errcode := service.GetPartitionByName(name, adminInfo.Org.Id)
+	fmt.Println("errcode-------", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		zone := models.DeviceZone{
+			Name:       name,
+			Type:       typeid,
+			OrgID:      adminInfo.Org.Id,
+			Status:     1,
+			CreateTime: time.Now().Unix(),
+		}
+		err := service.CreatedZone(&zone)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"zone": zone,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"zone": zone,
-	})
 }
 
 func (this *NewDialysisApiController) GetAllZone() {
@@ -1886,20 +1901,27 @@ func (this *NewDialysisApiController) SaveGroup() {
 	orgid := adminUser.Org.Id
 	name := this.GetString("name")
 	fmt.Println("name", name)
-	group := models.DeviceGroup{
-		Name:       name,
-		Status:     1,
-		CreateTime: time.Now().Unix(),
-		OrgID:      orgid,
-	}
-	err := service.SaveGroup(&group)
-	if err != nil {
+	_, errcode := service.GetGroupByName(name, orgid)
+	if errcode == gorm.ErrRecordNotFound {
+		group := models.DeviceGroup{
+			Name:       name,
+			Status:     1,
+			CreateTime: time.Now().Unix(),
+			OrgID:      orgid,
+		}
+		err := service.SaveGroup(&group)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"group": group,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"group": group,
-	})
+
 }
 
 func (this *NewDialysisApiController) GetAllGroup() {
@@ -1955,22 +1977,29 @@ func (this *NewDialysisApiController) SaveBed() {
 	fmt.Print("zone", zone)
 	group, _ := this.GetInt64("group")
 	fmt.Println("group", group)
-	number := models.DeviceNumber{
-		Number:     name,
-		ZoneID:     zone,
-		GroupID:    group,
-		OrgID:      orgid,
-		Status:     1,
-		CreateTime: time.Now().Unix(),
-	}
-	err := service.CreateNumber(&number)
-	if err != nil {
+	_, errcode := service.GetBedByName(name, orgid)
+	if errcode == gorm.ErrRecordNotFound {
+		number := models.DeviceNumber{
+			Number:     name,
+			ZoneID:     zone,
+			GroupID:    group,
+			OrgID:      orgid,
+			Status:     1,
+			CreateTime: time.Now().Unix(),
+		}
+		err := service.CreateNumber(&number)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"number": number,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"number": number,
-	})
+
 }
 
 func (this *NewDialysisApiController) GetAllNumber() {
@@ -2278,11 +2307,18 @@ func (this *NewDialysisApiController) GetPartionDetail() {
 }
 
 func (this *NewDialysisApiController) UpdatePartition() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
 	zoneType, _ := this.GetInt64("type")
 	strInt64 := strconv.FormatInt(zoneType, 10)
 	typeid, _ := strconv.Atoi(strInt64)
+	byName, _ := service.GetPartitionByNameOne(name, orgid)
+	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
 	zone := models.DeviceZone{
 		Name: name,
 		Type: typeid,
@@ -2311,8 +2347,15 @@ func (this *NewDialysisApiController) GetGroupDetail() {
 }
 
 func (this *NewDialysisApiController) UpdateGroup() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
+	byName, _ := service.GetGroupByNameOne(name, orgid)
+	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
 	group := models.DeviceGroup{Name: name}
 	err := service.UpdateGroup(id, &group)
 	if err != nil {
@@ -2343,6 +2386,8 @@ func (this *NewDialysisApiController) GetBedDetail() {
 }
 
 func (this *NewDialysisApiController) UpdatedBed() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgId := adminUser.Org.Id
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
 	fmt.Println("name", name)
@@ -2350,6 +2395,12 @@ func (this *NewDialysisApiController) UpdatedBed() {
 	fmt.Println("zone", zone)
 	group, _ := this.GetInt64("group")
 	fmt.Println("group", group)
+	BedName, _ := service.GetBedByNameOne(name, orgId)
+	fmt.Println("-----", BedName.ID)
+	if BedName.ID > 0 && BedName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
 	number := models.DeviceNumber{
 		Number:  name,
 		ZoneID:  zone,

controllers/patient_api_controller.go

@@ -62,6 +62,7 @@ func PatientApiRegistRouters() {
 	beego.Router("/api/infectious/remind", &PatientApiController{}, "Get:GetRemindPatientList")
 
 	beego.Router("/api/remind/is_open", &PatientApiController{}, "Post:PostIsOpenRemind")
+	beego.Router("/api/patients/advices/getpatientschedules", &PatientApiController{}, "Get:GetPatientScheduleOne")
 
 }
 
@@ -243,29 +244,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             0,
-		Avatar:             patients.Avatar,
-		PatientType:        patients.PatientType,
-		DialysisNo:         patients.DialysisNo,
-		AdmissionNumber:    patients.AdmissionNumber,
-		Source:             patients.Source,
-		Lapseto:            patients.Lapseto,
-		PartitionId:        patients.PartitionId,
-		BedId:              patients.BedId,
-		Name:               patients.Name,
-		Alias:              patients.Alias,
-		Gender:             patients.Gender,
-		MaritalStatus:      patients.MaritalStatus,
-		IdCardNo:           patients.IdCardNo,
-		Birthday:           patients.Birthday,
-		ReimbursementWayId: patients.ReimbursementWayId,
-		HealthCareType:     patients.HealthCareType,
-		HealthCareNo:       patients.HealthCareNo,
-		HealthCareDueDate:  patients.HealthCareDueDate,
-		Height:             patients.Height,
-		BloodType:          patients.BloodType,
-		Rh:                 patients.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       0,
+		Avatar:                       patients.Avatar,
+		PatientType:                  patients.PatientType,
+		DialysisNo:                   patients.DialysisNo,
+		AdmissionNumber:              patients.AdmissionNumber,
+		Source:                       patients.Source,
+		Lapseto:                      patients.Lapseto,
+		PartitionId:                  patients.PartitionId,
+		BedId:                        patients.BedId,
+		Name:                         patients.Name,
+		Alias:                        patients.Alias,
+		Gender:                       patients.Gender,
+		MaritalStatus:                patients.MaritalStatus,
+		IdCardNo:                     patients.IdCardNo,
+		Birthday:                     patients.Birthday,
+		ReimbursementWayId:           patients.ReimbursementWayId,
+		HealthCareType:               patients.HealthCareType,
+		HealthCareNo:                 patients.HealthCareNo,
+		HealthCareDueDate:            patients.HealthCareDueDate,
+		Height:                       patients.Height,
+		BloodType:                    patients.BloodType,
+		Rh:                           patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -311,27 +312,27 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
-		IsInfectious:             patients.IsInfectious,
-		RemindCycle:              patients.RemindCycle,
-		ResponseResult:           patients.ResponseResult,
-		IsOpenRemind:             patients.IsOpenRemind,
-		FirstTreatmentDate:       patients.FirstTreatmentDate,
-		DialysisAge:              patients.DialysisAge,
-		ExpenseKind:              patients.ExpenseKind,
-		TellPhone:                patients.TellPhone,
-		ContactName:              patients.ContactName,
-		BloodPatients:            1,
-		SlowPatients:             0,
-		MemberPatients:           0,
-		EcommerPatients:          "",
-		BloodId:                  patients.ID,
-		SlowId:                   0,
-		MemberId:                 0,
-		MemberFistdate:           0,
-		MemberPatienttype:        0,
-		MemberTreatement:         0,
-		EquitmentId:              "",
+		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
+		IsInfectious:                 patients.IsInfectious,
+		RemindCycle:                  patients.RemindCycle,
+		ResponseResult:               patients.ResponseResult,
+		IsOpenRemind:                 patients.IsOpenRemind,
+		FirstTreatmentDate:           patients.FirstTreatmentDate,
+		DialysisAge:                  patients.DialysisAge,
+		ExpenseKind:                  patients.ExpenseKind,
+		TellPhone:                    patients.TellPhone,
+		ContactName:                  patients.ContactName,
+		BloodPatients:                1,
+		SlowPatients:                 0,
+		MemberPatients:               0,
+		EcommerPatients:              "",
+		BloodId:                      patients.ID,
+		SlowId:                       0,
+		MemberId:                     0,
+		MemberFistdate:               0,
+		MemberPatienttype:            0,
+		MemberTreatement:             0,
+		EquitmentId:                  "",
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -459,29 +460,29 @@ func (c *PatientApiController) EditPatient() {
 	}
 	fmt.Println("病人--------------------------------------------------------------", patient.Name, patient.Age)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          patient.UserOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		Lapseto:            patient.Lapseto,
-		PartitionId:        patient.PartitionId,
-		BedId:              patient.BedId,
-		Name:               patient.Name,
-		Alias:              patient.Alias,
-		Gender:             patient.Gender,
-		MaritalStatus:      patient.MaritalStatus,
-		IdCardNo:           patient.IdCardNo,
-		Birthday:           patient.Birthday,
-		ReimbursementWayId: patient.ReimbursementWayId,
-		HealthCareType:     patient.HealthCareType,
-		HealthCareNo:       patient.HealthCareNo,
-		HealthCareDueDate:  patient.HealthCareDueDate,
-		Height:             patient.Height,
-		BloodType:          patient.BloodType,
-		Rh:                 patient.Rh,
+		UserOrgId:                 patient.UserOrgId,
+		UserId:                    patient.UserId,
+		Avatar:                    patient.Avatar,
+		PatientType:               patient.PatientType,
+		DialysisNo:                patient.DialysisNo,
+		AdmissionNumber:           patient.AdmissionNumber,
+		Source:                    patient.Source,
+		Lapseto:                   patient.Lapseto,
+		PartitionId:               patient.PartitionId,
+		BedId:                     patient.BedId,
+		Name:                      patient.Name,
+		Alias:                     patient.Alias,
+		Gender:                    patient.Gender,
+		MaritalStatus:             patient.MaritalStatus,
+		IdCardNo:                  patient.IdCardNo,
+		Birthday:                  patient.Birthday,
+		ReimbursementWayId:        patient.ReimbursementWayId,
+		HealthCareType:            patient.HealthCareType,
+		HealthCareNo:              patient.HealthCareNo,
+		HealthCareDueDate:         patient.HealthCareDueDate,
+		Height:                    patient.Height,
+		BloodType:                 patient.BloodType,
+		Rh:                        patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -523,17 +524,17 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		ContactName:              patient.ContactName,
-		UpdatedTime:              time.Now().Unix(),
+		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
+		IsInfectious:              patient.IsInfectious,
+		RemindCycle:               patient.RemindCycle,
+		ResponseResult:            patient.ResponseResult,
+		IsOpenRemind:              patient.IsOpenRemind,
+		FirstTreatmentDate:        patient.FirstTreatmentDate,
+		DialysisAge:               patient.DialysisAge,
+		ExpenseKind:               patient.ExpenseKind,
+		TellPhone:                 patient.TellPhone,
+		ContactName:               patient.ContactName,
+		UpdatedTime:               time.Now().Unix(),
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1990,7 +1991,10 @@ func (c *PatientApiController) GetDoctorAdvices() {
 	startTime := c.GetString("start_time", "")
 	endTime := c.GetString("end_time", "")
 	keywords := c.GetString("keywords", "")
-
+	page, _ := c.GetInt64("page")
+	fmt.Println("page", page)
+	limit, _ := c.GetInt64("limit")
+	fmt.Println("limit", limit)
 	adminUserInfo := c.GetAdminUserInfo()
 
 	operatorIDs := make([]int64, 0)
@@ -2020,6 +2024,8 @@ func (c *PatientApiController) GetDoctorAdvices() {
 	}
 
 	advices, total, _ := service.GetDoctorAdviceList(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords)
+	advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+
 	if len(advices) > 0 {
 		for _, item := range advices {
 			if item.AdviceDoctor > 0 {
@@ -2044,6 +2050,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		"advices":   advices,
 		"operators": operators,
 		"total":     total,
+		"advicetwo": advicestwo,
 	})
 	return
 
@@ -2916,6 +2923,12 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 	age := int64(patientBody["age"].(float64))
 	patient.Age = age
 
+	if patientBody["user_sys_before_count"] != nil || reflect.TypeOf(patientBody["user_sys_before_count"]).String() == "string" {
+		user_sys_before_count := patientBody["user_sys_before_count"].(string)
+		count, _ := strconv.ParseInt(user_sys_before_count, 10, 64)
+		patient.UserSysBeforeCount = count
+	}
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -3337,3 +3350,27 @@ func (c *PatientApiController) PostIsOpenRemind() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	}
 }
+
+func (c *PatientApiController) GetPatientScheduleOne() {
+	id, _ := c.GetInt64("id")
+	//查询该病人是否当天是排班
+	nowDateTime := time.Now()
+	nowDate := nowDateTime.Format("2006-01-02")
+	nowDate += " 00:00:00"
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", nowDate, loc)
+	nowdate := theTime.Unix()
+	fmt.Println("nowdate", nowdate)
+	adminUser := c.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
+	fmt.Println("orgid", orgId)
+	scheduls, err := service.GetPatientScheduleOne(id, nowdate, orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"scheduls": scheduls,
+	})
+}

controllers/public_api_controller.go

@@ -163,6 +163,8 @@ func (this *PublicApiController) GetJson() {
 }
 
 func (c *PublicApiController) HandleData() {
+	service.HandleData()
+
 	//org_app, _ := service.GetAllAppOrg()
 	//org_role, _ := service.GetAllRole()
 	//

models/admin_user_models.go

@@ -71,6 +71,30 @@ func (AdminUserElectronicSignature) TableName() string {
 	return "sgj_user_admin_electronic_signature"
 }
 
+type SgjUserAdminRoles struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	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"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Url           string `gorm:"column:url" json:"url" form:"url"`
+	Hash          string `gorm:"column:hash" json:"hash" form:"hash"`
+}
+
 // 管理员用户特殊权限，详见表注释
 type AdminUserSpecialPermission struct {
 	ID          int64 `gorm:"column:id" json:"id"`

models/board_models.go

@@ -76,6 +76,7 @@ type BoardPatients struct {
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (BoardPatients) TableName() string {

models/device_models.go

@@ -459,103 +459,103 @@ type DeviceInformationss struct {
 }
 
 type DeviceInformations struct {
-	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
-	Date                  int64  `gorm:"column:date" json:"date" form:"date"`
-	Class                 int64  `gorm:"column:class" json:"class" form:"class"`
-	Zone                  int64  `gorm:"column:zone" json:"zone" form:"zone"`
-	BedNumber             int64  `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
-	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Contagion             string `gorm:"column:contagion" json:"contagion" form:"contagion"`
-	DialysisMode          int64  `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
-	StartTime             int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	EndTime               int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
-	DialysisHour          string `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
-	Hyperfiltratio        string `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
-	WeightLoss            string `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
-	WarningValue          string `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
-	UserTotal             string `gorm:"column:user_total" json:"user_total" form:"user_total"`
-	Move                  int64  `gorm:"column:move" json:"move" form:"move"`
-	FailureStage          int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
-	FaultDescription      string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
-	CodeInformation       string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	DisinfectType         int64  `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
-	DisinfectantType      int64  `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
-	Disinfection          int64  `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
-	MachineRun            int64  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
-	FluidPath             int64  `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
-	Disinfectant          int64  `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
-	DisinfectionStatus    int64  `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
-	DisinfectionResidue   int64  `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
-	LongTime              string `gorm:"column:long_time" json:"long_time" form:"long_time"`
-	DisinfecStartime      int64  `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
-	DisinfecEndtime       int64  `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
-	DialysisChecked       int64  `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
-	DialysisName          int64  `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
-	Norms                 string `gorm:"column:norms" json:"norms" form:"norms"`
-	DialysisConcentration int64  `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
-	GermChecked           int64  `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
-	GermName              int64  `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
-	GermNumber            string `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
-	Clean                 int64  `gorm:"column:clean" json:"clean" form:"clean"`
-	SignName              int64  `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
-	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"`
-	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	EquimentId            int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
-	Bed                   string `gorm:"column:bed" json:"bed" form:"bed"`
-	Name                  string `gorm:"column:name" json:"name" form:"name"`
-	UserName              string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	AdminUserId           int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	Date                  int64   `gorm:"column:date" json:"date" form:"date"`
+	Class                 int64   `gorm:"column:class" json:"class" form:"class"`
+	Zone                  int64   `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber             int64   `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Contagion             string  `gorm:"column:contagion" json:"contagion" form:"contagion"`
+	DialysisMode          int64   `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime               int64   `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	DialysisHour          string  `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
+	Hyperfiltratio        float64 `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
+	WeightLoss            float64 `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
+	WarningValue          string  `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
+	UserTotal             string  `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	Move                  int64   `gorm:"column:move" json:"move" form:"move"`
+	FailureStage          int64   `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription      string  `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CodeInformation       string  `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	DisinfectType         int64   `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
+	DisinfectantType      int64   `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
+	Disinfection          int64   `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
+	MachineRun            int64   `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
+	FluidPath             int64   `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
+	Disinfectant          int64   `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
+	DisinfectionStatus    int64   `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
+	DisinfectionResidue   int64   `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
+	LongTime              string  `gorm:"column:long_time" json:"long_time" form:"long_time"`
+	DisinfecStartime      int64   `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
+	DisinfecEndtime       int64   `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
+	DialysisChecked       int64   `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
+	DialysisName          int64   `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
+	Norms                 string  `gorm:"column:norms" json:"norms" form:"norms"`
+	DialysisConcentration int64   `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
+	GermChecked           int64   `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
+	GermName              int64   `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
+	GermNumber            string  `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
+	Clean                 int64   `gorm:"column:clean" json:"clean" form:"clean"`
+	SignName              int64   `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
+	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"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId            int64   `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	Bed                   string  `gorm:"column:bed" json:"bed" form:"bed"`
+	Name                  string  `gorm:"column:name" json:"name" form:"name"`
+	UserName              string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	AdminUserId           int64   `gorm:"column:admin_user_id" json:"admin_user_id"`
 }
 
 type DeviceInformation struct {
-	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
-	Date                  int64  `gorm:"column:date" json:"date" form:"date"`
-	Class                 int64  `gorm:"column:class" json:"class" form:"class"`
-	Zone                  int64  `gorm:"column:zone" json:"zone" form:"zone"`
-	BedNumber             int64  `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
-	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Contagion             string `gorm:"column:contagion" json:"contagion" form:"contagion"`
-	DialysisMode          int64  `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
-	StartTime             int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	EndTime               int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
-	DialysisHour          string `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
-	Hyperfiltratio        string `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
-	WeightLoss            string `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
-	WarningValue          string `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
-	UserTotal             string `gorm:"column:user_total" json:"user_total" form:"user_total"`
-	Move                  int64  `gorm:"column:move" json:"move" form:"move"`
-	FailureStage          int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
-	FaultDescription      string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
-	CodeInformation       string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	DisinfectType         int64  `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
-	DisinfectantType      int64  `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
-	Disinfection          int64  `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
-	MachineRun            int64  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
-	FluidPath             int64  `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
-	Disinfectant          int64  `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
-	DisinfectionStatus    int64  `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
-	DisinfectionResidue   int64  `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
-	LongTime              string `gorm:"column:long_time" json:"long_time" form:"long_time"`
-	DisinfecStartime      int64  `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
-	DisinfecEndtime       int64  `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
-	DialysisChecked       int64  `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
-	DialysisName          int64  `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
-	Norms                 string `gorm:"column:norms" json:"norms" form:"norms"`
-	DialysisConcentration int64  `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
-	GermChecked           int64  `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
-	GermName              int64  `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
-	GermNumber            string `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
-	Clean                 int64  `gorm:"column:clean" json:"clean" form:"clean"`
-	SignName              int64  `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
-	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"`
-	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	EquimentId            int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
-	Bed                   string `gorm:"column:bed" json:"bed" form:"bed"`
-	Stime                 int64  `gorm:"column:stime" json:"stime" form:"stime"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	Date                  int64   `gorm:"column:date" json:"date" form:"date"`
+	Class                 int64   `gorm:"column:class" json:"class" form:"class"`
+	Zone                  int64   `gorm:"column:zone" json:"zone" form:"zone"`
+	BedNumber             int64   `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Contagion             string  `gorm:"column:contagion" json:"contagion" form:"contagion"`
+	DialysisMode          int64   `gorm:"column:dialysis_mode" json:"dialysis_mode" form:"dialysis_mode"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime               int64   `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	DialysisHour          string  `gorm:"column:dialysis_hour" json:"dialysis_hour" form:"dialysis_hour"`
+	Hyperfiltratio        float64 `gorm:"column:hyperfiltratio" json:"hyperfiltratio" form:"hyperfiltratio"`
+	WeightLoss            float64 `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
+	WarningValue          string  `gorm:"column:warning_value" json:"warning_value" form:"warning_value"`
+	UserTotal             string  `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	Move                  int64   `gorm:"column:move" json:"move" form:"move"`
+	FailureStage          int64   `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription      string  `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CodeInformation       string  `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	DisinfectType         int64   `gorm:"column:disinfect_type" json:"disinfect_type" form:"disinfect_type"`
+	DisinfectantType      int64   `gorm:"column:disinfectant_type" json:"disinfectant_type" form:"disinfectant_type"`
+	Disinfection          int64   `gorm:"column:disinfection" json:"disinfection" form:"disinfection"`
+	MachineRun            int64   `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
+	FluidPath             int64   `gorm:"column:fluid_path" json:"fluid_path" form:"fluid_path"`
+	Disinfectant          int64   `gorm:"column:disinfectant" json:"disinfectant" form:"disinfectant"`
+	DisinfectionStatus    int64   `gorm:"column:disinfection_status" json:"disinfection_status" form:"disinfection_status"`
+	DisinfectionResidue   int64   `gorm:"column:disinfection_residue" json:"disinfection_residue" form:"disinfection_residue"`
+	LongTime              string  `gorm:"column:long_time" json:"long_time" form:"long_time"`
+	DisinfecStartime      int64   `gorm:"column:disinfec_startime" json:"disinfec_startime" form:"disinfec_startime"`
+	DisinfecEndtime       int64   `gorm:"column:disinfec_endtime" json:"disinfec_endtime" form:"disinfec_endtime"`
+	DialysisChecked       int64   `gorm:"column:dialysis_checked" json:"dialysis_checked" form:"dialysis_checked"`
+	DialysisName          int64   `gorm:"column:dialysis_name" json:"dialysis_name" form:"dialysis_name"`
+	Norms                 string  `gorm:"column:norms" json:"norms" form:"norms"`
+	DialysisConcentration int64   `gorm:"column:dialysis_concentration" json:"dialysis_concentration" form:"dialysis_concentration"`
+	GermChecked           int64   `gorm:"column:germ_checked" json:"germ_checked" form:"germ_checked"`
+	GermName              int64   `gorm:"column:germ_name" json:"germ_name" form:"germ_name"`
+	GermNumber            string  `gorm:"column:germ_number" json:"germ_number" form:"germ_number"`
+	Clean                 int64   `gorm:"column:clean" json:"clean" form:"clean"`
+	SignName              int64   `gorm:"column:sign_name" json:"sign_name" form:"sign_name"`
+	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"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId            int64   `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	Bed                   string  `gorm:"column:bed" json:"bed" form:"bed"`
+	Stime                 int64   `gorm:"column:stime" json:"stime" form:"stime"`
 }
 
 func (DeviceInformation) TableName() string {
@@ -737,7 +737,7 @@ type DeviceRepairs struct {
 	BedId            int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
 	EquitmentId      int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	CodeInformation  string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	BedNumber        string `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	Number           string `gorm:"column:number" json:"bed_number" form:"number"`
 }
 
 type DeviceRepair struct {

models/dialysis.go

@@ -75,6 +75,7 @@ type SchedualPatient struct {
 	TellPhone               string                  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (SchedualPatient) TableName() string {
@@ -154,6 +155,7 @@ type SchedualPatient2 struct {
 	TellPhone               string           `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (SchedualPatient2) TableName() string {
@@ -642,6 +644,7 @@ type MonitoringRecord struct {
 	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
 	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
 }
 
 func (MonitoringRecord) TableName() string {
@@ -853,3 +856,27 @@ type SgjUserAdmin struct {
 func (SgjUserAdmin) TableName() string {
 	return "sgj_user_admin"
 }
+
+type UserAdminRoles struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	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"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Url           string `gorm:"column:url" json:"url" form:"url"`
+	Hash          string `gorm:"column:hash" json:"hash" form:"hash"`
+}

models/intergration_models.go

@@ -1,16 +1,16 @@
 package models
 
 type MiddleSyncInfo struct {
-	ID             	int64 `gorm:"column:id" json:"id" form:"id"`
-	OrgId       	int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	SyncTime       int64 `gorm:"column:sync_time" json:"sync_time" form:"sync_time"`
-	SyncResultType  int	  `gorm:"column:sync_result_type" json:"sync_result_type" form:"sync_result_type"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SyncTime        int64  `gorm:"column:sync_time" json:"sync_time" form:"sync_time"`
+	SyncResultType  int    `gorm:"column:sync_result_type" json:"sync_result_type" form:"sync_result_type"`
 	SyncRsultRemark string `gorm:"column:sync_result_remark" json:"sync_result_remark" form:"sync_result_remark"`
-	SyncTotalNum    int64 `gorm:"column:sync_total_num" json:"sync_total_num" form:"sync_total_num"`
-	SyncSuccessNum  int64 `gorm:"column:sync_success_num" json:"sync_success_num" form:"sync_success_num"`
-	SyncInfo      	string `gorm:"column:sync_info" json:"sync_info" form:"sync_info"`
-	CreateTime      int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
-	UpdateTime    	int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
+	SyncTotalNum    int64  `gorm:"column:sync_total_num" json:"sync_total_num" form:"sync_total_num"`
+	SyncSuccessNum  int64  `gorm:"column:sync_success_num" json:"sync_success_num" form:"sync_success_num"`
+	SyncInfo        string `gorm:"column:sync_info" json:"sync_info" form:"sync_info"`
+	CreateTime      int64  `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime      int64  `gorm:"column:update_time" json:"update_time" form:"update_time"`
 }
 
 func (MiddleSyncInfo) TableName() string {
@@ -18,22 +18,22 @@ func (MiddleSyncInfo) TableName() string {
 }
 
 type MiddleInterface struct {
-	ID          	int64  `gorm:"column:id" json:"id" form:"id"`
-	OrgId   		int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Creater   		int64 `gorm:"column:creater" json:"creater" form:"creater"`
-	Pattern 		int  `gorm:"column:pattern" json:"pattern" form:"pattern"`
-	Dbhost 			string  `gorm:"column:dbhost" json:"dbhost" form:"dbhost"`
-	Dbuser 			string  `gorm:"column:dbuser" json:"dbuser" form:"dbuser"`
-	Dbpassword 		string  `gorm:"column:dbpassword" json:"dbpassword" form:"dbpassword"`
-	Dbname 			string  `gorm:"column:dbname" json:"dbname" form:"dbname"`
-	InterfaceUrl 	string  `gorm:"column:interface_url" json:"interface_url" form:"interface_url"`
-	InterFaceToken 	string  `gorm:"column:interface_token" json:"interface_token" form:"interface_token"`
-	AllowIp 		string  `gorm:"column:allow_ip" json:"allow_ip" form:"allow_ip"`
-	AllowToken 		string  `gorm:"column:allow_token" json:"allow_token" form:"allow_token"`
-	SyncFrequency 	int  `gorm:"column:sync_frequency" json:"sync_frequency" form:"sync_frequency"`
-	Status			int  `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"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Creater        int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Pattern        int    `gorm:"column:pattern" json:"pattern" form:"pattern"`
+	Dbhost         string `gorm:"column:dbhost" json:"dbhost" form:"dbhost"`
+	Dbuser         string `gorm:"column:dbuser" json:"dbuser" form:"dbuser"`
+	Dbpassword     string `gorm:"column:dbpassword" json:"dbpassword" form:"dbpassword"`
+	Dbname         string `gorm:"column:dbname" json:"dbname" form:"dbname"`
+	InterfaceUrl   string `gorm:"column:interface_url" json:"interface_url" form:"interface_url"`
+	InterFaceToken string `gorm:"column:interface_token" json:"interface_token" form:"interface_token"`
+	AllowIp        string `gorm:"column:allow_ip" json:"allow_ip" form:"allow_ip"`
+	AllowToken     string `gorm:"column:allow_token" json:"allow_token" form:"allow_token"`
+	SyncFrequency  int    `gorm:"column:sync_frequency" json:"sync_frequency" form:"sync_frequency"`
+	Status         int    `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"`
 }
 
 func (MiddleInterface) TableName() string {
@@ -126,6 +126,7 @@ type VMPatients 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"`
 	VMHisPatients            VMHisPatients `gorm:"ForeignKey:XtPatientId;AssociationForeignKey:ID" json:"his_patient"`
+	UserSysBeforeCount       int64         `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (VMPatients) TableName() string {

models/monitor_models.go

@@ -103,6 +103,7 @@ type MonitorPatients struct {
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (MonitorPatients) TableName() string {

models/patient_models.go

@@ -85,6 +85,7 @@ type Patients struct {
 	TellPhone                string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (Patients) TableName() string {
@@ -483,6 +484,7 @@ type XtPatientsNew struct {
 	MemberPatienttype            int64   `gorm:"column:member_patienttype" json:"member_patienttype" form:"member_patienttype"`
 	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"`
 }
 
 func (XtPatientsNew) TableName() string {
@@ -495,44 +497,45 @@ type PatientsNew struct {
 }
 
 type CdmPatients 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"`
-	UserId            int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	Avatar            string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	PatientType       int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	Source            int64  `gorm:"column:source" json:"source" form:"source"`
-	Name              string `gorm:"column:name" json:"name" form:"name"`
-	Alias             string `gorm:"column:alias" json:"alias" form:"alias"`
-	Gender            int64  `gorm:"column:gender" json:"gender" form:"gender"`
-	MaritalStatus     int64  `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
-	IdCardNo          string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Birthday          int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	HealthCareType    int64  `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
-	HealthCareNo      string `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
-	Height            int64  `gorm:"column:height" json:"height" form:"height"`
-	BloodType         int64  `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
-	Rh                int64  `gorm:"column:rh" json:"rh" form:"rh"`
-	EducationLevel    int64  `gorm:"column:education_level" json:"education_level" form:"education_level"`
-	Profession        int64  `gorm:"column:profession" json:"profession" form:"profession"`
-	Phone             string `gorm:"column:phone" json:"phone" form:"phone"`
-	HomeTelephone     string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
-	RelativePhone     string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
-	RelativeRelations string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
-	HomeAddress       string `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	WorkUnit          string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
-	UnitAddress       string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
-	Children          int64  `gorm:"column:children" json:"children" form:"children"`
-	AttendingDoctorId int64  `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
-	HeadNurseId       int64  `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
-	Diagnose          string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
-	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
-	RegistrarsId      int64  `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
-	Registrars        string `gorm:"column:registrars" json:"registrars" form:"registrars"`
-	QrCode            string `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
-	BindingState      int64  `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
-	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"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId             int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar             string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType        int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	Source             int64  `gorm:"column:source" json:"source" form:"source"`
+	Name               string `gorm:"column:name" json:"name" form:"name"`
+	Alias              string `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	MaritalStatus      int64  `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	HealthCareType     int64  `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo       string `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	Height             int64  `gorm:"column:height" json:"height" form:"height"`
+	BloodType          int64  `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                 int64  `gorm:"column:rh" json:"rh" form:"rh"`
+	EducationLevel     int64  `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession         int64  `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone              string `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone      string `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone      string `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations  string `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress        string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit           string `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress        string `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children           int64  `gorm:"column:children" json:"children" form:"children"`
+	AttendingDoctorId  int64  `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId        int64  `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Diagnose           string `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark             string `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId       int64  `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars         string `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode             string `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState       int64  `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	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"`
+	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (CdmPatients) TableName() string {
@@ -791,6 +794,7 @@ type XtPatients struct {
 	ExpenseKind                  int64   `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (XtPatients) TableName() string {

models/vm_models.go

@@ -85,6 +85,7 @@ type VMOrgPatients struct {
 	TellPhone                string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (VMOrgPatients) TableName() string {

service/app_version.go

@@ -182,3 +182,11 @@ func GetSystemRole(orgID int64) ([]*models.Role, error) {
 	}
 	return roles, nil
 }
+
+func HandleData() {
+	var prescription []*models.DialysisPrescription
+	readDb.Model(&models.DialysisPrescription{}).Where("user_org_id = 12 AND record_date <= 1587571200").Find(&prescription)
+	for _, item := range prescription {
+		writeDb.Model(&models.AssessmentAfterDislysis{}).Where("user_org_id =12 AND assessment_date = ?", item.RecordDate).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "actual_ultrafiltration": item.Ultrafiltration})
+	}
+}

service/auto_create_week_disinfection.go

@@ -138,8 +138,8 @@ func AutoCreateWeekDisinfectionJob() {
 							StartTime:             it.StartTime,
 							EndTime:               it.EndTime,
 							Contagion:             con,
-							WeightLoss:            strconv.FormatFloat(dislysis.WeightLoss, 'f', -1, 64),
-							Hyperfiltratio:        strconv.FormatFloat(dislysis.ActualUltrafiltration, 'f', -1, 64),
+							WeightLoss:            dislysis.WeightLoss,
+							Hyperfiltratio:        dislysis.ActualUltrafiltration,
 							DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
 							MachineRun:            1,
 						}

service/auto_create_week_plan.go

@@ -122,8 +122,8 @@ func AutoCreateWeekPlanJob() {
 							StartTime:             it.StartTime,
 							EndTime:               it.EndTime,
 							Contagion:             con,
-							WeightLoss:            strconv.FormatFloat(dislysis.WeightLoss, 'f', -1, 64),
-							Hyperfiltratio:        strconv.FormatFloat(dislysis.ActualUltrafiltration, 'f', -1, 64),
+							WeightLoss:            dislysis.WeightLoss,
+							Hyperfiltratio:        dislysis.ActualUltrafiltration,
 							DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
 							MachineRun:            1,
 						}

service/data.go

@@ -141,7 +141,7 @@ func FindConfigByTitleForUpdate(module string, title string, org_id int64, id in
 }
 
 func UpdateChildConfig(dataconfig *models.Dataconfig) (err error) {
-	err = readDb.Model(&models.Dataconfig{}).Where("id =?", dataconfig.ID).Update(map[string]interface{}{"name": dataconfig.Name, "update_time": dataconfig.UpdatedTime, "remark": dataconfig.Remark}).Error
+	err = readDb.Model(&models.Dataconfig{}).Where("id =?", dataconfig.ID).Update(map[string]interface{}{"name": dataconfig.Name, "update_time": dataconfig.UpdatedTime, "remark": dataconfig.Remark, "orders": dataconfig.Order}).Error
 	return
 }
 

service/device_service.go

@@ -272,6 +272,25 @@ func GetDeviceZoneByID(orgID int64, zoneID int64) (*models.DeviceZone, error) {
 	return &zone, nil
 }
 
+func GetZoneByName(name string, orgid int64) (*models.DeviceZone, error) {
+	zones := models.DeviceZone{}
+	err := XTReadDB().Model(&zones).Where("name = ? and org_id = ? and status = 1", name, orgid).Find(&zones).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return &zones, nil
+}
+
+func GetZoneByNameOne(name string, orgid int64) (zone models.DeviceZone, err error) {
+
+	err = XTReadDB().Model(&zone).Where("name = ? and org_id=? and status = 1", name, orgid).First(&zone).Error
+	return zone, err
+}
+
 func CreateDeviceZone(orgID int64, name string, type_ int) (*models.DeviceZone, error) {
 	now := time.Now().Unix()
 	zone := models.DeviceZone{
@@ -648,3 +667,10 @@ func GetTreatModel(id int64, orgid int64) (mode []*models.DeviceTreatmentmode, e
 
 	return mode, err
 }
+
+func GetPatientId(id int64) (models.XtPatientsNew, error) {
+
+	patientsNew := models.XtPatientsNew{}
+	err := XTReadDB().Model(&patientsNew).Where("blood_id = ? and status = 1", id).Find(&patientsNew).Error
+	return patientsNew, err
+}

service/dialysis_service.go

@@ -695,6 +695,24 @@ func GetAdminUserES(orgID int64, appID int64, ids []int64) (es []*models.AdminUs
 	return
 }
 
+//
+//func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error) {
+//
+//	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
+//	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
+//	fmt.Println("table", table)
+//	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error
+//	return admin, err
+//}
+
+func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error) {
+	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status =1")
+	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error
+	return admin, err
+}
+
 func UpDateDialysisPrescriptionDoctorSign(patient int64, date int64, orgId int64, doctor_id int64) (err error) {
 	err = writeDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? ", orgId, patient, date).Updates(map[string]interface{}{"prescription_doctor": doctor_id}).Error
 	return
@@ -705,6 +723,15 @@ func GetAllAdminUserES(orgID int64, appId int64) (es []*models.AdminUserElectron
 	return
 }
 
+func GetAllStarfEs(orgid int64) (es []*models.SgjUserAdminRoles, err error) {
+
+	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
+	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id and s.status = 1").Where("x.org_id = ?", orgid).Scan(&es).Error
+	return es, err
+}
+
 func FindLastMonitorRecord(patient_id int64, org_id int64) (record models.MonitoringRecord, err error) {
 	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? AND status = 1 AND user_org_id = ?", patient_id, org_id).Last(&record).Error
 	return
@@ -780,7 +807,7 @@ func CheckOldDoctorAdvice(m *models.DoctorAdvice, advice_id int64) (err error) {
 
 func DeleteDoctorAdviceByGroupNo(m *models.DoctorAdvice) (err error) {
 	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?", m.GroupNo).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ? AND user_org_id =  ?", m.GroupNo, m.UserOrgId).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0, "modifier": m.Modifier}).Error
 	if err != nil {
 		ut.Rollback()
 		return

service/gobal_config_service.go

@@ -76,7 +76,7 @@ func UpdateDoctorAdviceRecord(config *models.DoctorAdviceConfig) (err error) {
 }
 
 func UpdateFiledConfig(org_id int64) (err error) {
-	err = writeDb.Model(&models.FiledConfig{}).Where("org_id = ?", org_id).Updates(map[string]interface{}{"is_show": 1}).Error
+	err = writeDb.Model(&models.FiledConfig{}).Where("org_id = ? AND sys_module = 0", org_id).Updates(map[string]interface{}{"is_show": 1}).Error
 	return
 }
 

service/home_service.go

@@ -20,6 +20,12 @@ func GetCreator(id int64, orgid int64) (models.SgjUserAdminRole, error) {
 	return role, err
 }
 
+func GetSuperAdmin(id int64) (models.SgjUserAdmin, error) {
+	admin := models.SgjUserAdmin{}
+	err := UserReadDB().Model(&admin).Where("id=? and status =1", id).Find(&admin).Error
+	return admin, err
+}
+
 func GetAllApp(org_id int64) (apps []*models.OrgApp, err error) {
 	err = readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND pid > 0 AND org_id = ?", org_id).Order("number asc").Find(&apps).Error
 	return

service/manage_service.go

@@ -639,13 +639,13 @@ func CreateRepair(repair *models.DeviceRepair) error {
 func GetAllRepair(orgid int64, limit int64, page int64) (repair []*models.DeviceRepairs, total int64, err error) {
 
 	db := UserReadDB().Table("xt_device_repair as r").Where("r.status = ?", 1)
-	table := XTReadDB().Table("xt_device_addmacher as x")
+	table := XTReadDB().Table("xt_device_number as x")
 	offset := (page - 1) * limit
 	fmt.Print("table", table)
 	if orgid > 0 {
 		db = db.Where("r.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.bed_number").Joins("Left join xt_device_addmacher as x on x.id = r.equitment_id").Offset(offset).Limit(limit).Scan(&repair).Error
+	err = db.Count(&total).Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.number").Joins("Left join sgj_xt.xt_device_number as x on x.id = r.bed_id").Offset(offset).Limit(limit).Scan(&repair).Error
 
 	//	err = UserReadDB().Where("user_org_id = ? AND status = 1", orgid).Find(&repair).Error
 	return repair, total, err
@@ -699,7 +699,7 @@ func GetRepair(bedid int64, start int64, end int64, orgid int64) (repair []*mode
 		db = db.Where("r.guarantee_date <= ?", end)
 	}
 	//err = db.Model(&repair).Find(&repair).Error
-	err = db.Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.bed_number").Joins("Left join xt_device_addmacher as x on x.id = r.equitment_id").Scan(&repair).Error
+	err = db.Select("r.id,r.guarantee_date,r.start_time,r.arrive_time,r.finish_time,r.total_distance,r.failure_stage,r.fault_description,r.cause_analysis,r.treatment_process,r.images,r.exclude,r.reason,r.ctime,r.mtime,r.status,r.user_org_id,r.bed_id,r.equitment_id,r.code_information,x.number").Joins("Left join sgj_xt.xt_device_number as x on x.id = r.bed_id").Scan(&repair).Error
 
 	return repair, err
 }
@@ -757,7 +757,7 @@ func UpadateForm(id int64, orgid int64, infor *models.DeviceInformation) error {
 	return err
 }
 
-func QueryInfo(zone int64, bed int64, start int64, end int64, orgId int64, limit int64, page int64) (infor []*models.DeviceInformations, total int64, err error) {
+func QueryInfo(bed int64, start int64, end int64, orgId int64, limit int64, page int64) (infor []*models.DeviceInformations, total int64, err error) {
 	db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_patients as p")
 	fmt.Println("table", table)
@@ -766,9 +766,9 @@ func QueryInfo(zone int64, bed int64, start int64, end int64, orgId int64, limit
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	if zone > 0 {
-		db = db.Where("x.zone = ?", zone)
-	}
+	//if zone > 0 {
+	//	db = db.Where("x.zone = ?", zone)
+	//}
 	if bed > 0 {
 		db = db.Where("x.bed_number = ?", bed)
 	}

service/mobile_dialysis_service.go

@@ -109,15 +109,17 @@ func (MDeviceNumberVM) TableName() string {
 }
 
 type MSchedualPatientVMList 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"`
-	UserId      int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	PatientType int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	Gender      int64  `gorm:"column:gender" json:"gender" form:"gender"`
-	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	Age         int64  `gorm:"column:age" json:"age"`
-	Name        string `gorm:"column:name" json:"name" form:"name"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId             int64  `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	PatientType        int64  `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	Avatar             string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	Gender             int64  `gorm:"column:gender" json:"gender" form:"gender"`
+	Birthday           int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Age                int64  `gorm:"column:age" json:"age"`
+	Name               string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (MSchedualPatientVMList) TableName() string {
@@ -194,6 +196,7 @@ type MSchedualPatientVM struct {
 	TellPhone               string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (MSchedualPatientVM) TableName() string {
@@ -386,6 +389,7 @@ type MPatient struct {
 	TellPhone               string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	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"`
 }
 
 func (MPatient) TableName() string {

service/patient_service.go

@@ -67,7 +67,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	offset := (page - 1) * limit
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
 }
 
@@ -666,7 +666,7 @@ func DeleteDoctorAdvice(m *models.DoctorAdvice) (err error) {
 	return
 }
 func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64) (err error) {
-	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id=? and groupno=?", orgId, groupNo).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ?", orgId, groupNo).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
 	if err != nil {
 		return
 	}
@@ -682,7 +682,7 @@ func FindDoctorAdviceByGroupNo(orgID, groupNo int64) (advice models.DoctorAdvice
 	return
 }
 func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64, keywords string) (advices []*models.DoctorAdvices, total int64, err error) {
-	//db := readDb.Model(&models.DoctorAdvice{}).Where("status=1")
+
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Print("table", table)
@@ -697,6 +697,7 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	} else if advice_type == 0 {
 		db = db.Where("x.advice_type in (?)", []int{1, 3})
 	}
+
 	if stop == 1 {
 		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
 	} else if stop == 2 {
@@ -717,6 +718,86 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	fmt.Print("err", err)
 	return
 }
+
+func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string) (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")
+	fmt.Print("table", table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 && advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
+	if advice_type == 3 && advice_type > 0 {
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
+	}
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		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
+	fmt.Print("err", err)
+	return
+}
+
+func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page 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")
+	fmt.Println(table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
+	if advice_type == 3 {
+		db = db.Where("x.advice_type <> 1")
+	}
+
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	offset := (page - 1) * limit
+	err = db.Order("x.start_time desc").Group("x.start_time").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").Scan(&advices).Error
+	fmt.Print("错误是什么", err)
+	return
+
+}
+
 func GetDoctorAdvicePageList(orgID, patientID, advice_type, stop, start, end int64, keywords string, page, limit int64) (advices []*models.DoctorAdvice, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -996,14 +1077,14 @@ func FindDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdv
 	return
 }
 
-func BatchDeleteDoctorAdvice(ids []string) (err error) {
+func BatchDeleteDoctorAdvice(ids []string, user_id int64) (err error) {
 	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "modifier": user_id}).Error
 	if err != nil {
 		ut.Rollback()
 		return
 	}
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "modifier": user_id}).Error
 	if err != nil {
 		ut.Rollback()
 		return
@@ -1073,3 +1154,9 @@ func GetSchedualPatientByKeyWord(orgID int64, keywords string, date int64) (pati
 	}
 	return
 }
+
+func GetPatientScheduleOne(patientid int64, nowdate int64, orgid int64) (models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTReadDB().Model(&schedule).Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status =1", patientid, nowdate, orgid).Find(&schedule).Error
+	return schedule, err
+}

service/patientmanage_service.go

@@ -524,7 +524,6 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 }
 
 func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end int64, limit int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvice, total int64, err error) {
-	fmt.Println("advicetype------------------------------", advice_type)
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)
@@ -1077,6 +1076,24 @@ func SaveBirthday(id int64, role *models.SgjUserAdminRole) error {
 	return err
 }
 
+func GetPartitionByName(name string, orgid int64) (*models.DeviceZone, error) {
+	zone := models.DeviceZone{}
+	err := XTReadDB().Model(&zone).Where("name = ? and org_id = ? and status = 1", name, orgid).Find(&zone).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &zone, nil
+}
+
+func GetPartitionByNameOne(name string, orgid int64) (zone models.DeviceZone, err error) {
+
+	err = XTReadDB().Model(&zone).Where("name = ? and org_id = ? and status = 1", name, orgid).First(&zone).Error
+	return zone, err
+}
+
 func CreatedZone(zone *models.DeviceZone) error {
 
 	err := XTWriteDB().Model(&zone).Create(&zone).Error
@@ -1102,6 +1119,23 @@ func DeleteZoneById(id int64) error {
 	return err
 }
 
+func GetGroupByName(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 GetGroupByNameOne(name string, orgid int64) (group models.DeviceGroup, err error) {
+	err = XTReadDB().Model(&group).Where("name = ? and org_id = ? and status =1", name, orgid).First(&group).Error
+	return group, err
+}
+
 func SaveGroup(group *models.DeviceGroup) error {
 	err := XTWriteDB().Model(&group).Create(&group).Error
 	return err
@@ -1136,6 +1170,24 @@ func GetAllGroupOne(orgid int64) (group []*models.DeviceGroup, err error) {
 	return group, err
 }
 
+func GetBedByName(name string, orgid int64) (*models.DeviceNumber, error) {
+	number := models.DeviceNumber{}
+	err := XTReadDB().Model(&number).Where("number=? and org_id = ? and status =1", name, orgid).Find(&number).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &number, nil
+}
+
+func GetBedByNameOne(name string, orgid int64) (number models.DeviceNumber, err error) {
+
+	err = XTReadDB().Model(&number).Where("number=? and org_id = ? and status = 1", name, orgid).First(&number).Error
+	return number, err
+}
+
 func CreateNumber(number *models.DeviceNumber) error {
 
 	err := XTWriteDB().Model(&number).Create(&number).Error

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -75,6 +75,7 @@ type PatientVM struct {
 	ExpenseKind                  int64   `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
 	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
 	FirstTreatmentDate           int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
 func (PatientVM) TableName() string {
@@ -489,6 +490,7 @@ type MonitoringRecordVM struct {
 	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
 	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/schedule_service.go

@@ -238,7 +238,7 @@ func GetWeekDaySchedule(orgID int64, scheduleDate int64, scheduleDates *time.Tim
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1").Order("id desc")
+			return db.Where("status = 1").Order("id asc")
 		}).
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
 		Where("s.user_org_id=? and s.schedule_date = ? and s.status=1", orgID, scheduleDate).

service/user_service.go

@@ -48,7 +48,10 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 }
 
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
+	//fmt.Println("orgid", orgId)
+	//fmt.Println("appid", appid)
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }