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

controllers/sg/his_api_controller.go

@@ -1939,16 +1939,53 @@ func (c *HisApiController) GetRegisterInfo() {
 				IdCardNo = patient.IdCardNo
 			}
 
+			//var insutypes []string
+			//
+			//var insutype string
+			//var is390 int = 0
+			//var is310 int = 0
+			//for _, item := range res.Output.Iinfo {
+			//	if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+			//		insutypes = append(insutypes, item.Insutype)
+			//	}
+			//}
+			//if len(insutypes) == 1 {
+			//	insutype = insutypes[0]
+			//} else {
+			//	for _, i := range insutypes {
+			//		if i == "390" {
+			//			is390 = 1
+			//		}
+			//
+			//		if i == "310" {
+			//			is310 = 1
+			//		}
+			//	}
+			//}
+			//if is390 == 1 {
+			//	insutype = "390"
+			//}
+			//if is310 == 1 {
+			//	insutype = "310"
+			//}
+			//
+			//if len(insutypes) == 0 {
+			//	insutype = "310"
+			//}
+
+			var rf []*ResultFive
+			json.Unmarshal([]byte(his.Iinfo), &rf)
 			var insutypes []string
-
 			var insutype string
 			var is390 int = 0
 			var is310 int = 0
-			for _, item := range res.Output.Iinfo {
+
+			for _, item := range rf {
 				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
 					insutypes = append(insutypes, item.Insutype)
 				}
 			}
+
 			if len(insutypes) == 1 {
 				insutype = insutypes[0]
 			} else {
@@ -1965,6 +2002,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			if is390 == 1 {
 				insutype = "390"
 			}
+
 			if is310 == 1 {
 				insutype = "310"
 			}

main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -14,7 +15,7 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
+	service.ConnectDB()
 	//org_id, _ := beego.AppConfig.Int64("org_id")
 	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 	//CreateLog(miConfig)