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

controllers/js/jsyb_controller.go

@@ -330,7 +330,6 @@ func (c *JSybController) PostSeven() {
 	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, verify_number)
-	fmt.Println(request_log)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/his_api_controller.go

@@ -5878,13 +5878,20 @@ func (c *HisApiController) GetPreUploadInfo() {
 						psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 						psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
 
+						bas := strings.Split(psn_info.CardInfo, "|")
+
+						if his.IdCardType == 1 {
+							cert_no = bas[2]
+						} else {
+							cert_no = bas[1]
+						}
 						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
+							"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
 						resp, requestErr := http.Get(api)
 						if requestErr != nil {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)