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

controllers/js/jsyb_controller.go

@@ -45,6 +45,8 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/3201", &JSybController{}, "get:Get3201")
 	beego.Router("/jsyb/9001", &JSybController{}, "get:Get9001")
 
+	beego.Router("/jsyb/3101", &JSybController{}, "get:Get3101")
+
 	//beego.Router("/jsyb/2503", &JSybController{}, "get:Get2503")
 
 	beego.Router("/jsyb/readcard", &JSybController{}, "get:ReadCard")
@@ -1036,3 +1038,7 @@ func saveJsLog(result string, request string, infno string, desc string, org_nam
 	}
 
 }
+
+func (c *JSybController) Get3101() {
+
+}

controllers/nm/nm_controller.go

@@ -425,8 +425,9 @@ func (c *NmController) Post2304() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	org_name := c.GetString("org_name")
+	fapiao_number := c.GetString("fapiao_number")
 
-	result, src_resquest := service.ZHGdyb2304(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates)
+	result, src_resquest := service.ZHGdyb2304(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates, fapiao_number)
 	saveJsLog(result, src_resquest, "2304", "住院结算", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(src_resquest), &dat2); err == nil {

controllers/sg/his_api_controller.go

@@ -8878,11 +8878,11 @@ func (c *HisApiController) GetSettleAccounts() {
 			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
 
-		if c.GetAdminUserInfo().CurrentOrgId == 10188 {
+		if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
 			if item.MedChrgitmType == "03" { //检查费
-				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 		} else {
 
@@ -8898,6 +8898,7 @@ func (c *HisApiController) GetSettleAccounts() {
 			laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
 		}
 
 		if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费

controllers/zh/zh_his_api_controller.go

@@ -1400,7 +1400,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 		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=" + mdtrt_cert_no
+			"&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 + "&fapiao_number=" + fapiao_number
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1427,7 +1427,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 
 	} 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)
+		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(result, src_resquest, "2304", "住院结算")
 	}
 

service/jsyb_service.go

@@ -1206,3 +1206,256 @@ func GetMacTwo() string {
 	}
 	return ""
 }
