患者检验检查统计开发

controllers/base_api_controller.go

@@ -79,7 +79,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 7957
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -89,7 +89,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 7957
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 7957
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 7957
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/login_api_controller.go

@@ -30,7 +30,8 @@ func (this *LoginAPIController) LoginByPwd() {
 	}
 	ip := utils.GetIP(this.Ctx.Request)
 
-	ssoDomain := beego.AppConfig.String("sso_domain")
+	//ssoDomain := beego.AppConfig.String("sso_domain")
+	ssoDomain := "http://localhost:8091"
 	api := ssoDomain + "/m/login/pwd"
 	values := make(url.Values)
 	values.Set("mobile", mobile)

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -200,7 +200,6 @@ func (this *CommonApiController) UpdateConfiguration() {
 		Sort:            sort,
 	}
 	err = service.UpdarteConfiguration(&standard, id)
-	fmt.Println("爆粗========================================", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

service/common_service.go

@@ -285,7 +285,7 @@ func GetDialysisAgeData(orgID int64) (counts []*models.DialysisAgePieDataStruct,
   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'
   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'
   WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
-  END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1)a GROUP BY nnd`, orgID).Scan(&counts)
+  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)
 	return
 
 }