Merge branch '20200710_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20200710_xt_api_new_branch

conf/app.conf

@@ -143,33 +143,33 @@ aliquid = 83
 [dev]
 mobile_token_expiration_second = 3600
 httpdomain = http://new_mobile.xt.api.sgjyun.com
-sso_domain = http://localhost:8091
+sso_domain = https://testsso.sgjyun.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = test_xt
+readmysqlname = sgj_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = test_xt
+writemysqlname = sgj_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = test_users
+readusername = sgj_users
 
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = test_users
+writeusername = sgj_users
 
 
 

controllers/base_api_controller.go

@@ -69,36 +69,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 558
-		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()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 558
+		//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 = 7957
+		//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 = 7957
+		//adminUserInfo.CurrentAppId = 18
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9538
+		subscibe.OrgId = 7957
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9538
+		adminUserInfo.CurrentOrgId = 7957
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -3945,13 +3945,14 @@ func (c *DialysisApiController) CreateMonitor() {
 	blood_pressure_type, _ := c.GetInt64("blood_pressure_type", 0)
 	blood_flow_volume, _ := c.GetFloat("blood_flow_volume", 0)
 	venous_pressure, _ := c.GetFloat("venous_pressure", 0)
-	venous_pressure_unit := c.GetString("venous_pressure_unit")
+	venous_pressure_type, _ := c.GetInt64("venous_pressure_type", 1)
 	transmembrane_pressure, _ := c.GetFloat("transmembrane_pressure", 0)
-	transmembrane_pressure_unit := c.GetString("transmembrane_pressure_unit")
+	transmembrane_pressure_type, _ := c.GetInt64("transmembrane_pressure_type", 1)
 	ultrafiltration_rate, _ := c.GetFloat("ultrafiltration_rate", 0)
 	ultrafiltration_volume, _ := c.GetFloat("ultrafiltration_volume", 0)
 	sodium_concentration, _ := c.GetFloat("sodium_concentration", 0)
 	arterial_pressure, _ := c.GetFloat("arterial_pressure", 0)
+	arterial_pressure_type, _ := c.GetInt64("arterial_pressure_type", 1)
 	dialysate_temperature, _ := c.GetFloat("dialysate_temperature", 0)
 	temperature, _ := c.GetFloat("temperature", 0)
 	replacement_rate, _ := c.GetFloat("replacement_rate", 0)
@@ -3996,13 +3997,14 @@ func (c *DialysisApiController) CreateMonitor() {
 		BloodPressureType:         blood_pressure_type,
 		BloodFlowVolume:           blood_flow_volume,
 		VenousPressure:            venous_pressure,
-		VenousPressureUnit:        venous_pressure_unit,
+		VenousPressureType:        venous_pressure_type,
 		TransmembranePressure:     transmembrane_pressure,
-		TransmembranePressureUnit: transmembrane_pressure_unit,
+		TransmembranePressureType: transmembrane_pressure_type,
 		UltrafiltrationRate:       ultrafiltration_rate,
 		UltrafiltrationVolume:     ultrafiltration_volume,
 		SodiumConcentration:       sodium_concentration,
 		ArterialPressure:          arterial_pressure,
+		ArterialPressureType:      arterial_pressure_type,
 		DialysateTemperature:      dialysate_temperature,
 		Temperature:               temperature,
 		ReplacementRate:           replacement_rate,
@@ -4325,7 +4327,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	order, err := service.FindDialysisMacher(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	nurse, err := service.FindPunctureNurse(order.PunctureNurse, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
-	//fmt.Print("nurse------------", err)
+
 	startNuse, err := service.FindeStartNuse(order.StartNurse, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 	FinishNuse, err := service.FindeStartNuse(order.FinishNurse, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 	//获取透析处方
@@ -4336,7 +4338,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)
+
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	doctorAdevieInfo, err := service.FindDoctorAdviceByInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取上次的透后体重
@@ -4362,7 +4364,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//透析监测
 	Record, _ := service.FindAllMonitorRecord(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//透析检测
-	monitor, err := service.FindAllMonitor(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	//monitor, err := service.FindAllMonitor(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//透析小结
 	TreatmentSummary, _ := service.FindTreatmentSummaryById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
@@ -4404,7 +4406,6 @@ func (c *DialysisApiController) GetDialysisOrder() {
 		"total":                     total,
 		"startNuse":                 startNuse,
 		"DoctorName":                DoctorName,
-		"monitor":                   monitor,
 		"assessmentAfterDislysis":   assessmentAfterDislysis,
 		"predialysName":             predialysName,
 		"FinishNuse":                FinishNuse,

controllers/dialysis_record_api_controller.go

@@ -375,10 +375,13 @@ type EditMonitorParamObject struct {
 	BreathingRated           float64 `json:"breathing_rated"`
 	BloodFlowVolume          float64 `json:"blood_flow_volume"`
 	VenousPressure           float64 `json:"venous_pressure"`
+	VenousPressureType       int64 `json:"venous_pressure_type"`
 	TransmembranePressure    float64 `json:"transmembrane_pressure"`
+	TransmembranePressureType int64 `json:"transmembrane_pressure_type"`
 	UltrafiltrationVolume    float64 `json:"ultrafiltration_volume"`
 	UltrafiltrationRate      float64 `json:"ultrafiltration_rate"`
 	ArterialPressure         float64 `json:"arterial_pressure"`
+	ArterialPressureType     int64 `json:"arterial_pressure_type"`
 	SodiumConcentration      float64 `json:"sodium_concentration"`
 	DialysateTemperature     float64 `json:"dialysate_temperature"`
 	Temperature              float64 `json:"temperature"`
@@ -475,8 +478,11 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			DiastolicBloodPressure:   monitorParam.DiastolicBP,
 			BloodFlowVolume:          monitorParam.BloodFlowVolume,
 			VenousPressure:           monitorParam.VenousPressure,
+			VenousPressureType:       monitorParam.VenousPressureType,
 			ArterialPressure:         monitorParam.ArterialPressure,
+			ArterialPressureType:     monitorParam.ArterialPressureType,
 			TransmembranePressure:    monitorParam.TransmembranePressure,
+			TransmembranePressureType: monitorParam.TransmembranePressureType,
 			UltrafiltrationRate:      monitorParam.UltrafiltrationRate,
 			UltrafiltrationVolume:    monitorParam.UltrafiltrationVolume,
 			SodiumConcentration:      monitorParam.SodiumConcentration,
@@ -538,8 +544,11 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.DiastolicBloodPressure = monitorParam.DiastolicBP
 		monitor.BloodFlowVolume = monitorParam.BloodFlowVolume
 		monitor.VenousPressure = monitorParam.VenousPressure
+		monitor.VenousPressureType = monitorParam.VenousPressureType
 		monitor.ArterialPressure = monitorParam.ArterialPressure
+		monitor.ArterialPressureType = monitorParam.ArterialPressureType
 		monitor.TransmembranePressure = monitorParam.TransmembranePressure
+		monitor.TransmembranePressureType = monitorParam.TransmembranePressureType
 		monitor.UltrafiltrationRate = monitorParam.UltrafiltrationRate
 		monitor.UltrafiltrationVolume = monitorParam.UltrafiltrationVolume
 		monitor.SodiumConcentration = monitorParam.SodiumConcentration

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -67,10 +67,11 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	BPType, _ := this.GetInt("bp_type")
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
 	venousPressure, _ := this.GetFloat("venous_pressure")
-	venousPressureUnit := this.GetString("venous_pressure_unit")
+	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
-	transmembranePressure, _ := this.GetFloat("transmembrane_pressure")
-	transmembranePressureUnit := this.GetString("transmembrane_pressure_unit")
+	arterialPressureType, _ := this.GetInt64("arterial_pressure_type",1)
+	transmembranePressure, _ := this.GetFloat("transmembrane_pressure",0)
+	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -114,10 +115,11 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		BloodPressureType:         int64(BPType),
 		BloodFlowVolume:           bloodFlowVolume,
 		VenousPressure:            venousPressure,
-		VenousPressureUnit:        venousPressureUnit,
+		VenousPressureType:        venousPressureType,
 		ArterialPressure:          arterialPressure,
+		ArterialPressureType:      arterialPressureType,
 		TransmembranePressure:     transmembranePressure,
-		TransmembranePressureUnit: transmembranePressureUnit,
+		TransmembranePressureType: transmembranePressureType,
 		UltrafiltrationRate:       ultrafiltrationRate,
 		UltrafiltrationVolume:     ultrafiltrationVolume,
 		SodiumConcentration:       sodiumConcentration,
@@ -209,10 +211,11 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	BPType, _ := this.GetInt("bp_type")
 	bloodFlowVolume, _ := this.GetFloat("blood_flow_volume")
 	venousPressure, _ := this.GetFloat("venous_pressure")
-	venousPressureUnit := this.GetString("venous_pressure_unit")
+	venousPressureType,_ := this.GetInt64("venous_pressure_type",1)
 	arterialPressure, _ := this.GetFloat("arterial_pressure")
+	arterialPressureType, _ := this.GetInt64("arterial_pressure",1)
 	transmembranePressure, _ := this.GetFloat("transmembrane_pressure")
-	transmembranePressureUnit := this.GetString("transmembrane_pressure_unit")
+	transmembranePressureType,_ := this.GetInt64("transmembrane_pressure_type",1)
 	ultrafiltrationRate, _ := this.GetFloat("ultrafiltration_rate")
 	ultrafiltrationVolume, _ := this.GetFloat("ultrafiltration_volume")
 	sodiumConcentration, _ := this.GetFloat("sodium_concentration")
@@ -254,10 +257,11 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.BloodPressureType = int64(BPType)
 	monitor.BloodFlowVolume = bloodFlowVolume
 	monitor.VenousPressure = venousPressure
-	monitor.VenousPressureUnit = venousPressureUnit
+	monitor.VenousPressureType = venousPressureType
 	monitor.ArterialPressure = arterialPressure
+	monitor.ArterialPressureType = arterialPressureType
 	monitor.TransmembranePressure = transmembranePressure
-	monitor.TransmembranePressureUnit = transmembranePressureUnit
+	monitor.TransmembranePressureType = transmembranePressureType
 	monitor.UltrafiltrationRate = ultrafiltrationRate
 	monitor.UltrafiltrationVolume = ultrafiltrationVolume
 	monitor.SodiumConcentration = sodiumConcentration

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1040,27 +1040,33 @@ func (this *CommonApiController) GetSearchDetailCheck() {
 func (this *CommonApiController) GetNormData() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	//获取系统数据
-	normdata, _ := service.GetNormDataByOrgId(orgid)
-
-	if len(normdata) == 0 {
-		normdata, err := service.GetNormData(0)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"normdata": normdata,
-		})
-	} else {
-		normdata, err := service.GetNormDataByOrgId(orgid)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"normdata": normdata,
-		})
+	normdata, err := service.GetNormDataByOrgId(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
 	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"normdata": normdata,
+	})
+	//if len(normdata) == 0 {
+	//	normdata, err := service.GetNormData(0)
+	//	if err != nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"normdata": normdata,
+	//	})
+	//} else {
+	//	normdata, err := service.GetNormDataByOrgId(orgid)
+	//	if err != nil {
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"normdata": normdata,
+	//	})
+	//}
 
 }
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -8,6 +8,7 @@ import (
 	"crypto/md5"
 	"encoding/json"
 	"fmt"
+	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -2633,3 +2634,48 @@ func (this *NewDialysisApiController) GetNewPatientId() {
 		"patient": patients,
 	})
 }
+
+func (this *NewDialysisApiController) UpdateImage() {
+
+	adminUserInfo := this.GetMobileAdminUserInfo()
+
+	es, _ := service.GetPatinentHead(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
+
+	action := "update"
+	timeNow := time.Now().Unix()
+	if es == nil {
+		es = new(models.SgjUserAdminPatientHead)
+		es.Status = 1
+		es.UserOrgId = adminUserInfo.Org.Id
+		es.AppId = adminUserInfo.App.Id
+		es.Ctime = timeNow
+		es.Creator = adminUserInfo.AdminUser.Id
+		action = "create"
+	}
+	es.Mtime = timeNow
+
+	var esdata models.SgjUserAdminPatientHead
+	var err error
+	if err = json.Unmarshal(this.Ctx.Input.RequestBody, &esdata); err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	es.Hash = esdata.Hash
+	es.Url = beego.AppConfig.String("qiniu_domain") + esdata.Hash
+
+	if action == "create" {
+		err = service.CreateAdminUserHead(es)
+	} else {
+		err = service.SaveAdminUserHead(es)
+	}
+	if err != nil {
+		fmt.Println(err)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+		return
+	}
+	fmt.Println("esss-================", es)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"electronic_signature": es,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -155,4 +155,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getmobile", &NewDialysisApiController{}, "Get:GetMobile")
 	beego.Router("/m/api/patient/getorgs", &NewDialysisApiController{}, "Get:GetOrgs")
 	beego.Router("/m/api/patient/getnewpatientid", &NewDialysisApiController{}, "Get:GetNewPatientId")
+	beego.Router("/m/api/patient/updateimage", &NewDialysisApiController{}, "Post:UpdateImage")
 }

models/admin_user_models.go

@@ -71,6 +71,22 @@ func (AdminUserElectronicSignature) TableName() string {
 	return "sgj_user_admin_electronic_signature"
 }
 
+type SgjUserAdminPatientHead 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"`
+	AppId     int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	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"`
+	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"`
+}
+
+func (SgjUserAdminPatientHead) TableName() string {
+	return "sgj_user_admin_patient_head"
+}
+
 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"`

models/dialysis.go

@@ -634,10 +634,11 @@ type MonitoringRecord struct {
 	Pic                       string  `gorm:"column:pic" json:"pic"`
 	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
 	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	VenousPressureUnit        string  `gorm:"column:venous_pressure_unit" json:"venous_pressure_unit"`
+	VenousPressureType        int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
 	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
+	ArterialPressureType      int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
 	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
-	TransmembranePressureUnit string  `gorm:"column:transmembrane_pressure_unit" json:"transmembrane_pressure_unit"`
+	TransmembranePressureType int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
 	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
 	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
 	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`

models/patient_models.go

@@ -12,6 +12,7 @@ func (PatientListForFaceList) TableName() string {
 type PatientListForFace 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"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
 	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
 	DialysisNo  string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	IdCardNo    string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`

service/admin_service.go

@@ -299,6 +299,18 @@ func GetAdminUserElectronicSignature(orgID int64, appID int64, userID int64) (*m
 	return &es, nil
 }
 
+func GetPatinentHead(orgid int64, appid int64, userid int64) (*models.SgjUserAdminPatientHead, error) {
+	var es models.SgjUserAdminPatientHead
+	err := readUserDb.Model(&models.SgjUserAdminPatientHead{}).Where("org_id = ? and app_id = ? and creator=? and status =1", orgid, appid, userid).First(&es).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &es, nil
+}
+
 func CreateAdminUserElectronicSignature(es *models.AdminUserElectronicSignature) error {
 	err := writeUserDb.Create(es).Error
 	return err
@@ -309,6 +321,15 @@ func SaveAdminUserElectronicSignature(es *models.AdminUserElectronicSignature) e
 	return err
 }
 
+func CreateAdminUserHead(es *models.SgjUserAdminPatientHead) error {
+	err := writeUserDb.Create(es).Error
+	return err
+}
+func SaveAdminUserHead(es *models.SgjUserAdminPatientHead) error {
+	err := writeUserDb.Create(es).Error
+	return err
+}
+
 func GetAdminUserSpecialPermission(orgID int64, appID int64, adminUserID int64, permissionType models.SpecialPermissionType) (*models.AdminUserSpecialPermission, error) {
 	var record models.AdminUserSpecialPermission
 	err := readDb.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND admin_user_id = ? AND permission = ? AND status = 1", orgID, appID, adminUserID, permissionType).First(&record).Error

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -469,10 +469,11 @@ type MonitoringRecordVM struct {
 	BloodPressureType         int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
 	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
 	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	VenousPressureUnit        string  `gorm:"column:venous_pressure_unit" json:"venous_pressure_unit"`
+	VenousPressureType        int64  `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
 	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
+	ArterialPressureType      int64 `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
 	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
-	TransmembranePressureUnit string  `gorm:"column:transmembrane_pressure_unit" json:"transmembrane_pressure_unit"`
+	TransmembranePressureType int64  `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
 	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
 	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
 	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`

数据变更脚本.sql

@@ -84,8 +84,13 @@ INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_nam
 INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '13','4','dialysate_flow','透析液流量','1',NULL,NULL,'0');
 
 
-
-
+--2020-07-15 author 张保健 --
+--透中监测修改静脉压类型字段--
+ALTER TABLE `test_xt`.`xt_monitoring_record`     CHANGE `venous_pressure_unit` `venous_pressure_type` SMALLINT(2) DEFAULT '1' NOT NULL COMMENT '静脉压类型 1：mmHg 2：kpa';
+--透中监测增加动脉压类型字段--
+ALTER TABLE `test_xt`.`xt_monitoring_record`     ADD COLUMN `arterial_pressure_type` SMALLINT(2) DEFAULT '1' NULL COMMENT '动脉压类型：1：mmHg 2：kpa' AFTER `arterial_pressure`
+--透中监测修改跨膜压类型字段--
+ALTER TABLE `sgj_xt`.`xt_monitoring_record`     CHANGE `transmembrane_pressure_unit` `transmembrane_pressure_type` SMALLINT(2) DEFAULT '1' NOT NULL COMMENT '跨膜压类型 1：mmHg 2：kpa';