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

controllers/base_api_controller.go

@@ -77,7 +77,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		//userAdmin.ModifyTime = 1530786071
 		//var subscibe models.ServeSubscibe
 		//subscibe.ID = 1
-		//subscibe.OrgId = 9538
+		//subscibe.OrgId = 12
 		//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 = 9538
+		//adminUserInfo.CurrentOrgId = 12
 		//adminUserInfo.CurrentAppId = 18
 		//adminUserInfo.AdminUser = &userAdmin
 		//adminUserInfo.Subscibes = subscibes
@@ -316,7 +316,7 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//	var userAdmin models.AdminUser
+		//var userAdmin models.AdminUser
 		//userAdmin.Id = 400
 		//userAdmin.Mobile = "13535547901"
 		//userAdmin.Id = 597
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		//userAdmin.ModifyTime = 1530786071
 		//var subscibe models.ServeSubscibe
 		//subscibe.ID = 1
-		//subscibe.OrgId = 9538
+		//subscibe.OrgId = 12
 		//subscibe.PeriodStart = 1538035409
 		//subscibe.PeriodEnd = 1569571409
 		//subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		//subscibes[4] = &subscibe
 		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 9538
+		//adminUserInfo.CurrentOrgId = 12
 		//adminUserInfo.CurrentAppId = 18
 		//adminUserInfo.AdminUser = &userAdmin
 		//adminUserInfo.Subscibes = subscibes

service/patient_service.go

@@ -1217,18 +1217,20 @@ func CreateExportPatient(patient *models.Patients, contagions []int64, org_creat
 		return
 	}
 
-	var dryWeight models.SgjPatientDryweight
-	dryWeight.PatientId = patient.ID
-	dryWeight.UserOrgId = patient.UserOrgId
-	dryWeight.Status = 1
-	dryWeight.AdjustedValue = "/"
-	dryWeight.Creator = org_creator
-	dryWeight.UserId = org_creator
-	dryWeight.Ctime = time.Now().Unix()
-	dryWeight.Mtime = time.Now().Unix()
-	dryWeight.DryWeight = patient.DryWeight
-	dryWeight.Remakes = ""
-	err = utx.Create(&dryWeight).Error
+	if patient.DryWeight > 0 {
+		var dryWeight models.SgjPatientDryweight
+		dryWeight.PatientId = patient.ID
+		dryWeight.UserOrgId = patient.UserOrgId
+		dryWeight.Status = 1
+		dryWeight.AdjustedValue = "/"
+		dryWeight.Creator = org_creator
+		dryWeight.UserId = org_creator
+		dryWeight.Ctime = time.Now().Unix()
+		dryWeight.Mtime = time.Now().Unix()
+		dryWeight.DryWeight = patient.DryWeight
+		dryWeight.Remakes = ""
+		err = utx.Create(&dryWeight).Error
+	}
 
 	var lapseto models.PatientLapseto
 	lapseto.PatientId = patient.ID