Browse Source

患者检验检查统计开发

XMLWAN 4 years ago
parent
commit
dd9aeecc9f

+ 4 - 4
controllers/base_api_controller.go View File

79
 		userAdmin.ModifyTime = 1530786071
79
 		userAdmin.ModifyTime = 1530786071
80
 		var subscibe models.ServeSubscibe
80
 		var subscibe models.ServeSubscibe
81
 		subscibe.ID = 1
81
 		subscibe.ID = 1
82
-		subscibe.OrgId = 7957
82
+		subscibe.OrgId = 9841
83
 		subscibe.PeriodStart = 1538035409
83
 		subscibe.PeriodStart = 1538035409
84
 		subscibe.PeriodEnd = 1569571409
84
 		subscibe.PeriodEnd = 1569571409
85
 		subscibe.State = 1
85
 		subscibe.State = 1
89
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
89
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
90
 		subscibes[4] = &subscibe
90
 		subscibes[4] = &subscibe
91
 		var adminUserInfo service.AdminUserInfo
91
 		var adminUserInfo service.AdminUserInfo
92
-		adminUserInfo.CurrentOrgId = 7957
92
+		adminUserInfo.CurrentOrgId = 9841
93
 		adminUserInfo.CurrentAppId = 18
93
 		adminUserInfo.CurrentAppId = 18
94
 		adminUserInfo.AdminUser = &userAdmin
94
 		adminUserInfo.AdminUser = &userAdmin
95
 		adminUserInfo.Subscibes = subscibes
95
 		adminUserInfo.Subscibes = subscibes
329
 		userAdmin.ModifyTime = 1530786071
329
 		userAdmin.ModifyTime = 1530786071
330
 		var subscibe models.ServeSubscibe
330
 		var subscibe models.ServeSubscibe
331
 		subscibe.ID = 1
331
 		subscibe.ID = 1
332
-		subscibe.OrgId = 7957
332
+		subscibe.OrgId = 9841
333
 		subscibe.PeriodStart = 1538035409
333
 		subscibe.PeriodStart = 1538035409
334
 		subscibe.PeriodEnd = 1569571409
334
 		subscibe.PeriodEnd = 1569571409
335
 		subscibe.State = 1
335
 		subscibe.State = 1
339
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
339
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
340
 		subscibes[4] = &subscibe
340
 		subscibes[4] = &subscibe
341
 		var adminUserInfo service.AdminUserInfo
341
 		var adminUserInfo service.AdminUserInfo
342
-		adminUserInfo.CurrentOrgId = 7957
342
+		adminUserInfo.CurrentOrgId = 9841
343
 		adminUserInfo.CurrentAppId = 18
343
 		adminUserInfo.CurrentAppId = 18
344
 		adminUserInfo.AdminUser = &userAdmin
344
 		adminUserInfo.AdminUser = &userAdmin
345
 		adminUserInfo.Subscibes = subscibes
345
 		adminUserInfo.Subscibes = subscibes

+ 2 - 1
controllers/mobile_api_controllers/login_api_controller.go View File

30
 	}
30
 	}
31
 	ip := utils.GetIP(this.Ctx.Request)
31
 	ip := utils.GetIP(this.Ctx.Request)
32
 
32
 
33
-	ssoDomain := beego.AppConfig.String("sso_domain")
33
+	//ssoDomain := beego.AppConfig.String("sso_domain")
34
+	ssoDomain := "http://localhost:8091"
34
 	api := ssoDomain + "/m/login/pwd"
35
 	api := ssoDomain + "/m/login/pwd"
35
 	values := make(url.Values)
36
 	values := make(url.Values)
36
 	values.Set("mobile", mobile)
37
 	values.Set("mobile", mobile)

+ 0 - 1
controllers/new_mobile_api_controllers/common_api_controller.go View File

200
 		Sort:            sort,
200
 		Sort:            sort,
201
 	}
201
 	}
202
 	err = service.UpdarteConfiguration(&standard, id)
202
 	err = service.UpdarteConfiguration(&standard, id)
203
-	fmt.Println("爆粗========================================", err)
204
 	if err != nil {
203
 	if err != nil {
205
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
204
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
206
 		return
205
 		return

+ 1 - 1
service/common_service.go View File

285
   WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '2'
285
   WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '2'
286
   WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '3'
286
   WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '3'
287
   WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
287
   WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
288
-  END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1)a GROUP BY nnd`, orgID).Scan(&counts)
288
+  END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1 and p.first_dialysis_date <> 0)a GROUP BY nnd`, orgID).Scan(&counts)
289
 	return
289
 	return
290
 
290
 
291
 }
291
 }