+
+type Jsyb3101 struct {
+	Opter        string `json:"opter"`
+	RecerSysCode string `json:"recer_sys_code"`
+	Msgid        string `json:"msgid"`
+	InfTime      string `json:"inf_time"`
+	Input        struct {
+		Data struct {
+			Syscode     string `json:"syscode"`
+			TrigScen    string `json:"trig_scen"`
+			PatientDtos struct {
+				Poolarea         string `json:"poolarea"`
+				CurrMdtrtID      string `json:"curr_mdtrt_id"`
+				PatnID           string `json:"patn_id"`
+				FsiEncounterDtos struct {
+					OutSetlFlag      string        `json:"out_setl_flag"`
+					AdmDate          string        `json:"adm_date"`
+					DscgDeptName     string        `json:"dscg_dept_name"`
+					DscgDeptCodg     string        `json:"dscg_dept_codg"`
+					SetlTotlnum      string        `json:"setl_totlnum"`
+					DscgDate         string        `json:"dscg_date"`
+					Wardno           string        `json:"wardno"`
+					MdtrtID          string        `json:"mdtrt_id"`
+					AdmDeptName      string        `json:"adm_dept_name"`
+					AdmDeptCodg      string        `json:"adm_dept_codg"`
+					OwnpayAmt        string        `json:"ownpay_amt"`
+					FsiOperationDtos []interface{} `json:"fsi_operation_dtos"`
+					MedinsType       string        `json:"medins_type"`
+					MedinsName       string        `json:"medins_name"`
+					MedMdtrtType     string        `json:"med_mdtrt_type"`
+					HifpPayamt       string        `json:"hifp_payamt"`
+					MaAmt            string        `json:"ma_amt"`
+					DscgMainDiseName string        `json:"dscg_main_dise_name"`
+					DscgMainDiseCodg string        `json:"dscg_main_dise_codg"`
+					MedinsAdmdvs     string        `json:"medins_admdvs"`
+					AcctPayamt       string        `json:"acct_payamt"`
+					MedType          string        `json:"med_type"`
+					FsiDiagnoseDtos  []struct {
+						InoutDiseType string `json:"inout_dise_type"`
+						DiseID        string `json:"dise_id"`
+						DiasSrtNo     string `json:"dias_srt_no"`
+						DiseName      string `json:"dise_name"`
+						DiseDate      string `json:"dise_date"`
+						DiseCodg      string `json:"dise_codg"`
+						MaindiseFlag  string `json:"maindise_flag"`
+					} `json:"fsi_diagnose_dtos"`
+					Insutype     string `json:"insutype"`
+					FsiOrderDtos []struct {
+						DrordBhvr       string `json:"drord_bhvr"`
+						Cnt             string `json:"cnt"`
+						HilistLv        string `json:"hilist_lv"`
+						Sumamt          string `json:"sumamt"`
+						Lv2HospItemPric string `json:"lv2_hosp_item_pric"`
+						OwnpayAmt       string `json:"ownpay_amt"`
+						HilistType      string `json:"hilist_type"`
+						HilistPric      string `json:"hilist_pric"`
+						HilistName      string `json:"hilist_name"`
+						HilistMemo      string `json:"hilist_memo"`
+						HilistCode      string `json:"hilist_code"`
+						SpecUnt         string `json:"spec_unt"`
+						CurrDrordFlag   string `json:"curr_drord_flag"`
+						DrordDeptName   string `json:"drord_dept_name"`
+						DrordDeptCodg   string `json:"drord_dept_codg"`
+						Grpno           string `json:"grpno"`
+						HosplistName    string `json:"hosplist_name"`
+						HosplistCode    string `json:"hosplist_code"`
+						ChrgType        string `json:"chrg_type"`
+						DrordStopDate   string `json:"drord_stop_date"`
+						DrordDrName     string `json:"drord_dr_name"`
+						DrordDrCodg     string `json:"drord_dr_codg"`
+						HilistDosform   string `json:"hilist_dosform"`
+						Lv3HospItemPric string `json:"lv3_hosp_item_pric"`
+						SelfpayAmt      string `json:"selfpay_amt"`
+						LongDrordFlag   string `json:"long_drord_flag"`
+						DrordBegnDate   string `json:"drord_begn_date"`
+						Spec            string `json:"spec"`
+						Lv1HospItemPric string `json:"lv1_hosp_item_pric"`
+						Rxno            string `json:"rxno"`
+						HosplistDosform string `json:"hosplist_dosform"`
+						Pric            string `json:"pric"`
+						RxID            string `json:"rx_id"`
+						DrordDrProfttl  string `json:"drord_dr_profttl"`
+					} `json:"fsi_order_dtos"`
+					DrCodg       string `json:"dr_codg"`
+					SelfpayAmt   string `json:"selfpay_amt"`
+					ReimFlag     string `json:"reim_flag"`
+					MedfeeSumamt string `json:"medfee_sumamt"`
+					MedinsLv     string `json:"medins_lv"`
+					MedinsID     string `json:"medins_id"`
+					WardareaCodg string `json:"wardarea_codg"`
+					Bedno        string `json:"bedno"`
+					MatnStas     string `json:"matn_stas"`
+				} `json:"fsi_encounter_dtos"`
+				FsiHisDataDtos string `json:"fsi_his_data_dtos"`
+				PatnName       string `json:"patn_name"`
+				Gend           string `json:"gend"`
+				Brdy           string `json:"brdy"`
+			} `json:"patient_dtos"`
+			RuleIds []interface{} `json:"rule_ids"`
+			TaskID  string        `json:"task_id"`
+		} `json:"data"`
+	} `json:"input"`
+	Infno             string `json:"infno"`
+	Cainfo            string `json:"cainfo"`
+	OpterType         string `json:"opter_type"`
+	OpterName         string `json:"opter_name"`
+	MdtrtareaAdmvs    string `json:"mdtrtarea_admvs"`
+	Signtype          string `json:"signtype"`
+	FixmedinsSoftFcty string `json:"fixmedins_soft_fcty"`
+	DevSafeInfo       string `json:"dev_safe_info"`
+	InsuplcAdmdvs     string `json:"insuplc_admdvs"`
+	Infver            string `json:"infver"`
+	SignNo            string `json:"sign_no"`
+	FixmedinsName     string `json:"fixmedins_name"`
+	FixmedinsCode     string `json:"fixmedins_code"`
+	DevNo             string `json:"dev_no"`
+}
+
+//
+//func jsyb3101(jsyb3102 Jsyb3102, request_url string, access_key string, secret_key string) (string, string) {
+//	// 生成签名
+//	timestamp := time.Now().Unix()
+//	// 生成输入报文
+//	inputMessage := SetJSInputMessage(timestamp, jsyb3101.FixmedinsName, jsyb3101.OpterName, jsyb3101.FixmedinsCode, jsyb3101.InsuplcAdmdvs, jsyb3101.MdtrtareaAdmvs, jsyb3101.Cainfo)
+//	input := make(map[string]interface{})
+//	inputData := make(map[string]interface{})
+//	patientDtosinputData := make(map[string]interface{})
+//	fisEncounterDtosData := make(map[string]interface{})
+//	fsiDiagnoseDtosData := make(map[string]interface{})
+//	fsiOrderDtosData := make(map[string]interface{})
+//	fsiOperationDtosData := make(map[string]interface{})
+//
+//	inputMessage["infno"] = "3102"
+//	inputData["syscode"] = "LinkDialysis"
+//	inputData["trig_scen"] = "1"
+//
+//	patientDtosinputData["patn_id"] = jsyb3101.Input.Data.PatientDtos.PatnID
+//	patientDtosinputData["patn_name"] = jsyb3101.Input.Data.PatientDtos.PatnName
+//	patientDtosinputData["gend"] = jsyb3101.Input.Data.PatientDtos.Gend
+//	patientDtosinputData["brdy"] = jsyb3101.Input.Data.PatientDtos.Gend
+//	patientDtosinputData["poolarea"] = jsyb3101.Input.Data.PatientDtos.Gend
+//	patientDtosinputData["curr_mdtrt_id"] = jsyb3101.Input.Data.PatientDtos.CurrMdtrtID
+//	patientDtosinputData["fsi_encounter_dtos"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos
+//	patientDtosinputData["fsi_his_data_dto"] = jsyb3101.Input.Data.PatientDtos.FsiHisDataDtos
+//
+//	fisEncounterDtosData["mdtrt_id"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.MdtrtID
+//	fisEncounterDtosData["medins_id"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.MedinsID
+//	fisEncounterDtosData["medins_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.MedinsName
+//	fisEncounterDtosData["medins_admdvs"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.MedinsAdmdvs
+//	fisEncounterDtosData["medins_type"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.MedinsType
+//	fisEncounterDtosData["medins_lv"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.MedinsType
+//	fisEncounterDtosData["wardarea_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.WardareaCodg
+//	fisEncounterDtosData["wardno"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.Wardno
+//	fisEncounterDtosData["bedno"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.Bedno
+//	fisEncounterDtosData["adm_date"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.AdmDate
+//	fisEncounterDtosData["dscg_date"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgDate
+//	fisEncounterDtosData["dscg_main_dise_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseCodg
+//	fisEncounterDtosData["dscg_main_dise_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["fsi_diagnose_dtos"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["dr_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["adm_dept_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["adm_dept_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["dscg_dept_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["dscg_dept_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["med_mdtrt_type"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["med_type"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["fsi_order_dtos"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["matn_stas"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["medfee_sumamt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["ownpay_amt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["selfpay_amt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["acct_payamt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["ma_amt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["hifp_payamt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["setl_totlnum"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["insutype"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["reim_flag"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["out_setl_flag"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fisEncounterDtosData["fsi_operation_dtos"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//
+//	fsiDiagnoseDtosData["dise_id"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiDiagnoseDtosData["inout_dise_type"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiDiagnoseDtosData["maindise_flag"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiDiagnoseDtosData["dias_srt_no"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiDiagnoseDtosData["dise_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiDiagnoseDtosData["dise_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiDiagnoseDtosData["dise_date"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//
+//	fsiOrderDtosData["rx_id"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["rxno"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["grpno"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["long_drord_flag"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hilist_type"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["chrg_type"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_bhvr"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hilist_code"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hilist_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hilist_dosform"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hilist_lv"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hilist_pric"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["lv1_hosp_item_pric"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["lv1_hosp_item_pric"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["lv2_hosp_item_pric"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["lv3_hosp_item_pric"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hilist_memo"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hosplist_code"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hosplist_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["hosplist_dosform"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["cnt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["pric"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["sumamt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["ownpay_amt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["selfpay_amt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["spec"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["spec_unt"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_begn_date"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_stop_date"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_dept_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_dept_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_dr_codg"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_dr_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["drord_dr_profttl"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOrderDtosData["curr_drord_flag"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//
+//	fsiOperationDtosData["setl_list_oprn_id"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["oprn_code"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["oprn_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["main_oprn_flag"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["oprn_date"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["anst_way"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["oper_dr_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["oper_dr_code"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["anst_dr_name"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//	fsiOperationDtosData["anst_dr_code"] = jsyb3101.Input.Data.PatientDtos.FsiEncounterDtos.DscgMainDiseName
+//
+//	inputData["patient_dtos"] = patientDtosinputData
+//	inputData["fsi_encounter_dtos"] = fisEncounterDtosData
+//	inputData["fsi_diagnose_dtos"] = fsiDiagnoseDtosData
+//	inputData["fsi_order_dtos"] = fsiOrderDtosData
+//	inputData["fsi_operation_dtos"] = fsiOperationDtosData
+//
+//	input["data"] = inputData
+//	inputMessage["input"] = input //交易输入
+//	bytesData, err := json.Marshal(inputMessage)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error(), ""
+//	}
+//	request_url = request_url + "3101"
+//	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+//
+//}

service/zh_his_service.go

@@ -957,7 +957,7 @@ func ZHGdyb2303(psnNo string, mdtrtId string, chrgBchno string, certNo string, i
 }
 
 //  住院结算
-func ZHGdyb2304(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, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
+func ZHGdyb2304(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, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, fapiao_number string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -988,7 +988,7 @@ func ZHGdyb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, i
 	inputData["mdtrt_id"] = mdtrtId            // 就诊 ID（来自2201接口返回）
 	inputData["acct_used_flag"] = "1"          // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype           // 险种类型
-	inputData["invono"] = ""                   // 发票号
+	inputData["invono"] = fapiao_number        // 发票号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入