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

controllers/sg/gdyb_controller.go

@@ -79,8 +79,9 @@ func (c *GdybController) PostOne() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	card_sn := c.GetString("card_sn")
 	certificates := c.GetString("certificates")
+	psn_name := c.GetString("name")
 
-	result, inputLog := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates)
+	result, inputLog := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates, psn_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {

controllers/sg/his_api_controller.go

@@ -2605,7 +2605,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			idetinfoStr = psn_info.Idetinfo
 
 		} else {
-			result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10))
+			result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
 			saveLog(result, requestLog, "1101", "人员基本信息获取")
 			if err := json.Unmarshal([]byte(result), &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)

service/gdyb_service.go

@@ -159,7 +159,7 @@ func Gdyb1201(certNo string, org_name string, doctor string, fixmedins_code stri
 }
 
 // 人员基本信息
-func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string) (string, string) {
+func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, psn_name string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -192,7 +192,7 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["begntime"] = ""          // 开始时间
-	inputData["psn_name"] = ""          // 人员姓名
+	inputData["psn_name"] = psn_name    // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入