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

controllers/js/jsyb_controller.go

@@ -36,6 +36,7 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/2208", &JSybController{}, "get:PostNine")
 	beego.Router("/jsyb/5203", &JSybController{}, "get:PostTen")
 	beego.Router("/jsyb/5301", &JSybController{}, "get:Get5301")
+	beego.Router("/jsyb/3201", &JSybController{}, "get:Get3201")
 
 	//beego.Router("/jsyb/2503", &JSybController{}, "get:Get2503")
 
@@ -55,7 +56,6 @@ func (c *JSybController) Get5301() {
 
 	result, inputLog := service.Jsyb5301(psn_no, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak)
 	//saveJsLog()
-	saveJsLog("", inputLog, "5301", "查询备案", org_name)
 	saveJsLog(result, inputLog, "5301", "查询备案", org_name)
 
 	var dat map[string]interface{}
@@ -95,8 +95,7 @@ func (c *JSybController) PostOne() {
 	result, inputLog := service.Jsyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificates, url, ak)
 	fmt.Println(result)
 	fmt.Println(inputLog)
-	saveJsLog("", inputLog, "1101", "查询个人信息", org_name)
-	saveJsLog(result, "", "1101", "查询个人信息", org_name)
+	saveJsLog(result, inputLog, "1101", "查询个人信息", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 
@@ -142,10 +141,7 @@ func (c *JSybController) PostTwo() {
 	doctor_name := c.GetString("doctor_name")
 
 	result, request_log := service.Jsyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, url, ak, verify_number)
-	fmt.Println(result)
-	fmt.Println(request_log)
-	saveJsLog("", request_log, "2201", "挂号", org_name)
-	saveJsLog(result, "", "2201", "挂号", org_name)
+	saveJsLog(result, request_log, "2201", "挂号", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 
@@ -178,8 +174,7 @@ func (c *JSybController) PostThree() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 	result, request_log := service.Jsyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, url, ak)
-	saveJsLog("", request_log, "2202", "退号", org_name)
-	saveJsLog(result, "", "2202", "退号", org_name)
+	saveJsLog(result, request_log, "2202", "退号", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {
@@ -234,8 +229,7 @@ func (c *JSybController) PostFour() {
 	ak := respJSON["ak"].(string)
 	begin_time := respJSON["begin_time"].(string)
 	result, request_log, timeStamp := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak, begin_time)
-	saveJsLog("", request_log, "2203", "上传就诊信息", org_name)
-	saveJsLog(result, "", "2203", "上传就诊信息", org_name)
+	saveJsLog(result, request_log, "2203", "上传就诊信息", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 
@@ -303,8 +297,7 @@ func (c *JSybController) PostFive() {
 	result, request_log := service.Jsyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
 		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["diag_code"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), "")
 
-	saveJsLog("", request_log, "2204", "上传明细", respJSON["org_name"].(string))
-	saveJsLog(result, "", "2204", "上传明细", respJSON["org_name"].(string))
+	saveJsLog(result, request_log, "2204", "上传明细", respJSON["org_name"].(string))
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -341,8 +334,7 @@ func (c *JSybController) PostSix() {
 
 	result, request_log := service.Jsyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, url, ak)
 	fmt.Println(request_log)
-	saveJsLog("", request_log, "2205", "撤销明细", org_name)
-	saveJsLog(result, "", "2205", "撤销明细", org_name)
+	saveJsLog(result, request_log, "2205", "撤销明细", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -383,8 +375,7 @@ 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)
-	saveJsLog("", request_log, "2206", "预结算", org_name)
-	saveJsLog(result, "", "2206", "预结算", org_name)
+	saveJsLog(result, request_log, "2206", "预结算", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -432,8 +423,7 @@ func (c *JSybController) PostEight() {
 	verify_number := c.GetString("verify_number")
 
 	result, request_log := service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number)
-	saveJsLog("", request_log, "2207", "结算", org_name)
-	saveJsLog(result, "", "2207", "结算", org_name)
+	saveJsLog(result, request_log, "2207", "结算", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -466,8 +456,7 @@ func (c *JSybController) PostNine() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 	result, request_log := service.Jsyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak)
-	saveJsLog("", request_log, "2208", "退费", org_name)
-	saveJsLog(result, "", "2208", "退费", org_name)
+	saveJsLog(result, request_log, "2208", "退费", org_name)
 	fmt.Println(request_log)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -518,8 +507,7 @@ func (c *JSybController) PostTen() {
 	}
 
 	result, request_log := service.Jsyb5203(baseParams, businessParams)
-	saveJsLog("", request_log, "5203", "结算单", org_name)
-	saveJsLog(result, "", "5203", "结算单", org_name)
+	saveJsLog(result, request_log, "5203", "结算单", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -558,6 +546,43 @@ func (c *JSybController) Get2503() {
 	service.Jsyb2503(psnNo, insutype, org_name, doctor, fixmedins_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_name, sick_code, start_time, end_time, check_time, url, access_key)
 
 }
+func (c *JSybController) Get3201() {
+	insutype := c.GetString("insutype")
+	clrType := c.GetString("clr_type")
+	setlOptins := c.GetString("setl_optins")
+	stmtBegndate := c.GetString("stmt_begndate")
+	stmtEnddate := c.GetString("stm_enddate")
+	medfeeSumamt, _ := c.GetFloat("medfee_sumamt", 0)
+	fundPaySumamt, _ := c.GetFloat("fund_pay_sumamt", 0)
+	acctPay, _ := c.GetFloat("acct_pay", 0)
+	fixmedinsSetlCnt, _ := c.GetInt64("fixmedins_setl_cnt", 0)
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+	result, request_log := service.Jsyb3201(fixmedinsSetlCnt, acctPay, fundPaySumamt, medfeeSumamt, stmtBegndate, stmtEnddate, setlOptins, clrType, insutype, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key)
+	saveJsLog(result, request_log, "3201", "对总账", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
 
 func (c *JSybController) ReadCard() {
 	fixmedins_code := c.GetString("fixmedins_code")

controllers/sg/his_api_controller.go

@@ -1207,7 +1207,7 @@ func (c *HisApiController) GetBatchSettleList() {
 			ConerAddr:      miConfig.OrgName,
 			ConerTel:       admin.Mobile,
 			HiType:         order.Insutype,
-			Insuplc:        miConfig.InsuplcAdmdvs,
+			Insuplc:        his.InsuplcAdmdvs,
 			MaindiagFlag:   "1",
 			BillCode:       order.FaPiaoCode,
 			BillNo:         order.FaPiaoNumber,
@@ -1217,8 +1217,8 @@ func (c *HisApiController) GetBatchSettleList() {
 			AcctPay:        order.AcctPay,
 			PsnCashpay:     order.PsnCashPay,
 			HiPaymtd:       "1",
-			Hsorg:          miConfig.InsuplcAdmdvs,
-			HsorgOpter:     miConfig.InsuplcAdmdvs,
+			Hsorg:          his.InsuplcAdmdvs,
+			HsorgOpter:     his.InsuplcAdmdvs,
 			MedinsFillPsn:  curRoles.UserName,
 			MedinsFillDept: depart.Name,
 			IptMedType:     "2",
@@ -2445,6 +2445,24 @@ type ResultEight struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+
+type ResultEightFor10188 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Stmtinfo struct {
+			SetlOptins   string `json:"setl_optins"`
+			StmtRslt     string `json:"stmt_rslt"`
+			StmtRsltDscr string `json:"stmt_rslt_dscr"`
+		} `json:"stmtinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
 type ResultNine struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -2993,6 +3011,8 @@ func (c *HisApiController) GetRegisterInfo() {
 	social_type, _ := c.GetInt64("social_type")
 	med_type := c.GetString("social_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
@@ -3185,7 +3205,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			json.Unmarshal([]byte(his.Iinfo), &rf)
 			var insutypes []*ResultFive
 			var insutype string
-			var insuplc_admdvs string
+			var insuplc_admdvs_temp string
 			var is390 int = 0
 			var is310 int = 0
 
@@ -3230,19 +3250,27 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = med_type
 			}
 
-			for _, item := range rf {
-				if item.Insutype == insutype {
-					insuplc_admdvs = item.InsuplcAdmdvs
-				}
-			}
+			//for _, item := range rf {
+			//	if item.Insutype == insutype {
+			//		insuplc_admdvs = item.InsuplcAdmdvs
+			//	}
+			//}
 			var infocode int64
 			var resThree ResultThree
 			var resThree10265 ResultThree10265
 
+			if len(insuplc_admdvs) == 0 {
+				insuplc_admdvs_temp = miConfig.InsuplcAdmdvs
+			} else {
+
+				insuplc_admdvs_temp = insuplc_admdvs
+
+			}
+
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				api := "http://192.168.124.4:9532/" + "hbyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + doctor_info.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) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&doctor_name=" + doctor_info.UserName
+					"&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 + "&doctor_name=" + doctor_info.UserName
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -3280,7 +3308,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 				api := "http://192.168.3.111:9532/" + "jsyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + bas[2] + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&doctor_name=" + doctor_info.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) + "&dept_code=" + department.Number + "&dept=" + department.Name + "&doctor_id=" + doctor_id + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
+					"&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.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -3321,7 +3349,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 				infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
 			} else {
-				result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName)
+				result, requestLog := service.Gdyb2201(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)
 				saveLog(result, requestLog, "2201", "挂号")
 				if miConfig.Code == "H15049901371" {
 
@@ -3379,7 +3407,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Insutype = insutype
 			his.Ctime = time.Now().Unix()
 			his.Mtime = time.Now().Unix()
-			his.InsuplcAdmdvs = insuplc_admdvs
+			his.InsuplcAdmdvs = insuplc_admdvs_temp
 			his.Status = 1
 			service.UpdateHisPatientStatus(&his)
 			service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
@@ -3521,7 +3549,7 @@ func (c *HisApiController) GetUploadInfo() {
 		var res2 ResultSix
 		var ressix10265 ResultSix10265
 
-		if miConfig.InsuplcAdmdvs == "421300" {
+		if miConfig.MdtrtareaAdmvs == "421300" {
 
 			data := make(map[string]interface{})
 			client := &http.Client{}
@@ -3533,7 +3561,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["med_type"] = strconv.FormatInt(reg_type, 10)
 			data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 			data["fixmedins_code"] = miConfig.Code
-			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+			data["insuplc_admdvs"] = his.InsuplcAdmdvs
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 			data["secret_key"] = miConfig.SecretKey
 			data["sick_code"] = sickConfig.CountryCode
@@ -3601,7 +3629,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["med_type"] = strconv.FormatInt(reg_type, 10)
 			data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 			data["fixmedins_code"] = miConfig.Code
-			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+			data["insuplc_admdvs"] = his.InsuplcAdmdvs
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 			data["secret_key"] = miConfig.SecretKey
 			data["sick_code"] = sickConfig.CountryCode
@@ -3649,7 +3677,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 		} else {
 			if miConfig.MdtrtareaAdmvs == "440781" { //
-				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
+				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 			} else {
 				if miConfig.Code == "H15049901371" {
 					//赤峰地区国家医保医疗类别
@@ -3795,7 +3823,7 @@ func (c *HisApiController) GetUploadInfo() {
 				data["dept_code"] = department.Number
 			}
 
-			data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+			data["insuplc_admdvs"] = his.InsuplcAdmdvs
 			data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 			data["secret_key"] = miConfig.SecretKey
 			data["balance_accounts_type"] = strconv.FormatInt(his.BalanceAccountsType, 10)
@@ -3906,7 +3934,7 @@ func (c *HisApiController) GetUploadInfo() {
 						res.Infcode = infocode
 
 					} else {
-						result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), patientPrescription.DoctorId, sickConfig.CountryCode)
+						result, request_log := service.Gdyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), patientPrescription.DoctorId, sickConfig.CountryCode)
 						var dat map[string]interface{}
 						if err := json.Unmarshal([]byte(result), &dat); err == nil {
 							fmt.Println(dat)
@@ -4138,7 +4166,7 @@ func (c *HisApiController) GetUploadInfo() {
 							api := "http://192.168.124.4:9532/" + "hbyb/2207?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 +
+								"&insuplc_admdvs=" + his.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) + "&acct_used_flag=" + acct_used_flag
@@ -4226,7 +4254,7 @@ func (c *HisApiController) GetUploadInfo() {
 							api := "http://192.168.3.111:9532/" + "jsyb/2207?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 +
+								"&insuplc_admdvs=" + his.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) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
@@ -4287,7 +4315,7 @@ func (c *HisApiController) GetUploadInfo() {
 								}
 								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
 							} else {
-								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
 							}
 
 							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
@@ -4538,7 +4566,7 @@ func (c *HisApiController) GetUploadInfo() {
 				api := "http://192.168.124.4:9532/" + "hbyb/2207?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 +
+					"&insuplc_admdvs=" + his.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) + "&acct_used_flag=" + acct_used_flag
@@ -4607,7 +4635,7 @@ func (c *HisApiController) GetUploadInfo() {
 				api := "http://192.168.3.111:9532/" + "jsyb/2207?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 +
+					"&insuplc_admdvs=" + his.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) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber + "&verify_number=" + psn_info.VerifyNumber
@@ -4672,7 +4700,7 @@ func (c *HisApiController) GetUploadInfo() {
 					}
 					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
 				} else {
-					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
 				}
 
 				var dat map[string]interface{}
@@ -5390,7 +5418,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 	var res2 ResultSix
 	var resSix10265 ResultSix10265
 	var time_stamp string
-	if miConfig.InsuplcAdmdvs == "421300" {
+	if miConfig.MdtrtareaAdmvs == "421300" {
 		data := make(map[string]interface{})
 		client := &http.Client{}
 		data["psn_no"] = his.PsnNo
@@ -5439,7 +5467,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			return
 		}
 
-	} else if miConfig.InsuplcAdmdvs == "320921" {
+	} else if miConfig.MdtrtareaAdmvs == "320921" {
 		//江苏地区国家医保医疗类别
 		//职工透析：医疗类别选特殊情况门诊9933
 		//居民血透门慢： 医疗类别选门诊慢病1402
@@ -5469,7 +5497,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["med_type"] = strconv.FormatInt(reg_type, 10)
 		data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
 		data["fixmedins_code"] = miConfig.Code
-		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+		data["insuplc_admdvs"] = his.InsuplcAdmdvs
 		data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 		data["secret_key"] = miConfig.SecretKey
 		data["sick_code"] = sickConfig.CountryCode
@@ -5524,7 +5552,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 	} else {
 		var result string
 		var requestLog string
-		if miConfig.InsuplcAdmdvs == "440781" { //
+		if miConfig.MdtrtareaAdmvs == "440781" { //
 			result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 		} else {
 			if miConfig.Code == "H15049901371" {
@@ -5547,7 +5575,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 				}
 				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, med_type, doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 			} else {
-				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
+				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 
 			}
 			saveLog(result, requestLog, "2203", "上传就诊信息")
@@ -5655,7 +5683,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			data["dept_code"] = department.Number
 		}
 
-		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
+		data["insuplc_admdvs"] = his.InsuplcAdmdvs
 		data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 		data["secret_key"] = miConfig.SecretKey
 		data["url"] = miConfig.Url
@@ -5967,7 +5995,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						api := "http://192.168.124.4:9532/" + "hbyb/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 +
+							"&insuplc_admdvs=" + his.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)
@@ -6033,7 +6061,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						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 +
+							"&insuplc_admdvs=" + his.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 + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
@@ -6098,7 +6126,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 							}
 							result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, 0, 0, 0, 0, his.IdType)
 						} else {
-							result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+							result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
 						}
 
 						var dat map[string]interface{}
@@ -6593,7 +6621,7 @@ func (c *HisApiController) Refund() {
 				infocode, _ := strconv.ParseInt(resSixteen10265.Infcode, 10, 64)
 				res.Infcode = infocode
 			} else {
-				result, src_resquest = service.Gdyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+				result, src_resquest = service.Gdyb2208(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
 					fmt.Println(dat)
@@ -6621,7 +6649,7 @@ func (c *HisApiController) Refund() {
 
 				api3 := "http://192.168.124.4:9532/" + "hbyb/2205?psn_no=" + order.PsnNo +
 					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 				resp3, requestErr3 := http.Get(api3)
 				if requestErr3 != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -6654,7 +6682,7 @@ func (c *HisApiController) Refund() {
 
 				api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
 					"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
 				resp3, requestErr3 := http.Get(api3)
 				if requestErr3 != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -6717,7 +6745,7 @@ func (c *HisApiController) Refund() {
 					infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
 					res2.Infcode = infocode
 				} else {
-					result2, src_request := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
+					result2, src_request := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 						fmt.Println(dat)
@@ -6802,7 +6830,7 @@ func (c *HisApiController) RefundNumber() {
 
 			api3 := "http://192.168.124.4:9532/" + "hbyb/2202?psn_no=" + his.PsnNo +
 				"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp3, requestErr3 := http.Get(api3)
 			if requestErr3 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -6836,7 +6864,7 @@ func (c *HisApiController) RefundNumber() {
 
 			api3 := "http://192.168.3.111:9532/" + "jsyb/2202?psn_no=" + his.PsnNo +
 				"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
 			resp3, requestErr3 := http.Get(api3)
 			if requestErr3 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -6883,7 +6911,7 @@ func (c *HisApiController) RefundNumber() {
 			} else {
 				api3 = "http://127.0.0.1:9532/" + "gdyb/three?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&ipt_otp_no=" + his.IptOtpNo + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+					"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 
 			}
 
@@ -7007,7 +7035,7 @@ func (c *HisApiController) RefundDetail() {
 		if miConfig.MdtrtareaAdmvs == "421300" {
 			api3 := "http://192.168.124.4:9532/" + "hbyb/2205?psn_no=" + order.PsnNo +
 				"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp3, requestErr3 := http.Get(api3)
 			if requestErr3 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -7051,7 +7079,7 @@ func (c *HisApiController) RefundDetail() {
 
 			api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
 				"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
 			resp3, requestErr3 := http.Get(api3)
 			if requestErr3 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -7101,7 +7129,7 @@ func (c *HisApiController) RefundDetail() {
 		} else {
 			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
 				"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp2, requestErr2 := http.Get(api2)
 			if requestErr2 != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -7184,51 +7212,109 @@ func (c *HisApiController) GetCheckAccount() {
 	} else {
 		user_name = role.UserName
 	}
+	var res ResultEight
+	var res10188 ResultEightFor10188
 	if config.IsOpen == 1 {
-		api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
-			"insutype=" + insutype +
-			"&clr_type=" + clr_type +
-			"&setl_optins=" + clr_org +
-			"&stmt_begndate=" + start_time +
-			"&stm_enddate=" + end_time +
-			"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
-			"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
-			"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
-			"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
-			"&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
-			"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
-			"&secret_key=" + miConfig.SecretKey +
-			"&org_name=" + miConfig.OrgName +
-			"&doctor=" + user_name
-
-		fmt.Println(api)
-		resp, requestErr := http.Get(api)
-		if requestErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		fmt.Println(body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(respJSON)
-		var res ResultEight
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		if miConfig.MdtrtareaAdmvs == "320921" {
+			api := "http://192.168.3.111:9532/" + "jsyb/3201" +
+				"insutype=" + insutype +
+				"&clr_type=" + clr_type +
+				"&setl_optins=" + clr_org +
+				"&stmt_begndate=" + start_time +
+				"&stm_enddate=" + end_time +
+				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
+				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
+				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
+				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+				"&secret_key=" + miConfig.SecretKey +
+				"&org_name=" + miConfig.OrgName +
+				"&doctor=" + user_name +
+				"&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
+
+			fmt.Println(api)
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			fmt.Println(body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(respJSON)
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			res.InfRefmsgid = res10188.InfRefmsgid
+			res.Output = res10188.Output
+			res.ErrMsg = res10188.ErrMsg
+			res.Cainfo = res10188.Cainfo
+			res.WarnMsg = res10188.WarnMsg
+			infocode, _ := strconv.ParseInt(res10188.Infcode, 10, 64)
+			res.Infcode = infocode
+
+		} else {
+			api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
+				"insutype=" + insutype +
+				"&clr_type=" + clr_type +
+				"&setl_optins=" + clr_org +
+				"&stmt_begndate=" + start_time +
+				"&stm_enddate=" + end_time +
+				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
+				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
+				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
+				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+				"&secret_key=" + miConfig.SecretKey +
+				"&org_name=" + miConfig.OrgName +
+				"&doctor=" + user_name
+
+			fmt.Println(api)
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			fmt.Println(body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(respJSON)
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		}
+
 		if res.Infcode == 0 {
 			if res.Output.Stmtinfo.StmtRslt == "0" {
 				micc := &models.MedicalInsuranceCostCompare{
@@ -9358,10 +9444,15 @@ func (c *HisApiController) GetAllopatry() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	fmt.Println(res2)
-
-	//result2, _ := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res2)
-	//fmt.Println(result2)
+	if res2.Infcode == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"data": res2.Output.Data,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 
 }
 
@@ -9372,6 +9463,7 @@ func (c *HisApiController) GetAllopatry() {
 //	adminUser := c.GetAdminUserInfo()
 //	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 //	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+//
 //	result, _ := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month)
 //	var dat map[string]interface{}
 //	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/zh/zh_his_api_controller.go

@@ -585,6 +585,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	diagnosis_ids := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	start_time := c.GetString("start_time")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	balance_accounts_type, _ := c.GetInt64("balance_accounts_type")
 
 	social_type, _ := c.GetInt64("social_type")
@@ -687,7 +688,6 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	json.Unmarshal([]byte(infoStr), &rf)
 	var insutypes []*ResultFive
 	var insutype string
-	var insuplc_admdvs string
 	var is390 int = 0
 	var is310 int = 0
 
@@ -726,11 +726,11 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 	if len(insutypes) == 2 {
 		insutype = strconv.FormatInt(social_type, 10)
 	}
-	for _, item := range rf {
-		if item.Insutype == insutype {
-			insuplc_admdvs = item.InsuplcAdmdvs
-		}
-	}
+	//for _, item := range rf {
+	//	if item.Insutype == insutype {
+	//		insuplc_admdvs = item.InsuplcAdmdvs
+	//	}
+	//}
 
 	if res2.Infcode == 0 {
 
@@ -768,6 +768,10 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		//	insutype = "310"
 		//}
 
+		if len(insuplc_admdvs) == 0 {
+			insuplc_admdvs = miConfig.InsuplcAdmdvs
+		}
+
 		timestamp := time.Now().Unix()
 		tempTime := time.Unix(timestamp, 0)
 		timeFormat := tempTime.Format("20060102150405")
@@ -1509,7 +1513,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			//	return
 			//}
-			resultLog, requestLog := service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string))
+			resultLog, requestLog := service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string))
 			saveLog(resultLog, requestLog, "2301", "上传明细")
 
 			var dat map[string]interface{}

main.go

@@ -15,18 +15,775 @@ import (
 )
 
 func init() {
-	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
+	//service.ConnectDB()
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
 
+	//UploadSettleList(org_id)
 }
 func main() {
 	beego.Run()
 }
 
+type CustomFundPay struct {
+	FundPayType string  `json:"fund_pay_type"`
+	FundPayamt  float64 `json:"fund_payamt"`
+}
+
+type ResultSeventeen struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		SetlListId string `json:"setl_list_id"`
+	} `json:"output"`
+	RefmsgTime  string `json:"refmsg_time"`
+	RespondTime string `json:"respond_time"`
+	Signtype    string `json:"signtype"`
+	WarnInfo    string `json:"warn_info"`
+}
+
+//func UploadSettleList(org_id int64) {
+//	orders, _ := service.GetAllHisOrder(org_id)
+//	for _, item := range orders {
+//		order_id := item.ID
+//		order, _ := service.GetHisOrderByIDTwo(order_id)
+//		roles, _ := service.GetDoctorListTwo(org_id)
+//		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
+//		admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
+//		curRoles, _ := service.GetAdminUserInfo(org_id)
+//		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
+//		miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+//
+//		result, _ := service.GetHisFundSettleListResult(order_id)
+//		//判断是否已经上传过医保，上传过就跳过该条记录
+//		if result.ID > 0 {
+//			continue
+//		}
+//
+//		if his.BalanceAccountsType == 2 {
+//			continue
+//		}
+//
+//		struct4101 := service.Struct4101{
+//			PsnNo:          order.PsnNo,
+//			MdtrtId:        order.MdtrtId,
+//			SetlId:         order.SetlId,
+//			PsnName:        order.PsnName,
+//			Gend:           order.Gend,
+//			Brdy:           his.Brdy,
+//			Age:            his.Age,
+//			Naty:           order.Naty,
+//			PatnCertType:   "01",
+//			Certno:         order.Certno,
+//			Prfs:           "90",
+//			ConerName:      roles[0].UserName,
+//			PatnRlts:       "99",
+//			ConerAddr:      miConfig.OrgName,
+//			ConerTel:       admin.Mobile,
+//			HiType:         order.Insutype,
+//			Insuplc:        his.InsuplcAdmdvs,
+//			MaindiagFlag:   "1",
+//			BillCode:       order.FaPiaoCode,
+//			BillNo:         order.FaPiaoNumber,
+//			BizSn:          order.Number,
+//			PsnSelfPay:     order.PsnPartAmt,
+//			PsnOwnPay:      order.PsnPartAmt,
+//			AcctPay:        order.AcctPay,
+//			PsnCashpay:     order.PsnCashPay,
+//			HiPaymtd:       "1",
+//			Hsorg:          his.InsuplcAdmdvs,
+//			HsorgOpter:     his.InsuplcAdmdvs,
+//			MedinsFillPsn:  curRoles.UserName,
+//			MedinsFillDept: depart.Name,
+//			IptMedType:     "2",
+//		}
+//		struct4101.SetlBegnDate = order.SetlTime
+//		struct4101.SetlEndDate = order.SetlTime
+//		//if order.SettleType == 1 {
+//		//	t := time.Unix(int64(order.SettleAccountsDate), 0)
+//		//	dateStr := t.Format("2006-01-02")
+//		//	struct4101.SetlBegnDate = dateStr
+//		//	struct4101.SetlEndDate = dateStr
+//		//} else {
+//		//	t := time.Unix(int64(order.SettleStartTime), 0)
+//		//	t2 := time.Unix(int64(order.SettleEndTime), 0)
+//		//	dateStartStr := t.Format("2006-01-02")
+//		//	dateEndStr := t2.Format("2006-01-02")
+//		//	struct4101.SetlBegnDate = dateStartStr
+//		//	struct4101.SetlEndDate = dateEndStr
+//		//}
+//
+//		var rf []CustomFundPay
+//		json.Unmarshal([]byte(order.SetlDetail), &rf)
+//
+//		var tempFunPays []service.CustomStruct
+//		var tempFunPay610100 service.CustomStruct
+//
+//		for _, item := range rf {
+//			if item.FundPayType == "610100" {
+//				tempFunPay610100.FundPayamt, _ = decimal.NewFromFloat(tempFunPay610100.FundPayamt).Add(decimal.NewFromFloat(item.FundPayamt)).Float64()
+//				tempFunPay610100.FundPayType = item.FundPayType
+//			} else {
+//				var tempFunPay service.CustomStruct
+//				tempFunPay.FundPayamt = item.FundPayamt
+//				tempFunPay.FundPayType = item.FundPayType
+//				tempFunPays = append(tempFunPays, tempFunPay)
+//			}
+//		}
+//		tempFunPays = append(tempFunPays, tempFunPay610100)
+//		struct4101.CustomStruct = tempFunPays
+//
+//		var tempOpspdiseinfos []service.OpspdiseinfoStruct
+//		var tempOpspdiseinfo2 service.OpspdiseinfoStruct
+//		//sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+//
+//		diagnosis_ids := strings.Split(his.Diagnosis, ",")
+//		var config []*models.HisXtDiagnoseConfig
+//		for _, item := range diagnosis_ids {
+//			id, _ := strconv.ParseInt(item, 10, 64)
+//			diagnosisConfig, _ := service.FindDiagnoseById(id)
+//			config = append(config, &diagnosisConfig)
+//		}
+//
+//		for _, item := range config {
+//			var tempOpspdiseinfo service.OpspdiseinfoStruct
+//			tempOpspdiseinfo.DiagCode = item.CountryCode
+//			tempOpspdiseinfo.DiagName = item.CountryContentName
+//			tempOpspdiseinfo.MaindiagFlag = "1"
+//			tempOpspdiseinfo.OprnOprtCode = ""
+//			tempOpspdiseinfo.OprnOprtName = ""
+//			tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
+//		}
+//
+//		sickConfigTwo, _ := service.FindSickById(his.SickType)
+//		tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
+//		tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
+//		tempOpspdiseinfo2.MaindiagFlag = "2"
+//		tempOpspdiseinfo2.OprnOprtCode = ""
+//		tempOpspdiseinfo2.OprnOprtName = ""
+//		tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+//		struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
+//
+//		var iteminfo service.IteminfoStruct
+//
+//		var bedCostTotal float64 = 0         //床位总费
+//		var bedCostSelfTotal float64 = 0     //床位自费
+//		var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+//
+//		var examineCostTotal float64 = 0         //诊查总费
+//		var examineCostSelfTotal float64 = 0     //诊查自费
+//		var examineCostPartSelfTotal float64 = 0 //诊查部分项目自费
+//
+//		var nursingCostTotal float64 = 0         //护理总费
+//		var nursingCostSelfTotal float64 = 0     //护理自费
+//		var nursingCostPartSelfTotal float64 = 0 //护理部分项目自费
+//
+//		var chineseMedicineCostTotal float64 = 0         //中成药
+//		var chineseMedicineCostSelfTotal float64 = 0     //中成药
+//		var chineseMedicineCostPartSelfTotal float64 = 0 //中成药
+//
+//		var commonlyTreatmentCostTotal float64 = 0         //一般诊疗费
+//		var commonlyTreatmentCostSelfTotal float64 = 0     //一般诊疗费
+//		var commonlyTreatmentCostPartSelfTotal float64 = 0 //一般诊疗费
+//
+//		var registerCostTotal float64 = 0     //一般诊疗费
+//		var registerCostSelfTotal float64 = 0 //一般诊疗费
+//		var registerPartSelfTotal float64 = 0 //一般诊疗费
+//
+//		var operationCostTotal float64 = 0         //手术费
+//		var operationCostSelfTotal float64 = 0     //手术费
+//		var operationCostPartSelfTotal float64 = 0 //手术费
+//
+//		var otherCostTotal float64 = 0         //其他费用
+//		var otherCostSelfTotal float64 = 0     //其他费用
+//		var otherCostPartSelfTotal float64 = 0 //其他费用
+//
+//		var materialCostTotal float64 = 0         //材料费
+//		var materialCostSelfTotal float64 = 0     //材料费
+//		var materialCostPartSelfTotal float64 = 0 //材料费
+//
+//		var westernMedicineCostTotal float64 = 0         //西药费
+//		var westernMedicineCostSelfTotal float64 = 0     //西药费
+//		var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+//
+//		var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+//		var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+//		var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+//
+//		var checkCostTotal float64 = 0         //检查费
+//		var checkCostSelfTotal float64 = 0     //检查费
+//		var checkCostPartSelfTotal float64 = 0 //检查费
+//
+//		var laboratoryCostTotal float64 = 0         //化验费
+//		var laboratoryCostSelfTotal float64 = 0     //化验费
+//		var laboratoryCostPartSelfTotal float64 = 0 //化验费
+//
+//		var treatCostTotal float64 = 0         //治疗费用
+//		var treatCostSelfTotal float64 = 0     //治疗费用
+//		var treatCostPartSelfTotal float64 = 0 //治疗费用
+//
+//		decimal.DivisionPrecision = 2
+//
+//		var bed_fulamt_ownpay_amt float64 = 0
+//
+//		var examine_fulamt_ownpay_amt float64 = 0
+//
+//		var nursing_fulamt_ownpay_amt float64 = 0
+//
+//		var chinese_medicine_fulamt_ownpay_amt float64 = 0
+//
+//		var commonly_treatment_fulamt_ownpay_amt float64 = 0
+//
+//		var register_fulamt_ownpay_amt float64 = 0
+//
+//		var operation_fulamt_ownpay_amt float64 = 0
+//		var other_fulamt_ownpay_amt float64 = 0
+//		var westernMedicine_fulamt_ownpay_amt float64 = 0
+//		var chineseTraditional_fulamt_ownpay_amt float64 = 0
+//		var check_fulamt_ownpay_amt float64 = 0
+//		var material_fulamt_ownpay_amt float64 = 0
+//		var laboratory_fulamt_ownpay_amt float64 = 0
+//		var treat_fulamt_ownpay_amt float64 = 0
+//
+//		var bed_claa_sunmfee float64 = 0
+//		var bed_clab_amt float64 = 0
+//		var bed_other_amt float64 = 0
+//
+//		var examine_claa_sunmfee float64 = 0
+//		var examine_clab_amt float64 = 0
+//		var examine_other_amt float64 = 0
+//
+//		var nursing_claa_sunmfee float64 = 0
+//		var nursing_clab_amt float64 = 0
+//		var nursing_other_amt float64 = 0
+//
+//		var chinese_medicine_claa_sunmfee float64 = 0
+//		var chinese_medicine_clab_amt float64 = 0
+//		var chinese_medicine_other_amt float64 = 0
+//
+//		var commonly_treatment_claa_sunmfee float64 = 0
+//		var commonly_treatment_clab_amt float64 = 0
+//		var commonly_treatment_other_amt float64 = 0
+//
+//		var operation_claa_sunmfee float64 = 0
+//		var operation_clab_amt float64 = 0
+//		var operation_other_amt float64 = 0
+//
+//		var other_claa_sunmfee float64 = 0
+//		var other_clab_amt float64 = 0
+//		var other_other_amt float64 = 0
+//
+//		var westernMedicine_claa_sunmfee float64 = 0
+//		var westernMedicine_clab_amt float64 = 0
+//		var westernMedicine_other_amt float64 = 0
+//
+//		var chineseTraditional_claa_sunmfee float64 = 0
+//		var chineseTraditional_clab_amt float64 = 0
+//		var chineseTraditional_other_amt float64 = 0
+//
+//		var check_claa_sunmfee float64 = 0
+//		var check_clab_amt float64 = 0
+//		var check_other_amt float64 = 0
+//
+//		var material_claa_sunmfee float64 = 0
+//		var material_clab_amt float64 = 0
+//		var material_other_amt float64 = 0
+//
+//		var laboratory_claa_sunmfee float64 = 0
+//		var laboratory_clab_amt float64 = 0
+//		var laboratory_other_amt float64 = 0
+//
+//		var treat_claa_sunmfee float64 = 0
+//		var treat_clab_amt float64 = 0
+//		var treat_other_amt float64 = 0
+//
+//		var register_claa_sunmfee float64 = 0
+//		var register_clab_amt float64 = 0
+//		var register_other_amt float64 = 0
+//
+//		for _, item := range order.HisOrderInfo {
+//			if item.MedChrgitmType == "01" { //床位费
+//				bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				bed_fulamt_ownpay_amt, _ = decimal.NewFromFloat(bed_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//					bed_claa_sunmfee, _ = decimal.NewFromFloat(bed_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.ChrgitmLv == "2" {
+//					bed_clab_amt, _ = decimal.NewFromFloat(bed_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					bed_other_amt, _ = decimal.NewFromFloat(bed_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//
+//			}
+//
+//			if item.MedChrgitmType == "02" { //诊查
+//				examineCostTotal, _ = decimal.NewFromFloat(examineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				examineCostSelfTotal, _ = decimal.NewFromFloat(examineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				examineCostPartSelfTotal, _ = decimal.NewFromFloat(examineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				examine_fulamt_ownpay_amt, _ = decimal.NewFromFloat(examine_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//					examine_claa_sunmfee, _ = decimal.NewFromFloat(examine_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.ChrgitmLv == "2" {
+//					examine_clab_amt, _ = decimal.NewFromFloat(examine_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					examine_other_amt, _ = decimal.NewFromFloat(examine_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//
+//			}
+//
+//			if item.MedChrgitmType == "03" { //检查费
+//				checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				check_fulamt_ownpay_amt, _ = decimal.NewFromFloat(check_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//
+//					check_claa_sunmfee, _ = decimal.NewFromFloat(check_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					check_clab_amt, _ = decimal.NewFromFloat(check_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					check_other_amt, _ = decimal.NewFromFloat(check_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "04" { //化验费
+//				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()
+//				laboratory_fulamt_ownpay_amt, _ = decimal.NewFromFloat(laboratory_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//
+//					laboratory_claa_sunmfee, _ = decimal.NewFromFloat(laboratory_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					laboratory_clab_amt, _ = decimal.NewFromFloat(laboratory_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					laboratory_other_amt, _ = decimal.NewFromFloat(laboratory_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "05" { //治疗费
+//				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()
+//				treat_fulamt_ownpay_amt, _ = decimal.NewFromFloat(treat_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//
+//					treat_claa_sunmfee, _ = decimal.NewFromFloat(treat_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					treat_clab_amt, _ = decimal.NewFromFloat(treat_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					treat_other_amt, _ = decimal.NewFromFloat(treat_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "06" { //手术费
+//				operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				operation_fulamt_ownpay_amt, _ = decimal.NewFromFloat(operation_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//
+//				if item.ChrgitmLv == "1" {
+//
+//					operation_claa_sunmfee, _ = decimal.NewFromFloat(operation_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					operation_clab_amt, _ = decimal.NewFromFloat(operation_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					operation_other_amt, _ = decimal.NewFromFloat(operation_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "07" { //手术费
+//				nursingCostTotal, _ = decimal.NewFromFloat(nursingCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				nursingCostSelfTotal, _ = decimal.NewFromFloat(nursingCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				nursingCostPartSelfTotal, _ = decimal.NewFromFloat(nursingCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				nursing_fulamt_ownpay_amt, _ = decimal.NewFromFloat(nursing_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//
+//				if item.ChrgitmLv == "1" {
+//
+//					nursing_claa_sunmfee, _ = decimal.NewFromFloat(nursing_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					nursing_clab_amt, _ = decimal.NewFromFloat(nursing_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					nursing_other_amt, _ = decimal.NewFromFloat(nursing_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "08" { //材料费
+//				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				material_fulamt_ownpay_amt, _ = decimal.NewFromFloat(material_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//
+//					material_claa_sunmfee, _ = decimal.NewFromFloat(material_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					material_clab_amt, _ = decimal.NewFromFloat(material_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					material_other_amt, _ = decimal.NewFromFloat(material_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//			if item.MedChrgitmType == "09" { //西药费
+//				westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				westernMedicine_fulamt_ownpay_amt, _ = decimal.NewFromFloat(westernMedicine_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//					westernMedicine_claa_sunmfee, _ = decimal.NewFromFloat(westernMedicine_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.ChrgitmLv == "2" {
+//					westernMedicine_clab_amt, _ = decimal.NewFromFloat(westernMedicine_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				}
+//				if item.ChrgitmLv == "3" {
+//					westernMedicine_other_amt, _ = decimal.NewFromFloat(westernMedicine_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//			if item.MedChrgitmType == "10" { //中药饮片
+//				chineseMedicineCostTotal, _ = decimal.NewFromFloat(chineseMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				chineseMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				chineseMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				chinese_medicine_fulamt_ownpay_amt, _ = decimal.NewFromFloat(chinese_medicine_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//					chinese_medicine_claa_sunmfee, _ = decimal.NewFromFloat(chinese_medicine_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				}
+//				if item.ChrgitmLv == "2" {
+//					chinese_medicine_clab_amt, _ = decimal.NewFromFloat(chinese_medicine_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				}
+//				if item.ChrgitmLv == "3" {
+//					chinese_medicine_other_amt, _ = decimal.NewFromFloat(chinese_medicine_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "11" { //中成费
+//				chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				chineseTraditional_fulamt_ownpay_amt, _ = decimal.NewFromFloat(chineseTraditional_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//
+//					chineseTraditional_claa_sunmfee, _ = decimal.NewFromFloat(chineseTraditional_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					chineseTraditional_clab_amt, _ = decimal.NewFromFloat(chineseTraditional_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					chineseTraditional_other_amt, _ = decimal.NewFromFloat(chineseTraditional_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "12" { //中成费
+//				commonlyTreatmentCostTotal, _ = decimal.NewFromFloat(commonlyTreatmentCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				commonlyTreatmentCostSelfTotal, _ = decimal.NewFromFloat(commonlyTreatmentCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				commonlyTreatmentCostPartSelfTotal, _ = decimal.NewFromFloat(commonlyTreatmentCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				commonly_treatment_fulamt_ownpay_amt, _ = decimal.NewFromFloat(commonly_treatment_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//
+//					commonly_treatment_claa_sunmfee, _ = decimal.NewFromFloat(commonly_treatment_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					commonly_treatment_clab_amt, _ = decimal.NewFromFloat(commonly_treatment_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					commonly_treatment_other_amt, _ = decimal.NewFromFloat(commonly_treatment_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "13" { //中成费
+//				registerCostTotal, _ = decimal.NewFromFloat(registerCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				registerCostSelfTotal, _ = decimal.NewFromFloat(registerCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				registerPartSelfTotal, _ = decimal.NewFromFloat(registerPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				register_fulamt_ownpay_amt, _ = decimal.NewFromFloat(register_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//
+//					register_claa_sunmfee, _ = decimal.NewFromFloat(register_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					register_clab_amt, _ = decimal.NewFromFloat(register_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					register_other_amt, _ = decimal.NewFromFloat(register_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//			if item.MedChrgitmType == "14" { //其他费
+//				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//				other_fulamt_ownpay_amt, _ = decimal.NewFromFloat(other_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+//				if item.ChrgitmLv == "1" {
+//					other_claa_sunmfee, _ = decimal.NewFromFloat(other_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "2" {
+//					other_clab_amt, _ = decimal.NewFromFloat(other_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+//
+//				}
+//				if item.ChrgitmLv == "3" {
+//					other_other_amt, _ = decimal.NewFromFloat(other_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+//				}
+//			}
+//
+//		}
+//
+//		var iteminfoStructs []service.IteminfoStruct
+//
+//		if bedCostTotal != 0 {
+//			iteminfo.MedChrgitm = "01"
+//			iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
+//			iteminfo.Amt = bedCostTotal
+//			iteminfo.ClaaSumfee = bed_claa_sunmfee
+//			iteminfo.ClabAmt = bed_clab_amt
+//			iteminfo.OthAmt = bed_other_amt
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//		}
+//
+//		if examineCostTotal != 0 {
+//			iteminfo.MedChrgitm = "02"
+//			iteminfo.FulamtOwnpayAmt = examine_fulamt_ownpay_amt
+//			iteminfo.Amt = examineCostTotal
+//			iteminfo.ClaaSumfee = examine_claa_sunmfee
+//			iteminfo.ClabAmt = examine_clab_amt
+//			iteminfo.OthAmt = examine_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//		}
+//
+//		if checkCostTotal != 0 {
+//			iteminfo.MedChrgitm = "03"
+//			iteminfo.FulamtOwnpayAmt = check_fulamt_ownpay_amt
+//			iteminfo.Amt = checkCostTotal
+//			iteminfo.ClaaSumfee = check_claa_sunmfee
+//			iteminfo.ClabAmt = check_clab_amt
+//			iteminfo.OthAmt = check_other_amt
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//		}
+//
+//		if laboratoryCostTotal != 0 {
+//			iteminfo.MedChrgitm = "04"
+//			iteminfo.FulamtOwnpayAmt = laboratory_fulamt_ownpay_amt
+//			iteminfo.Amt = laboratoryCostTotal
+//			iteminfo.ClaaSumfee = laboratory_claa_sunmfee
+//			iteminfo.ClabAmt = laboratory_clab_amt
+//			iteminfo.OthAmt = laboratory_other_amt
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//
+//		}
+//
+//		if treatCostTotal != 0 {
+//			iteminfo.MedChrgitm = "05"
+//			iteminfo.FulamtOwnpayAmt = treat_fulamt_ownpay_amt
+//			iteminfo.Amt = treatCostTotal
+//			iteminfo.ClaaSumfee = treat_claa_sunmfee
+//			iteminfo.ClabAmt = treat_clab_amt
+//			iteminfo.OthAmt = treat_other_amt
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//			//(struct4101.IteminfoStruct, iteminfo)
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//		}
+//
+//		if operationCostTotal != 0 {
+//			iteminfo.MedChrgitm = "06"
+//			iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
+//			iteminfo.Amt = operationCostTotal
+//			iteminfo.ClaaSumfee = operation_claa_sunmfee
+//			iteminfo.ClabAmt = operation_clab_amt
+//			iteminfo.OthAmt = operation_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//		}
+//
+//		if nursingCostTotal != 0 {
+//			iteminfo.MedChrgitm = "07"
+//			iteminfo.FulamtOwnpayAmt = nursing_fulamt_ownpay_amt
+//			iteminfo.Amt = nursingCostTotal
+//			iteminfo.ClaaSumfee = nursing_claa_sunmfee
+//			iteminfo.ClabAmt = nursing_clab_amt
+//			iteminfo.OthAmt = nursing_other_amt
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//		}
+//
+//		if materialCostTotal != 0 {
+//			iteminfo.MedChrgitm = "08"
+//			iteminfo.FulamtOwnpayAmt = material_fulamt_ownpay_amt
+//			iteminfo.Amt = materialCostTotal
+//			iteminfo.ClaaSumfee = material_claa_sunmfee
+//			iteminfo.ClabAmt = material_clab_amt
+//			iteminfo.OthAmt = material_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//		}
+//
+//		if westernMedicineCostTotal != 0 {
+//			iteminfo.MedChrgitm = "09"
+//			iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
+//			iteminfo.Amt = westernMedicineCostTotal
+//			iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
+//			iteminfo.ClabAmt = westernMedicine_clab_amt
+//			iteminfo.OthAmt = westernMedicine_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//		}
+//
+//		if chineseMedicineCostTotal != 0 {
+//			iteminfo.MedChrgitm = "10"
+//			iteminfo.FulamtOwnpayAmt = chinese_medicine_fulamt_ownpay_amt
+//			iteminfo.Amt = chineseMedicineCostTotal
+//			iteminfo.ClaaSumfee = chinese_medicine_claa_sunmfee
+//			iteminfo.ClabAmt = chinese_medicine_clab_amt
+//			iteminfo.OthAmt = chinese_medicine_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//		}
+//
+//		if chineseTraditionalMedicineCostTotal != 0 {
+//			iteminfo.MedChrgitm = "11"
+//			iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
+//			iteminfo.Amt = westernMedicineCostTotal
+//			iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
+//			iteminfo.ClabAmt = westernMedicine_clab_amt
+//			iteminfo.OthAmt = westernMedicine_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//		}
+//
+//		if commonlyTreatmentCostTotal != 0 {
+//			iteminfo.MedChrgitm = "12"
+//			iteminfo.FulamtOwnpayAmt = commonly_treatment_fulamt_ownpay_amt
+//			iteminfo.Amt = commonlyTreatmentCostTotal
+//			iteminfo.ClaaSumfee = commonly_treatment_claa_sunmfee
+//			iteminfo.ClabAmt = commonly_treatment_clab_amt
+//			iteminfo.OthAmt = commonly_treatment_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//		}
+//
+//		if registerCostTotal != 0 {
+//			iteminfo.MedChrgitm = "13"
+//			iteminfo.FulamtOwnpayAmt = register_fulamt_ownpay_amt
+//			iteminfo.Amt = registerCostTotal
+//			iteminfo.ClaaSumfee = register_claa_sunmfee
+//			iteminfo.ClabAmt = register_clab_amt
+//			iteminfo.OthAmt = register_other_amt
+//			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//		}
+//
+//		if otherCostTotal != 0 {
+//			iteminfo.MedChrgitm = "14"
+//			iteminfo.FulamtOwnpayAmt = other_fulamt_ownpay_amt
+//			iteminfo.Amt = otherCostTotal
+//			iteminfo.ClaaSumfee = other_claa_sunmfee
+//			iteminfo.ClabAmt = other_clab_amt
+//			iteminfo.OthAmt = other_other_amt
+//			iteminfoStructs = append(iteminfoStructs, iteminfo)
+//
+//		}
+//		struct4101.IteminfoStruct = iteminfoStructs
+//		struct4101.Ntly = "中国"
+//		struct4101.AdmCaty = "A03.06"
+//		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
+//		fmt.Println(result)
+//
+//		var dat map[string]interface{}
+//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//			fmt.Println(dat)
+//		} else {
+//			fmt.Println(err)
+//		}
+//		userJSONBytes, _ := json.Marshal(dat)
+//		var res ResultSeventeen
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			errlog := &models.HisOrderError{
+//				UserOrgId: org_id,
+//				Ctime:     time.Now().Unix(),
+//				Mtime:     time.Now().Unix(),
+//				ErrMsg:    res.ErrMsg + "解析失败",
+//				Status:    1,
+//				PatientId: order_id,
+//				Stage:     120,
+//			}
+//			service.CreateErrMsgLog(errlog)
+//			continue
+//		}
+//
+//		if res.Infcode != 0 {
+//			errlog := &models.HisOrderError{
+//				UserOrgId: org_id,
+//				Ctime:     time.Now().Unix(),
+//				Mtime:     time.Now().Unix(),
+//				ErrMsg:    res.ErrMsg,
+//				Status:    1,
+//				PatientId: order_id,
+//				Stage:     200,
+//			}
+//			service.CreateErrMsgLog(errlog)
+//			continue
+//		} else {
+//			hisFundSettleListResult := &models.HisFundSettleListResult{
+//				Number:    res.Output.SetlListId,
+//				Status:    1,
+//				Ctime:     time.Now().Unix(),
+//				Mtime:     time.Now().Unix(),
+//				UserOrgId: org_id,
+//				IsUpload:  1,
+//				OrderId:   order_id,
+//			}
+//			service.CreateUploadRecord(hisFundSettleListResult)
+//			continue
+//		}
+//	}
+//}
+
 func CreateLog(miConfig models.MedicalInsuranceOrgConfig) {
 	Mkdir(miConfig.OrgName + "日志")
 	//org_id,_ := beego.AppConfig.Int("org_id")

models/gdyb_models.go

@@ -41,3 +41,23 @@ type GdybPsnNcdsRecord struct {
 func (GdybPsnNcdsRecord) TableName() string {
 	return "gdyb_psn_ncds_record"
 }
+
+type HisYidiClearRecord struct {
+	ID              int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime           int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status          int64   `gorm:"column:status" json:"status" form:"status"`
+	Certno          string  `gorm:"column:certno" json:"certno" form:"certno"`
+	MdtrtId         string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	MdtrtSetlTime   string  `gorm:"column:mdtrt_setl_time" json:"mdtrt_setl_time" form:"mdtrt_setl_time"`
+	SetlSn          string  `gorm:"column:setl_sn" json:"setl_sn" form:"setl_sn"`
+	MedfeeSumant    float64 `gorm:"column:medfee_sumant" json:"medfee_sumant" form:"medfee_sumant"`
+	OptinsPaySumamt float64 `gorm:"column:optins_pay_sumamt" json:"optins_pay_sumamt" form:"optins_pay_sumamt"`
+	CnfmFlag        int64   `gorm:"column:cnfm_flag" json:"cnfm_flag" form:"cnfm_flag"`
+	MsgId           string  `gorm:"column:msg_id" json:"msg_id" form:"msg_id"`
+}
+
+func (HisYidiClearRecord) TableName() string {
+	return "his_yidi_clear_record"
+}

service/his_service.go

@@ -746,6 +746,11 @@ func GetAdminUserInfoByID(org_id int64, admin_user_id int64) (role models.UserAd
 	return
 }
 
+func GetAdminUserInfo(org_id int64) (role models.UserAdminRole, err error) {
+	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1", org_id).First(&role).Error
+	return
+}
+
 func GetHisOrderTwo(user_org_id int64, number string, patient_id int64) (order models.HisOrder, err error) {
 	err = readDb.Model(&HisOrder{}).Where("user_org_id = ? AND patient_id = ? AND number=?", user_org_id, patient_id, number).
 		First(&order).Error
@@ -1393,3 +1398,9 @@ func UpdataHospitalOrderStatus(number string, user_org_id int64) (err error) {
 	return
 
 }
+
+func GetHisFundSettleListResult(order_id int64) (result models.HisFundSettleListResult, err error) {
+	db := readDb.Model(&models.HisFundSettleListResult{})
+	err = db.Where("order_id = ? AND status = 1", order_id).First(&result).Error
+	return
+}

service/jsyb_service.go

@@ -644,8 +644,6 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		return err.Error(), ""
 	}
 	request_url = request_url + "2207"
-	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
-
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 
 }
@@ -911,3 +909,34 @@ func Jsyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	request_url = request_url + "2503"
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
 }
+
+func Jsyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3201"                       // 交易编码
+	inputData["insutype"] = insutype                     // 险种
+	inputData["clr_type"] = clr_type                     // 就诊 ID（来自2201接口返回）
+	inputData["setl_optins"] = setl_optins               // 结算经办机构
+	inputData["stmt_begndate"] = stmt_begndate           // 对帐开始时间
+	inputData["stmt_enddate"] = stmt_enddate             //对帐结束时间
+	inputData["medfee_sumamt"] = medfee_sumamt           //医疗费总额
+	inputData["fund_pay_sumamt"] = fund_pay_sumamt       //基金支付总额
+	inputData["acct_pay"] = acct_pay                     //个人账户支付金额
+	inputData["fixmedins_setl_cnt"] = fixmedins_setl_cnt //定点医药机构结算笔数
+	inputData["refd_setl_flag"] = 0                      // 就诊 ID（来自2201接口返回）
+
+	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 + "3201"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+}

utils/csbhttp/httpcaller.go

@@ -187,7 +187,7 @@ func Invoke(params HttpParams, time_stamp string) (str string, rtnHeaders map[st
 				conn.SetDeadline(time.Now().Add(defaultSetting.ReadWriteTimeout)) //设置发送接受数据超时
 				return conn, nil
 			},
-			ResponseHeaderTimeout: time.Second * 2,
+			ResponseHeaderTimeout: time.Second * 60,
 		},
 	}