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

controllers/js/jsyb_controller.go

@@ -317,11 +317,12 @@ func (c *JSybController) PostSeven() {
 	med_type := c.GetString("med_type")
 	id_card_type, _ := c.GetInt64("id_card_type")
 	certificates, _ := c.GetInt64("certificates")
+	verify_number := c.GetString("verify_number")
 
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 
-	result, request_log := service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak)
+	result, request_log := service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak, verify_number)
 	fmt.Println(request_log)
 
 	var dat map[string]interface{}
@@ -368,8 +369,9 @@ func (c *JSybController) PostEight() {
 
 	url := c.GetString("url")
 	ak := c.GetString("ak")
+	verify_number := c.GetString("verify_number")
 
-	result, request_log := service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak)
+	result, request_log := service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -3008,7 +3008,7 @@ func (c *HisApiController) GetRegisterInfo() {
 		var idetinfoStr string
 		var infocode int64
 		var verify_number string
-
+		fmt.Println(verify_number)
 		if miConfig.MdtrtareaAdmvs == "421300" {
 			psn_info, _ := service.GetPsnByPatientId(id)
 			PsnNo = psn_info.PsnNo
@@ -3226,7 +3226,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			} else if miConfig.MdtrtareaAdmvs == "320921" {
 				api := "http://192.168.3.111:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number" + verify_number
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + verify_number
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -4114,13 +4114,15 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 
 						} else if miConfig.MdtrtareaAdmvs == "320921" {
+							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+
 							api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 								"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
 
 							resp, requestErr := http.Get(api)
 							if requestErr != nil {
@@ -4463,13 +4465,15 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 
 			} else if miConfig.MdtrtareaAdmvs == "320921" {
+				psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+
 				api := "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 					his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 					"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 					"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 					"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+					"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
 
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
@@ -5813,6 +5817,44 @@ func (c *HisApiController) GetPreUploadInfo() {
 							return
 						}
 
+					} else if miConfig.MdtrtareaAdmvs == "320921" {
+						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+						api := "http://192.168.3.111:9532/" + "jsyb/2206?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+							his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
+							"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
+							"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+							"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
+							"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
+							"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber
+						resp, requestErr := http.Get(api)
+						if requestErr != nil {
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
+						body, ioErr := ioutil.ReadAll(resp.Body)
+						if ioErr != nil {
+							utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						var respJSON map[string]interface{}
+						if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
+						respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+						result, _ := json.Marshal(respJSON)
+						fmt.Println("log")
+						fmt.Println(string(result))
+						if err := json.Unmarshal([]byte(result), &res); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
 					} else {
 
 						var result string

service/jsyb_service.go

@@ -504,7 +504,7 @@ func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 }
 
 //  门诊预结算
-func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, request_url string, access_key string) (string, string) {
+func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, request_url string, access_key string, verify_number string) (string, string) {
 
 	// 生成签名
 	timestamp := time.Now().Unix()
@@ -515,15 +515,15 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputMessage["infno"] = "2206" // 交易编码
 	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
 	if certificates == 3 {
-		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "99"                       // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
-			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 		} else {
-			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 		}
 	}
 	if insuplc_admdvs == "421300" {
@@ -563,7 +563,7 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string) (string, string) {
+func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string, verify_number string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 
@@ -574,15 +574,15 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputMessage["infno"] = "2207" // 交易编码
 	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
 	if certificates == 3 {
-		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "99"                       // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
-			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 		} else {
-			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 		}
 	}
 	if med_type == "1111" || med_type == "1112" {