111

conf/app.conf

@@ -51,9 +51,9 @@ sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-org_id = 10106
-gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
-gdyb_paasid = "sztest_hosp"
+org_id = 10215
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+gdyb_paasid = "sg02_prd"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/sg/his_api_controller.go

@@ -111,12 +111,14 @@ func (c *HisApiController) Get2505() {
 
 func (c *HisApiController) Get4201A() {
 	order_id, _ := c.GetInt64("order_id")
+	order_id = 172977
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	admin_user_id = 3432
 	order, _ := service.GetHisOrderByIDTwo(order_id)
 	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	order_info, _ := service.GetHisOrderInfoByNumber(order.MdtrtId)
 	order_info_two, _ := service.GetHisOrderInfoByNumberTwo(order.MdtrtId)
-	order_info = append(order_info, order_info_two...)
+	//order_info = append(order_info, order_info_two...)
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	department, _ := service.GetDepartMentDetail(his.Departments)
@@ -130,11 +132,12 @@ func (c *HisApiController) Get4201A() {
 	var struct4201A models.Struct4201A
 	var fsiOPFLDs []models.FsiOwnpayPatnFeeListDDTO
 	for _, items := range order_info {
+		memo := make(map[string]interface{})
+
 		var fsiOPFLD models.FsiOwnpayPatnFeeListDDTO
 		fsiOPFLD.FixmedinsMdtrtID = items.OrderNumber
 		fsiOPFLD.MedType = "14"
 		fsiOPFLD.BkkpSn = items.OrderNumber
-		fsiOPFLD.FeeOcurTime = time.Unix(items.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
 		fsiOPFLD.FixmedinsCode = miConfig.Code
 		fsiOPFLD.FixmedinsName = miConfig.OrgName
 		fsiOPFLD.Cnt = fmt.Sprintf("%.2f", items.Cnt)
@@ -142,38 +145,262 @@ func (c *HisApiController) Get4201A() {
 		fsiOPFLD.DetItemFeeSumamt = fmt.Sprintf("%.2f", items.DetItemFeeSumamt)
 
 		if items.AdviceId > 0 && items.ProjectId == 0 {
+			fsiOPFLD.FeeOcurTime = time.Unix(items.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
+			fsiOPFLD.MedListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
+
 			fsiOPFLD.MedinsListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 			fsiOPFLD.MedinsListName = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
 			fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
 			fsiOPFLD.BilgDeptName = department.Name
 			fsiOPFLD.BilgDeptCodg = department.Number
-			fsiOPFLD.BilgDrCode = doctor.DoctorCode
+			fsiOPFLD.BilgDrCode = doctor.DoctorNumber
 			fsiOPFLD.BilgDrName = doctor.UserName
+			fsiOPFLD.MedChrgitmType = "09"
 
 		} else if items.AdviceId == 0 && items.ProjectId > 0 {
+			fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
+			fsiOPFLD.MedListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
+
 			fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
-			fsiOPFLD.MedinsListName = items.HisPrescriptionProject.HisProject.ProjectName
-			fsiOPFLD.Prodname = items.HisPrescriptionProject.HisProject.ProjectName
 			fsiOPFLD.BilgDeptName = department.Name
 			fsiOPFLD.BilgDeptCodg = department.Number
-			fsiOPFLD.BilgDrCode = doctor.DoctorCode
+			fsiOPFLD.BilgDrCode = doctor.DoctorNumber
 			fsiOPFLD.BilgDrName = doctor.UserName
+			if items.HisPrescriptionProject.Type == 2 {
+				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.HisProject.ProjectName
+				fsiOPFLD.Prodname = items.HisPrescriptionProject.HisProject.ProjectName
+
+				switch items.HisPrescriptionProject.HisProject.CostClassify {
+				case 0:
+
+					break
+				case 1:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+				case 2:
+					fsiOPFLD.MedChrgitmType = "05"
+
+					break
+				case 3:
+					fsiOPFLD.MedChrgitmType = "03"
+
+					break
+				case 4:
+					fsiOPFLD.MedChrgitmType = "03"
+
+					break
+				case 5:
+					fsiOPFLD.MedChrgitmType = "08"
+
+					break
+				case 6:
+					fsiOPFLD.MedChrgitmType = "14"
+
+					break
+				case 7:
+					fsiOPFLD.MedChrgitmType = "14"
+
+					break
+				case 8:
+					fsiOPFLD.MedChrgitmType = "03"
+					break
+				case 9:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+				case 10:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+				case 11:
+					fsiOPFLD.MedChrgitmType = "06"
+					break
+				case 12:
+					fsiOPFLD.MedChrgitmType = "12"
+					break
+				case 13:
+					fsiOPFLD.MedChrgitmType = "01"
+					break
+				case 14:
+					fsiOPFLD.MedChrgitmType = "04"
+					break
+				case 15:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+
+				}
+			} else if items.HisPrescriptionProject.Type == 3 {
+				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.GoodInfo.GoodName
+				fsiOPFLD.Prodname = items.HisPrescriptionProject.GoodInfo.GoodName
+
+				fsiOPFLD.MedChrgitmType = "08"
+			}
 		}
 
-		//fsiOPFLD.DetItemFeeSumamt = items.DetItemFeeSumamt
-		fsiOPFLD.MedChrgitmType = "09"
 		fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.AdviceName
 		fsiOPFLD.BilgDeptCodg = department.Number
 		fsiOPFLD.BilgDeptName = department.Name
+		memo["hosp_appr_flag"] = "1"
+		memo["invoice_no"] = order.MdtrtId
+		memo["memo"] = "自费"
+		bytesData, _ := json.Marshal(memo)
+		fsiOPFLD.Memo = string(bytesData)
+
 		fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
 	}
+	for _, items := range order_info_two {
+		memo := make(map[string]interface{})
+		var fsiOPFLD models.FsiOwnpayPatnFeeListDDTO
+		fsiOPFLD.FixmedinsMdtrtID = items.OrderNumber
+		fsiOPFLD.MedType = "14"
+		fsiOPFLD.BkkpSn = items.OrderNumber
+		fsiOPFLD.FixmedinsCode = miConfig.Code
+		fsiOPFLD.FixmedinsName = miConfig.OrgName
+		fsiOPFLD.Cnt = fmt.Sprintf("%.2f", items.Cnt)
+		fsiOPFLD.Pric = fmt.Sprintf("%.2f", items.Pric)
+		fsiOPFLD.DetItemFeeSumamt = fmt.Sprintf("%.2f", items.DetItemFeeSumamt)
+
+		if items.AdviceId > 0 && items.ProjectId == 0 {
+			fsiOPFLD.FeeOcurTime = time.Unix(items.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
+			fsiOPFLD.MedListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
+
+			fsiOPFLD.MedinsListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
+			fsiOPFLD.MedinsListName = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
+			fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
+			fsiOPFLD.BilgDeptName = department.Name
+			fsiOPFLD.BilgDeptCodg = department.Number
+			fsiOPFLD.BilgDrCode = doctor.DoctorNumber
+			fsiOPFLD.BilgDrName = doctor.UserName
+			fsiOPFLD.MedChrgitmType = "09"
+
+		} else if items.AdviceId == 0 && items.ProjectId > 0 {
+			fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
+			fsiOPFLD.MedListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
+
+			fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
+			fsiOPFLD.BilgDeptName = department.Name
+			fsiOPFLD.BilgDeptCodg = department.Number
+			fsiOPFLD.BilgDrCode = doctor.DoctorNumber
+			fsiOPFLD.BilgDrName = doctor.UserName
+			if items.HisPrescriptionProject.Type == 2 {
+				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.HisProject.ProjectName
+				fsiOPFLD.Prodname = items.HisPrescriptionProject.HisProject.ProjectName
+
+				switch items.HisPrescriptionProject.HisProject.CostClassify {
+				case 0:
+
+					break
+				case 1:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+				case 2:
+					fsiOPFLD.MedChrgitmType = "05"
+
+					break
+				case 3:
+					fsiOPFLD.MedChrgitmType = "03"
+
+					break
+				case 4:
+					fsiOPFLD.MedChrgitmType = "03"
+
+					break
+				case 5:
+					fsiOPFLD.MedChrgitmType = "08"
+
+					break
+				case 6:
+					fsiOPFLD.MedChrgitmType = "14"
+
+					break
+				case 7:
+					fsiOPFLD.MedChrgitmType = "14"
+
+					break
+				case 8:
+					fsiOPFLD.MedChrgitmType = "03"
+					break
+				case 9:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+				case 10:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+				case 11:
+					fsiOPFLD.MedChrgitmType = "06"
+					break
+				case 12:
+					fsiOPFLD.MedChrgitmType = "12"
+					break
+				case 13:
+					fsiOPFLD.MedChrgitmType = "01"
+					break
+				case 14:
+					fsiOPFLD.MedChrgitmType = "04"
+					break
+				case 15:
+					fsiOPFLD.MedChrgitmType = "14"
+					break
+
+				}
+			} else if items.HisPrescriptionProject.Type == 3 {
+				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.GoodInfo.GoodName
+				fsiOPFLD.Prodname = items.HisPrescriptionProject.GoodInfo.GoodName
+
+				fsiOPFLD.MedChrgitmType = "08"
+			}
+		}
+
+		fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.AdviceName
+		fsiOPFLD.BilgDeptCodg = department.Number
+		fsiOPFLD.BilgDeptName = department.Name
+		memo["hosp_appr_flag"] = "1"
+		memo["invoice_no"] = order.MdtrtId
+		memo["memo"] = "自费"
+		bytesData, _ := json.Marshal(memo)
+		fsiOPFLD.Memo = string(bytesData)
+
+		fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
+	}
+
+	fmt.Println(fsiOPFLDs)
+
 	struct4201A.Fopfd = fsiOPFLDs
+	fmt.Println(struct4201A.Fopfd)
+
 	result, requestLog := service.Gdyb4201A(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, struct4201A)
+	saveLog(result, requestLog, "4201A", "自费费用明细上传")
+	var res2 ResultSix
+	var respJSON2 map[string]interface{}
+	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	userJSONBytes2, _ := json.Marshal(respJSON2)
+	if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if res2.Infcode != 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res2.ErrMsg,
+		})
+		return
 
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "上传成功",
+		})
+	}
 }
 func (c *HisApiController) Get4202() {
 	order_id, _ := c.GetInt64("order_id")
+	order_id = 220548
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	admin_user_id = 3432
+
 	order, _ := service.GetHisOrderByIDTwo(order_id)
 	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -261,6 +488,9 @@ func (c *HisApiController) Get4203() {
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	order_id, _ := c.GetInt64("order_id")
+	order_id = 220548
+	admin_user_id = 3432
+
 	order, _ := service.GetHisOrderByIDTwo(order_id)
 	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	result, requestLog := service.Gdyb4203(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, his.Number)

models/zifei_modes.go

@@ -27,19 +27,15 @@ type FsiOwnpayPatnFeeListDDTO struct {
 	MedcWayDscr      string `json:"medc_way_dscr "`
 	MedinsListCodg   string `json:"medins_list_codg"`
 	MedinsListName   string `json:"medins_list_name"`
-	Memo             struct {
-		HospApprFlag string `json:"hosp_appr_flag"`
-		InvoiceNo    string `json:"invoice_no"`
-		Memo         string `json:"memo"`
-	} `json:"memo"`
-	OverlmtSelfpay string `json:"overlmt_selfpay"`
-	PrdDays        string `json:"prd_days"`
-	PreselfpayAmt  string `json:"preselfpay_amt"`
-	Pric           string `json:"pric"`
-	Prodname       string `json:"prodname"`
-	SinDosDscr     string `json:"sin_dos_dscr "`
-	TcmdrugUsedWay string `json:"tcmdrug_used_way"`
-	UsedFrquDscr   string `json:"used_frqu_dscr "`
+	Memo             string `json:"memo"`
+	OverlmtSelfpay   string `json:"overlmt_selfpay"`
+	PrdDays          string `json:"prd_days"`
+	PreselfpayAmt    string `json:"preselfpay_amt"`
+	Pric             string `json:"pric"`
+	Prodname         string `json:"prodname"`
+	SinDosDscr       string `json:"sin_dos_dscr "`
+	TcmdrugUsedWay   string `json:"tcmdrug_used_way"`
+	UsedFrquDscr     string `json:"used_frqu_dscr "`
 }
 type Struct4201A struct {
 	Fopfd []FsiOwnpayPatnFeeListDDTO

service/gdyb_zifei_service.go

@@ -22,51 +22,48 @@ func Gdyb4201A(org_name string, doctor string, fixmedins_code string, insuplc_ad
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
+	inputDatas := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "4201A" // 交易编码
-
 	for _, item := range struct4201A.Fopfd {
-
-	}
-
-	inputData["fixmedins_mdtrt_id"] = ""
-	inputData["med_type"] = ""
-	inputData["bkkp_sn"] = ""
-	inputData["fee_ocur_time"] = ""
-	inputData["fixmedins_code"] = ""
-	inputData["fixmedins_name"] = ""
-	inputData["cnt"] = ""
-	inputData["pric"] = ""
-	inputData["det_item_fee_sumamt"] = ""
-	inputData["med_list_codg"] = ""
-	inputData["medins_list_name"] = ""
-	inputData["medins_list_code"] = ""
-
-	inputData["med_chrgitm_type"] = ""
-	inputData["prodname"] = ""
-	inputData["bilg_dept_codg"] = ""
-	inputData["bilg_dept_name"] = ""
-	inputData["bilg_dr_code"] = ""
-	inputData["bilg_dr_name"] = ""
-	inputData["acord_dept_codg"] = ""
-	inputData["acord_dept_name"] = ""
-	inputData["acord_dr_code"] = ""
-	inputData["acord_dr_name"] = ""
-	inputData["tcmdrug_used_way"] = ""
-	inputData["etip_flag"] = ""
-	inputData["etip_hosp_code"] = ""
-	inputData["dscg_tkdrug_flag"] = ""
-	inputData["sin_dos_dscr"] = ""
-	inputData["used_frqu_dscr"] = ""
-	inputData["prd_days"] = ""
-	inputData["medc_way_dscr"] = ""
-	inputData["memo"] = ""
-	inputData["fulamt_ownpay_amt"] = ""
-	inputData["overlmt_selfpay"] = ""
-	inputData["preselfpay_amt"] = ""
-	inputData["inscp_amt"] = ""
-
-	input["data"] = inputData
+		inputData := make(map[string]interface{})
+		inputData["fixmedins_mdtrt_id"] = item.FixmedinsMdtrtID
+		inputData["med_type"] = item.MedType
+		inputData["bkkp_sn"] = item.BkkpSn
+		inputData["fee_ocur_time"] = item.FeeOcurTime
+		inputData["fixmedins_code"] = item.FixmedinsCode
+		inputData["fixmedins_name"] = item.FixmedinsName
+		inputData["cnt"] = item.Cnt
+		inputData["pric"] = item.Pric
+		inputData["det_item_fee_sumamt"] = item.DetItemFeeSumamt
+		inputData["med_list_codg"] = item.MedListCodg
+		inputData["medins_list_name"] = item.MedinsListName
+		inputData["medins_list_code"] = item.MedinsListCodg
+		inputData["med_chrgitm_type"] = item.MedChrgitmType
+		inputData["prodname"] = item.Prodname
+		inputData["bilg_dept_codg"] = item.BilgDeptCodg
+		inputData["bilg_dept_name"] = item.BilgDeptName
+		inputData["bilg_dr_code"] = item.BilgDrCode
+		inputData["bilg_dr_name"] = item.BilgDrName
+		inputData["acord_dept_codg"] = ""
+		inputData["acord_dept_name"] = ""
+		inputData["acord_dr_code"] = ""
+		inputData["acord_dr_name"] = ""
+		inputData["tcmdrug_used_way"] = ""
+		inputData["etip_flag"] = ""
+		inputData["etip_hosp_code"] = ""
+		inputData["dscg_tkdrug_flag"] = ""
+		inputData["sin_dos_dscr"] = ""
+		inputData["used_frqu_dscr"] = ""
+		inputData["prd_days"] = ""
+		inputData["medc_way_dscr"] = ""
+		inputData["memo"] = item.Memo
+		inputData["fulamt_ownpay_amt"] = ""
+		inputData["overlmt_selfpay"] = ""
+		inputData["preselfpay_amt"] = ""
+		inputData["inscp_amt"] = ""
+		inputDatas = append(inputDatas, inputData)
+	}
+	input["fsiOwnpayPatnFeeListDDTO"] = inputDatas
 	inputMessage["input"] = input //交易输入
 
 	var inputLog string
@@ -85,7 +82,7 @@ func Gdyb4201A(org_name string, doctor string, fixmedins_code string, insuplc_ad
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "1101"
+		url = gdyb_url + "4201A"
 	}
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -206,7 +203,7 @@ func Gdyb4202(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		feedetailInfo["maindiag_flag"] = item.MaindiagFlag // 人员编号 （来自1101接口返回）
 		feedetailInfo["diag_srt_no"] = index               // 收费批次号
 		feedetailInfo["diag_code"] = item.DiagCode         // 病种编码
-		feedetailInfo["diag_name"] = ""                    // 处方号
+		feedetailInfo["diag_name"] = item.DiagName         // 处方号
 		feedetailInfo["diag_dept"] = ""
 		feedetailInfo["diag_dr_code"] = ""
 		feedetailInfo["diag_dr_name"] = ""