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

controllers/sg/his_api_controller.go

@@ -4531,7 +4531,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			var result string
 			var requestLog string
 			if miConfig.UserOrgId == 10138 {
-				result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name)
+				result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
 			} 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), name)
 			}

service/gdyb_service.go

@@ -4412,7 +4412,7 @@ func GetMac() string {
 }
 
 // 人员基本信息
-func Gdyb1101D(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) {
+func Gdyb1101D(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, record_date string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -4453,7 +4453,7 @@ func Gdyb1101D(certNo string, org_name string, doctor string, fixmedins_code str
 	}
 
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-	inputData["begntime"] = ""          // 开始时间
+	inputData["begntime"] = record_date // 开始时间
 	inputData["psn_name"] = psn_name    // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入