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

controllers/nm/nm_controller.go

@@ -732,9 +732,9 @@ func (c *NmController) GetELeInfo(code string, operator_id string, operator_name
 	input["transType"] = "ec.query"
 
 	bytesData, _ := json.Marshal(input)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
+	//gdyb_url := beego.AppConfig.String("gdyb_url")
 
-	url := gdyb_url + "/localcfc/api/hsecfc/localQrCodeQuery"
+	url := "http://10.38.23.105:8090" + "/localcfc/api/hsecfc/localQrCodeQuery"
 	ret2, _, _ := readCard.Call(StrPtr(url), StrPtr(string(bytesData)), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
 	fmt.Println(ret2)
 	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))

controllers/zh/zh_his_api_controller.go

@@ -683,11 +683,21 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 
 	if miConfig.MdtrtareaAdmvs == "150499" {
 		if id_card_type == 1 {
+			mdtrt_cert_no := ""
+			card_sn := ""
+
+			if record.IdCardType == 1 {
+				bas := strings.Split(psn_info.CardInfo, "|")
+				cardNumber := bas[2]
+				mdtrt_cert_no = cardNumber
+				card_sn = bas[3]
+			} else {
+				mdtrt_cert_no = record.Certno
+			}
 			//请求内网数据
-			api := "http://172.16.13.254:9532/" + "nmyb/1101?cert_no=" + patient.IdCardNo +
+			api := "http://172.16.13.254:9532/" + "nmyb/1101?cert_no=" + mdtrt_cert_no +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + role.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) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(certificates, 10) + "&name=" + patient.Name
-
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&card_sn=" + card_sn + "&certificates=" + strconv.FormatInt(certificates, 10) + "&name=" + patient.Name
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -872,8 +882,18 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		var struct2401 service.Struct2401
 		struct2401.PsnNo = res2.Output.Baseinfo.PsnNo
 		struct2401.Insutype = insutype
-		struct2401.MdtrtCertType = "02"
-		struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
+		psn_info, _ := service.GetPsnByPatientId(patient.ID)
+
+		if id_card_type == 1 {
+			struct2401.MdtrtCertType = "03"
+			bas := strings.Split(psn_info.CardInfo, "|")
+			cardNumber := bas[2]
+			struct2401.MdtrtCertNo = cardNumber
+		} else {
+			struct2401.MdtrtCertType = "02"
+			struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
+		}
+
 		if miConfig.Code == "H15049901371" {
 			if med_type == 14 {
 				if insutype == "390" {
@@ -942,6 +962,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 			data["secret_key"] = miConfig.SecretKey
 			data["struct_2401"] = struct2401
+
 			var req *http.Request
 			bytesData, _ := json.Marshal(data)
 			req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"nmyb/2401", bytes.NewReader(bytesData))
@@ -1365,11 +1386,21 @@ func (c *ZHHisApiController) GetSettleInfo() {
 	}
 
 	if miConfig.MdtrtareaAdmvs == "150499" {
+		psn_info, _ := service.GetPsnByPatientId(patient_id)
+		mdtrt_cert_no := ""
+		if record.IdCardType == 1 {
+			bas := strings.Split(psn_info.CardInfo, "|")
+			cardNumber := bas[2]
+			mdtrt_cert_no = cardNumber
+
+		} else {
+			mdtrt_cert_no = record.Certno
+		}
 		//请求内网数据
 		api := "http://172.16.13.254:9532/" + "nmyb/2304?psn_no=" + record.PsnNo + "&mdtrt_id=" + record.Number + "&chrg_bchno=" + chrg_bchno +
 			"&insutype_type=" + record.InsutypeType + "&total=" + allTotal +
 			"&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(record.IdCardType, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(record.Certificates, 10) + "&name=" + record.Name + "&cert_no=" + record.IdCardNo
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(record.IdCardType, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(record.Certificates, 10) + "&name=" + record.Name + "&cert_no=" + mdtrt_cert_no
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1395,10 +1426,9 @@ func (c *ZHHisApiController) GetSettleInfo() {
 		result = string(result_byte)
 
 	} else {
+
 		result, src_resquest = service.ZHGdyb2304(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
-		//saveLog()
 		saveLog(result, src_resquest, "2304", "住院结算")
-
 	}
 
 	var dat map[string]interface{}
@@ -1570,7 +1600,13 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
 	//	return
 	//}
+	psn_info, _ := service.GetPsnByPatientId(patient_id)
+
 	if record.IdCardType == 1 {
+		bas := strings.Split(psn_info.CardInfo, "|")
+		cardNumber := bas[2]
+		cert_no = cardNumber
+
 	} else {
 		cert_no = record.Certno
 	}
@@ -1582,7 +1618,7 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		api := "http://172.16.13.254:9532/" + "nmyb/2303?psn_no=" + record.PsnNo + "&mdtrt_id=" + record.Number + "&chrg_bchno=" + chrg_bchno +
 			"&insutype_type=" + record.InsutypeType + "&total=" + allTotal +
 			"&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(record.IdCardType, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(record.Certificates, 10) + "&name=" + record.Name + "&cert_no=" + record.IdCardNo
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(record.IdCardType, 10) + "&card_sn=" + "" + "&certificates=" + strconv.FormatInt(record.Certificates, 10) + "&name=" + record.Name + "&cert_no=" + cert_no
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/zh_his_service.go

@@ -151,11 +151,11 @@ func ZHGdyb2401(struct2401 Struct2401, secret_key string, org_name string, fixme
 	inputData["insutype"] = struct2401.Insutype // 险种类型（来自1101接口返回）
 	inputData["tel"] = ""
 	inputData["coner_name"] = ""
-	inputData["begntime"] = struct2401.Begntime         // 开始时间
-	inputData["mdtrt_cert_type"] = "02"                 // 就诊凭证类型
-	inputData["mdtrt_cert_no"] = struct2401.MdtrtCertNo // 就诊凭证编号
-	inputData["med_type"] = struct2401.MedType          // 就诊凭证编号
-	inputData["ipt_no"] = struct2401.IptNo              // 住院/门诊号
+	inputData["begntime"] = struct2401.Begntime             // 开始时间
+	inputData["mdtrt_cert_type"] = struct2401.MdtrtCertType // 就诊凭证类型
+	inputData["mdtrt_cert_no"] = struct2401.MdtrtCertNo     // 就诊凭证编号
+	inputData["med_type"] = struct2401.MedType              // 就诊凭证编号
+	inputData["ipt_no"] = struct2401.IptNo                  // 住院/门诊号
 	inputData["medrcdno"] = ""
 	inputData["atddr_no"] = struct2401.AtddrNo
 	inputData["chfpdr_name"] = struct2401.ChfpdrName