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

controllers/sg/his_api_controller.go

@@ -6424,7 +6424,12 @@ func (c *HisApiController) GetUploadInfo() {
 							res.Infcode = infocode
 
 						} else if miConfig.MdtrtareaAdmvs == "350500" {
-
+							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+							var cert_no string
+							if his.IdCardType == 1 {
+								cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+							}
+							fmt.Println(cert_no)
 							result2, src_resquest = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 
 							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
@@ -6863,6 +6868,13 @@ func (c *HisApiController) GetUploadInfo() {
 				res.Infcode = infocode
 
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
+				psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+				var cert_no string
+				if his.IdCardType == 1 {
+					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+				}
+				fmt.Println(cert_no)
+
 				result2, src_resquest = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {

service/fj_service.go

@@ -576,8 +576,8 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
-			inputData["mdtrt_cert_type"] = "" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = ""   // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号