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

controllers/sg/his_api_controller.go

@@ -3299,7 +3299,7 @@ func (c *HisApiController) GetBatchSettleList() {
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 		admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
-		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2495)
+		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2273)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 

main.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"context"
+	"gdyb/service"
+
 	//"context"
 	"fmt"
 	"gdyb/models"
@@ -29,14 +31,14 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 }
 func main() {
 	beego.Run()