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

controllers/sg/his_api_controller.go

@@ -5335,7 +5335,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 			//count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
 			department, _ := service.GetDepartMentDetail(department)
-			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
+			//doctor_id := strconv.FormatInt(patientPrescription., 10)
 
 			IdCardNo := ""
 			if id_card_type == 1 {
@@ -5468,12 +5468,12 @@ func (c *HisApiController) GetRegisterInfo() {
 
 					api = "http://192.168.2.110:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
 						"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
-						"&insuplc_admdvs=" + insuplc_admdvs_temp + "&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.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+						"&insuplc_admdvs=" + insuplc_admdvs_temp + "&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_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
 				} else {
 					api = "http://192.168.5.251:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + cert_no + "&ipt_otp_no=" + ipt_otp_no +
 						"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&doctor_name=" + doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
-						"&insuplc_admdvs=" + insuplc_admdvs_temp + "&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.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+						"&insuplc_admdvs=" + insuplc_admdvs_temp + "&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_info.DoctorNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
 
 				}
 
@@ -5527,7 +5527,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 				}
 				fmt.Println(cert_no)
-				result, requestLog, _ := service.FJyb2201(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, cert_no)
+				result, requestLog, _ := service.FJyb2201(psn_info.PsnNo, insutype, IdCardNo, miConfig.OrgName, doctor_info.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, roles.UserName, doctor_info.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, cert_no)
 				saveLog(result, requestLog, "2201", "挂号")
 				if miConfig.Code == "H15049901371" {
 
@@ -5549,7 +5549,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
 				psn_info, _ := service.GetPsnByPatientId(id)
-				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
+				result, requestLog := service.Gdyb2201A(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
 				saveLog(result, requestLog, "2201A", "挂号")
 				if miConfig.Code == "H15049901371" {
 
@@ -5853,7 +5853,8 @@ func (c *HisApiController) GetUploadInfo() {
 			data["department"] = department.Name
 			data["org_name"] = miConfig.OrgName
 			data["med_type"] = strconv.FormatInt(reg_type, 10)
-			data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
+			data["doctor_id"] = doctor_info.DoctorNumber
+			data["new_doctor_name"] = doctor_info.UserName
 			data["fixmedins_code"] = miConfig.Code
 			data["insuplc_admdvs"] = his.InsuplcAdmdvs
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs

service/jsyb_service.go

@@ -330,6 +330,7 @@ func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	inputData["psn_no"] = psnNo          // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_id"] = mdtrtId      // 就诊 ID（来自2201接口返回）
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
+	inputData["exp_content"] = ""        // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -389,6 +390,7 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		diseinfo_sun["vali_flag"] = "1"              // 有效标志
 		diseinfo = append(diseinfo, diseinfo_sun)
 	}
+	inputData["exp_content"] = "" // 人员编号 （来自1101接口返回）
 
 	input["diseinfo"] = diseinfo
 	input["mdtrtinfo"] = inputData
@@ -639,7 +641,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
 		subfeedetailInfo["tcmherb_prov_code"] = item.ProvinceDrugMedListCodg
 		subfeedetailInfo["mcs_prov_code"] = item.ProvinceGoodMedListCodg
-		feedetailInfo["expContent"] = subfeedetailInfo
+		feedetailInfo["exp_content"] = subfeedetailInfo
 		feedetail = append(feedetail, feedetailInfo)
 	}
 
@@ -674,7 +676,9 @@ func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 
 	inputData["mdtrt_id"] = mdtrtId  // 就诊 ID（来自2201接口返回）
 	inputData["chrg_bchno"] = "0000" // 收费批次号(来自2204生成的)
-	inputData["psn_no"] = psnNo      // 人员编号 （来自1101接口返回）
+
+	inputData["psn_no"] = psnNo   // 人员编号 （来自1101接口返回）
+	inputData["exp_content"] = "" // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -739,6 +743,7 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype    // 险种类型
 	inputData["invono"] = ""            // 发票号
+	inputData["exp_content"] = ""       // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -812,6 +817,7 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
 	inputData["preselfpay_amt"] = preselfpay_amt       //
 	inputData["inscp_scp_amt"] = inscp_scp_amt         //
+	inputData["exp_content"] = ""                      // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -902,6 +908,7 @@ func Jsyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
 	inputData["setl_id"] = setlId   // 结算 ID
+	inputData["exp_content"] = ""   // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入