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

controllers/sg/his_api_controller.go

@@ -11654,7 +11654,7 @@ func (c *HisApiController) GetAllopatry() {
 		return
 	}
 
-	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res.Output.Signinoutb.SignNo)
+	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, "")
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
 		fmt.Println(dat)
@@ -11702,7 +11702,7 @@ func (c *HisApiController) ComfirmAllopatry() {
 		return
 	}
 
-	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res.Output.Signinoutb.SignNo)
+	result2, _ := service.Gdyb3260(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, "")
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
 		fmt.Println(dat)

service/redis.go

@@ -1,20 +1,13 @@
 package service
 
-import (
-	"fmt"
-
-	"github.com/astaxie/beego"
-	"github.com/go-redis/redis"
-)
-
-func RedisClient() *redis.Client {
-	address := fmt.Sprintf("%s:%s", beego.AppConfig.String("redishost"), beego.AppConfig.String("redisport"))
-	client := redis.NewClient(&redis.Options{
-		Addr:     address,
-		Password: beego.AppConfig.String("redispasswrod"), // no password set
-		DB:       0,                                       // use default DB
-	})
-	pong, err := client.Ping().Result()
-	fmt.Println(pong, err)
-	return client
-}
+//func RedisClient() *redis.Client {
+//	address := fmt.Sprintf("%s:%s", beego.AppConfig.String("redishost"), beego.AppConfig.String("redisport"))
+//	client := redis.NewClient(&redis.Options{
+//		Addr:     address,
+//		Password: beego.AppConfig.String("redispasswrod"), // no password set
+//		DB:       0,                                       // use default DB
+//	})
+//	pong, err := client.Ping().Result()
+//	fmt.Println(pong, err)
+//	return client
+//}