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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10217
+org_id = 10318
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -72,7 +72,7 @@ gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 # gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"
 #广州
-# gdyb_paasid = "gdyb_inf"
+gdyb_paasid = "gdyb_inf"
 
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com

controllers/sg/his_api_controller.go

@@ -90,8 +90,7 @@ func (c *HisApiController) Get9001() {
 	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, 185)
-	result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
-
+	result, inputLog := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -105,7 +104,24 @@ func (c *HisApiController) Get9001() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-
+	if res.Infcode == 0 {
+		sign := models.HisSignIn{
+			UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
+			SignNo:    res.Output.Result.SignNo,
+			SignTime:  res.Output.Result.SignTime,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+			Status:    1,
+			InputLog:  inputLog,
+			OutputLog: result,
+		}
+		err := service.CreateSignIn(&sign)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "签到成功",
+			})
+		}
+	}
 }
 func (c *HisApiController) Check3101() {
 	patient_id, _ := c.GetInt64("patient_id")

main.go

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

models/his_models.go

@@ -1429,3 +1429,19 @@ type HisPrescriptionProjectTen struct {
 func (HisPrescriptionProjectTen) TableName() string {
 	return "his_prescription_project"
 }
+
+type HisSignIn struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	SignNo    string `gorm:"column:sign_no" json:"sign_no" form:"sign_no"`
+	Ctime     int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+	SignTime  string `gorm:"column:sign_time" json:"sign_time" form:"sign_time"`
+	InputLog  string `gorm:"column:input_log" json:"input_log" form:"input_log"`
+	OutputLog string `gorm:"column:output_log" json:"output_log" form:"output_log"`
+}
+
+func (HisSignIn) TableName() string {
+	return "his_sign_in"
+}

models/yb_models.go

@@ -47,9 +47,10 @@ type Result9001 struct {
 	InfRefmsgid string `json:"inf_refmsgid"`
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
-		Signinoutb struct {
-			SignNo string `json:"sign_no"`
-		} `json:"signinoutb"`
+		Result struct {
+			SignNo   string `json:"sign_no"`
+			SignTime string `json:"sign_time"`
+		} `json:"result"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`

service/gdyb_service.go

@@ -8,6 +8,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
+	"strings"
+
 	//"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/go-ole/go-ole"
@@ -4439,14 +4441,14 @@ func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	hour := time.Now().Format("15")
 	min := time.Now().Format("04")
 	sec := time.Now().Format("05")
-
-	inputData["currenttime"] = year + month + day + hour + min + sec
+	custom_time := year + month + day + hour + min + sec
+	inputData["currenttime"] = custom_time
 	var psd string
-	psd = year + month + day + hour + min + sec + "Gzyb$867"
+	psd = custom_time + "Gzyb$867"
 	h := md5.New()
 	h.Write([]byte(psd))
-	inputData["password"] = hex.EncodeToString(h.Sum(nil))
-	input["signIn"] = inputData
+	inputData["password"] = strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
+	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
@@ -4479,6 +4481,7 @@ func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	} else {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -4491,6 +4494,11 @@ func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
 		request.Header.Set("x-tif-nonce", nonce)
 
+		fmt.Println(string(bytesData))
+		fmt.Println(gdyb_url)
+		fmt.Println(gdyb_paasid)
+		fmt.Println(request.Header)
+
 		client := http.Client{}
 		resp, err := client.Do(request)
 		if err != nil {
@@ -4745,3 +4753,8 @@ func Gdyb5302(psnNo string, org_name string, doctor string, fixmedins_code strin
 	fmt.Println(str)
 	return str
 }
+
+func CreateSignIn(record *models.HisSignIn) (err error) {
+	err = writeDb.Save(&record).Error
+	return
+}