Merge branch 'master' of http://git.shengws.com/csx/XT_New

conf/app.conf

@@ -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

@@ -69,32 +69,32 @@ func (this *BaseAuthAPIController) Prepare() {
 		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)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		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)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
@@ -316,35 +316,35 @@ 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)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		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)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

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)

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/mobile_api_controllers/dialysis_api_controller.go

@@ -816,17 +816,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,

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/patient_api_controller.go

@@ -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 {

models/dialysis.go

@@ -642,6 +642,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 {

service/dialysis_service.go

@@ -780,7 +780,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/patient_service.go

@@ -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
 	}
@@ -996,14 +996,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

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -489,6 +489,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 {