更新

conf/app.conf

@@ -51,7 +51,7 @@ sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-org_id = 10188
+org_id = 9919
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 gdyb_paasid = "sg02_prd"
 

controllers/nm/nm_controller.go

@@ -295,7 +295,7 @@ func (c *NmController) Post4101() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	result := service.Gdyb4101(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0)
+	result, _ := service.Gdyb4101(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/zh/zh_his_api_controller.go

@@ -220,6 +220,64 @@ type ResultFive struct {
 	PsnInsuStas            string  `json:"psn_insu_stas"`
 	PsnType                string  `json:"psn_type"`
 }
+type ResultSevenTwo struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Setldetail []interface{} `json:"setldetail"`
+		Setlinfo   struct {
+			AcctMulaidPay   float64 `json:"acct_mulaid_pay"`
+			AcctPay         float64 `json:"acct_pay"`
+			ActPayDedc      float64 `json:"act_pay_dedc"`
+			Age             string  `json:"age"`
+			Balc            float64 `json:"balc"`
+			Brdy            string  `json:"brdy"`
+			Certno          string  `json:"certno"`
+			ClrOptins       string  `json:"clr_optins"`
+			ClrType         string  `json:"clr_type"`
+			ClrWay          string  `json:"clr_way"`
+			CvlservFlag     string  `json:"cvlserv_flag"`
+			CvlservPay      float64 `json:"cvlserv_pay"`
+			FulamtOwnpayAmt float64 `json:"fulamt_ownpay_amt"`
+			FundPaySumamt   float64 `json:"fund_pay_sumamt"`
+			Gend            string  `json:"gend"`
+			HifesPay        float64 `json:"hifes_pay"`
+			HifmiPay        float64 `json:"hifmi_pay"`
+			HifpPay         float64 `json:"hifp_pay"`
+			HospPartAmt     float64 `json:"hosp_part_amt"`
+			InscpScpAmt     float64 `json:"inscp_scp_amt"`
+			Insutype        string  `json:"insutype"`
+			MafPay          float64 `json:"maf_pay"`
+			MdtrtCertType   string  `json:"mdtrt_cert_type"`
+			HifobPay        float64 `json:"hifob_pay"`
+
+			MdtrtID         string  `json:"mdtrt_id"`
+			MedType         string  `json:"med_type"`
+			MedfeeSumamt    float64 `json:"medfee_sumamt"`
+			MedinsSetlID    string  `json:"medins_setl_id"`
+			Naty            string  `json:"naty"`
+			OthPay          float64 `json:"oth_pay"`
+			OverlmtSelfpay  float64 `json:"overlmt_selfpay"`
+			PoolPropSelfpay float64 `json:"pool_prop_selfpay"`
+			PreselfpayAmt   float64 `json:"preselfpay_amt"`
+			PsnCashPay      float64 `json:"psn_cash_pay"`
+			PsnCertType     string  `json:"psn_cert_type"`
+			PsnName         string  `json:"psn_name"`
+			PsnNo           string  `json:"psn_no"`
+			PsnPartAmt      float64 `json:"psn_part_amt"`
+			PsnType         string  `json:"psn_type"`
+			SetlID          string  `json:"setl_id"`
+			SetlTime        string  `json:"setl_time"`
+		} `json:"setlinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
 type ResultSeven struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -1283,6 +1341,9 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 			result = string(result_byte)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 
+		} else if miConfig.MdtrtareaAdmvs == "360399" {
+			result, request_log = service.JxybZY1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, "", miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 0, miConfig.Url, miConfig.AccessKey, "", patient.IdCardNo, "")
+			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 		} else {
 			result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 1, patient.Name)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
@@ -1497,9 +1558,13 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			res2.Output.Baseinfo.PsnNo = psn_info.PsnNo
 			res2.Output.Baseinfo.Certno = patient.IdCardNo
 		}
+	} else if miConfig.MdtrtareaAdmvs == "360399" {
+		result, request_log = service.JxybZY1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, "", miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, miConfig.Url, miConfig.AccessKey, "", patient.IdCardNo, "")
+		saveLog(result_log, request_log, "1101", "人员基本信息获取")
 	} else {
 		result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
 		saveLog(result_log, request_log, "1101", "人员基本信息获取")
+
 	}
 
 	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
@@ -1659,10 +1724,10 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			}
 		} else {
 			if med_type == 11 {
-				struct2401.MedType = "21"
+				struct2401.MedType = "24"
+				med_type = 24
 			} else {
 				struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
-
 			}
 		}
 		struct2401.IptNo = ipt_otp_no
@@ -1738,6 +1803,11 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			result_byte, _ := json.Marshal(respJSON)
 			result = string(result_byte)
+		} else if miConfig.MdtrtareaAdmvs == "360399" {
+
+			result, request_log = service.Jxyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+			saveLog(result, request_log, "2401", "入院登记")
+
 		} else {
 			result, request_log = service.ZHGdyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs)
 			saveLog(result, request_log, "2401", "入院登记")
@@ -1915,7 +1985,7 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 		}
 
 		dise.MdtrtId = record.Number
-		dise.DiagSrtNo = strconv.FormatInt(int64(item.ID), 10)
+		dise.DiagSrtNo = strconv.FormatInt(int64(index), 10)
 		dise.DiseDorName = doctorInfo.UserName
 		dise.DiagCode = item.CountryCode
 		dise.DiagName = item.ClassName
@@ -1961,6 +2031,10 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		result_byte, _ := json.Marshal(respJSON)
 		result = string(result_byte)
+	} else if miConfig.MdtrtareaAdmvs == "360399" {
+		result, request_log = service.Jxyb2402(struct2402, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+		saveLog(result, request_log, "2402", "出院")
+
 	} else {
 		result, request_log = service.ZHGdyb2402(struct2402, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
 		saveLog(result, request_log, "2402", "出院")
@@ -2394,6 +2468,10 @@ func (c *ZHHisApiController) GetSettleInfo() {
 		result_byte, _ := json.Marshal(respJSON)
 		result = string(result_byte)
 
+	} else if miConfig.MdtrtareaAdmvs == "360399" {
+		result, src_resquest = service.Jxyb2304(record.PsnNo, record.Number, cert_no, record.InsutypeType, allTotal, record.Certificates, record.IdCardType, "", miConfig.SecretKey, miConfig.OrgName, miConfig.Code, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey, "", "1")
+		saveLog(result, src_resquest, "2304", "住院结算")
+
 	} 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, "", "1")
@@ -2563,11 +2641,11 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		for _, item := range orders {
 			total = total + item.DetItemFeeSumamt
 		}
-		allTotal = fmt.Sprintf("%.4f", total)
+		allTotal = fmt.Sprintf("%.2f", total)
 
 	} else {
 
-		allTotal = fmt.Sprintf("%.4f", order.MedfeeSumamt)
+		allTotal = fmt.Sprintf("%.2f", order.MedfeeSumamt)
 
 	}
 
@@ -2626,12 +2704,13 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		result_byte, _ := json.Marshal(respJSON)
 		result = string(result_byte)
 
+	} else if miConfig.MdtrtareaAdmvs == "360399" {
+		result, src_resquest = service.Jxyb2303(record.PsnNo, record.Number, cert_no, record.InsutypeType, allTotal, record.Certificates, record.IdCardType, "", miConfig.SecretKey, miConfig.OrgName, miConfig.Code, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+		saveLog(result, src_resquest, "2303", "住院预结算")
 	} else {
 		result, src_resquest = service.ZHGdyb2303(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, "2303", "住院预结算")
-
 	}
-
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -2639,6 +2718,8 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		fmt.Println(err)
 	}
 	userJSONBytes, _ := json.Marshal(dat)
+
+	var res2 ResultSevenTwo
 	var res ResultSeven
 	var resSeven10265 ResultSeven10265
 	if miConfig.Code == "H15049901371" {
@@ -2657,106 +2738,267 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		res.Cainfo = resSeven10265.Cainfo
 
 	} else {
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		if miConfig.MdtrtareaAdmvs == "360399" {
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-	}
+			if res2.Infcode != 0 {
+				errlog := &models.HisOrderError{
+					UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+					Ctime:      time.Now().Unix(),
+					Mtime:      time.Now().Unix(),
+					Number:     chrg_bchno,
+					ErrMsg:     res.ErrMsg,
+					Status:     1,
+					PatientId:  patient_id,
+					RecordTime: time.Now().Unix(),
+					Stage:      6,
+				}
+				service.CreateErrMsgLog(errlog)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
+				return
+			} else {
+				//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
+				order.OrderStatus = 1
+				order.MdtrtId = res2.Output.Setlinfo.MdtrtID
+				order.SetlId = res2.Output.Setlinfo.SetlID
+				order.PsnNo = res2.Output.Setlinfo.PsnNo
+				order.PsnName = res2.Output.Setlinfo.PsnName
+				order.PsnCertType = res2.Output.Setlinfo.PsnCertType
+				order.Certno = res2.Output.Setlinfo.Certno
+				order.Gend = res2.Output.Setlinfo.Gend
+				order.Naty = res2.Output.Setlinfo.Naty
+				val, _ := strconv.ParseFloat(res2.Output.Setlinfo.Age, 64)
+				order.Age = val
+				order.Insutype = res2.Output.Setlinfo.Insutype
+				order.PsnType = res2.Output.Setlinfo.PsnType
+				order.CvlservFlag = res2.Output.Setlinfo.CvlservFlag
+				order.SetlTime = res2.Output.Setlinfo.SetlTime
+				order.MdtrtCertType = res2.Output.Setlinfo.MdtrtCertType
+				if res.Output.Setlinfo.MedType == "140104" {
+
+					order.MedType = "14"
 
-	if res.Infcode != 0 {
-		errlog := &models.HisOrderError{
-			UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-			Ctime:      time.Now().Unix(),
-			Mtime:      time.Now().Unix(),
-			Number:     chrg_bchno,
-			ErrMsg:     res.ErrMsg,
-			Status:     1,
-			PatientId:  patient_id,
-			RecordTime: time.Now().Unix(),
-			Stage:      6,
-		}
-		service.CreateErrMsgLog(errlog)
-		c.ServeSuccessJSON(map[string]interface{}{
-			"failed_code": -10,
-			"msg":         res.ErrMsg,
-		})
-		return
-	} else {
-		//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
-		order.OrderStatus = 1
-		order.MdtrtId = res.Output.Setlinfo.MdtrtID
-		order.SetlId = res.Output.Setlinfo.SetlID
-		order.PsnNo = res.Output.Setlinfo.PsnNo
-		order.PsnName = res.Output.Setlinfo.PsnName
-		order.PsnCertType = res.Output.Setlinfo.PsnCertType
-		order.Certno = res.Output.Setlinfo.Certno
-		order.Gend = res.Output.Setlinfo.Gend
-		order.Naty = res.Output.Setlinfo.Naty
-		order.Age = res.Output.Setlinfo.Age
-		order.Insutype = res.Output.Setlinfo.Insutype
-		order.PsnType = res.Output.Setlinfo.PsnType
-		order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
-		order.SetlTime = res.Output.Setlinfo.SetlTime
-		order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-		if res.Output.Setlinfo.MedType == "140104" {
+				} else {
 
-			order.MedType = "14"
+					order.MedType = res2.Output.Setlinfo.MedType
 
-		} else {
+				}
+				order.MedfeeSumamt = res2.Output.Setlinfo.MedfeeSumamt
+				order.FulamtOwnpayAmt = res2.Output.Setlinfo.FulamtOwnpayAmt
+				order.OverlmtSelfPay = res2.Output.Setlinfo.OverlmtSelfpay
+				order.PreselfpayAmt = res2.Output.Setlinfo.PreselfpayAmt
+				order.InscpScpAmt = res2.Output.Setlinfo.InscpScpAmt
+				order.ActPayDedc = res2.Output.Setlinfo.ActPayDedc
+				order.HifmiPay = res2.Output.Setlinfo.HifmiPay
+				order.HifpPay = res2.Output.Setlinfo.HifpPay
+				order.HifesPay = res2.Output.Setlinfo.HifesPay
+				order.HifobPay = res2.Output.Setlinfo.HifobPay
+				order.MafPay = res2.Output.Setlinfo.MafPay
+				order.OthPay = res2.Output.Setlinfo.OthPay
+				order.CvlservPay = res2.Output.Setlinfo.CvlservPay
+				order.PoolPropSelfpay = res2.Output.Setlinfo.PoolPropSelfpay
+				order.FundPaySumamt = res2.Output.Setlinfo.FundPaySumamt
+				order.PsnPartAmt = res2.Output.Setlinfo.PsnPartAmt
+				order.AcctPay = res2.Output.Setlinfo.AcctPay
+				order.PsnCashPay = res2.Output.Setlinfo.PsnCashPay
+				order.HospPartAmt = res2.Output.Setlinfo.HospPartAmt
+				order.Balc = res2.Output.Setlinfo.Balc
+				order.AcctMulaidPay = res2.Output.Setlinfo.AcctMulaidPay
+				order.MedinsSetlId = res2.Output.Setlinfo.MedinsSetlID
+				order.ClrOptins = res2.Output.Setlinfo.ClrOptins
+				order.ClrWay = res2.Output.Setlinfo.ClrWay
+				order.Creator = order.Creator
+				order.Modify = roles.AdminUserId
+				order.RequestLog = src_resquest
+				setlDetail, _ := json.Marshal(res2.Output.Setldetail)
+				detailStr := string(setlDetail)
+				order.SetlDetail = detailStr
+				//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
+				if record.OutHospitalStatus == 1 && order.ID > 0 {
+					err := service.UpDateOrder(order)
+					if err == nil {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":       "预结算成功",
+							"order_way": 1,
+						})
+					} else {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
+						return
+					}
+				} else if record.OutHospitalStatus == 0 && order.ID == 0 {
+
+					var order models.HisOrder
+					//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
+					order.OrderStatus = 1
+					order.MdtrtId = res2.Output.Setlinfo.MdtrtID
+					order.SetlId = res2.Output.Setlinfo.SetlID
+					order.PsnNo = res2.Output.Setlinfo.PsnNo
+					order.PsnName = res2.Output.Setlinfo.PsnName
+					order.PsnCertType = res2.Output.Setlinfo.PsnCertType
+					order.Certno = res2.Output.Setlinfo.Certno
+					order.Gend = res2.Output.Setlinfo.Gend
+					order.Naty = res2.Output.Setlinfo.Naty
+					val, _ := strconv.ParseFloat(res2.Output.Setlinfo.Age, 64)
+					order.Age = val
+					order.Insutype = res2.Output.Setlinfo.Insutype
+					order.PsnType = res2.Output.Setlinfo.PsnType
+					order.CvlservFlag = res2.Output.Setlinfo.CvlservFlag
+					order.SetlTime = res2.Output.Setlinfo.SetlTime
+					order.MdtrtCertType = res2.Output.Setlinfo.MdtrtCertType
+					if res2.Output.Setlinfo.MedType == "140104" {
+
+						order.MedType = "14"
 
-			order.MedType = res.Output.Setlinfo.MedType
+					} else {
 
-		}
-		order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
-		order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
-		order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
-		order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
-		order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
-		order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
-		order.HifmiPay = res.Output.Setlinfo.HifmiPay
-		order.HifpPay = res.Output.Setlinfo.HifpPay
-		order.HifesPay = res.Output.Setlinfo.HifesPay
-		order.HifobPay = res.Output.Setlinfo.HifobPay
-		order.MafPay = res.Output.Setlinfo.MafPay
-		order.OthPay = res.Output.Setlinfo.OthPay
-		order.CvlservPay = res.Output.Setlinfo.CvlservPay
-		order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
-		order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
-		order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
-		order.AcctPay = res.Output.Setlinfo.AcctPay
-		order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
-		order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
-		order.Balc = res.Output.Setlinfo.Balc
-		order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
-		order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
-		order.ClrOptins = res.Output.Setlinfo.ClrOptins
-		order.ClrWay = res.Output.Setlinfo.ClrWay
-		order.Creator = order.Creator
-		order.Modify = roles.AdminUserId
-		order.RequestLog = src_resquest
-		setlDetail, _ := json.Marshal(res.Output.Setldetail)
-		detailStr := string(setlDetail)
-		order.SetlDetail = detailStr
-		//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
-		if record.OutHospitalStatus == 1 && order.ID > 0 {
-			err := service.UpDateOrder(order)
-			if err == nil {
+						order.MedType = res2.Output.Setlinfo.MedType
+
+					}
+					order.MedfeeSumamt = res2.Output.Setlinfo.MedfeeSumamt
+					order.FulamtOwnpayAmt = res2.Output.Setlinfo.FulamtOwnpayAmt
+					order.OverlmtSelfPay = res2.Output.Setlinfo.OverlmtSelfpay
+					order.PreselfpayAmt = res2.Output.Setlinfo.PreselfpayAmt
+					order.InscpScpAmt = res2.Output.Setlinfo.InscpScpAmt
+					order.ActPayDedc = res2.Output.Setlinfo.ActPayDedc
+					order.HifmiPay = res2.Output.Setlinfo.HifmiPay
+					order.HifpPay = res2.Output.Setlinfo.HifpPay
+					order.HifesPay = res2.Output.Setlinfo.HifesPay
+					order.HifobPay = res2.Output.Setlinfo.HifobPay
+					order.MafPay = res2.Output.Setlinfo.MafPay
+					order.OthPay = res2.Output.Setlinfo.OthPay
+					order.CvlservPay = res2.Output.Setlinfo.CvlservPay
+					order.PoolPropSelfpay = res2.Output.Setlinfo.PoolPropSelfpay
+					order.FundPaySumamt = res2.Output.Setlinfo.FundPaySumamt
+					order.PsnPartAmt = res2.Output.Setlinfo.PsnPartAmt
+					order.AcctPay = res2.Output.Setlinfo.AcctPay
+					order.PsnCashPay = res2.Output.Setlinfo.PsnCashPay
+					order.HospPartAmt = res2.Output.Setlinfo.HospPartAmt
+					order.Balc = res2.Output.Setlinfo.Balc
+					order.AcctMulaidPay = res2.Output.Setlinfo.AcctMulaidPay
+					order.MedinsSetlId = res2.Output.Setlinfo.MedinsSetlID
+					order.ClrOptins = res2.Output.Setlinfo.ClrOptins
+					order.ClrWay = res2.Output.Setlinfo.ClrWay
+					order.Creator = order.Creator
+					order.Modify = roles.AdminUserId
+					order.RequestLog = src_resquest
+					setlDetail, _ := json.Marshal(res2.Output.Setldetail)
+					detailStr := string(setlDetail)
+					order.SetlDetail = detailStr
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":       "预结算成功",
+						"order":     order,
+						"order_way": 2,
+					})
+				}
+			}
+		} else {
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode != 0 {
+				errlog := &models.HisOrderError{
+					UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+					Ctime:      time.Now().Unix(),
+					Mtime:      time.Now().Unix(),
+					Number:     chrg_bchno,
+					ErrMsg:     res.ErrMsg,
+					Status:     1,
+					PatientId:  patient_id,
+					RecordTime: time.Now().Unix(),
+					Stage:      6,
+				}
+				service.CreateErrMsgLog(errlog)
 				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":       "预结算成功",
-					"order_way": 1,
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
 				})
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
 				return
+			} else {
+				//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
+				order.OrderStatus = 1
+				order.MdtrtId = res.Output.Setlinfo.MdtrtID
+				order.SetlId = res.Output.Setlinfo.SetlID
+				order.PsnNo = res.Output.Setlinfo.PsnNo
+				order.PsnName = res.Output.Setlinfo.PsnName
+				order.PsnCertType = res.Output.Setlinfo.PsnCertType
+				order.Certno = res.Output.Setlinfo.Certno
+				order.Gend = res.Output.Setlinfo.Gend
+				order.Naty = res.Output.Setlinfo.Naty
+				order.Age = res.Output.Setlinfo.Age
+				order.Insutype = res.Output.Setlinfo.Insutype
+				order.PsnType = res.Output.Setlinfo.PsnType
+				order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
+				order.SetlTime = res.Output.Setlinfo.SetlTime
+				order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
+				if res.Output.Setlinfo.MedType == "140104" {
+
+					order.MedType = "14"
+
+				} else {
+
+					order.MedType = res.Output.Setlinfo.MedType
+
+				}
+				order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
+				order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
+				order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
+				order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
+				order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
+				order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
+				order.HifmiPay = res.Output.Setlinfo.HifmiPay
+				order.HifpPay = res.Output.Setlinfo.HifpPay
+				order.HifesPay = res.Output.Setlinfo.HifesPay
+				order.HifobPay = res.Output.Setlinfo.HifobPay
+				order.MafPay = res.Output.Setlinfo.MafPay
+				order.OthPay = res.Output.Setlinfo.OthPay
+				order.CvlservPay = res.Output.Setlinfo.CvlservPay
+				order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
+				order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
+				order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
+				order.AcctPay = res.Output.Setlinfo.AcctPay
+				order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
+				order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
+				order.Balc = res.Output.Setlinfo.Balc
+				order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
+				order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
+				order.ClrOptins = res.Output.Setlinfo.ClrOptins
+				order.ClrWay = res.Output.Setlinfo.ClrWay
+				order.Creator = order.Creator
+				order.Modify = roles.AdminUserId
+				order.RequestLog = src_resquest
+				setlDetail, _ := json.Marshal(res.Output.Setldetail)
+				detailStr := string(setlDetail)
+				order.SetlDetail = detailStr
+				//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
+				if record.OutHospitalStatus == 1 && order.ID > 0 {
+					err := service.UpDateOrder(order)
+					if err == nil {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":       "预结算成功",
+							"order_way": 1,
+						})
+					} else {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
+						return
+					}
+				} else if record.OutHospitalStatus == 0 && order.ID == 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":       "预结算成功",
+						"order":     order,
+						"order_way": 2,
+					})
+				}
 			}
-		} else if record.OutHospitalStatus == 0 && order.ID == 0 {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":       "预结算成功",
-				"order":     order,
-				"order_way": 2,
-			})
 		}
 	}
 
@@ -2875,7 +3117,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 
-		var pagesize int = 100
+		var pagesize int = 10
 		var start int = 1
 		var stop int
 		var pagecount int
@@ -3018,6 +3260,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 				result_byte, _ := json.Marshal(respJSON)
 				result = string(result_byte)
+			} else if miConfig.MdtrtareaAdmvs == "360399" {
+				result, requestLog = service.Jxyb2301(record.PsnNo, record.Number, customs[start-1:stop], data["med_type"].(string), chrg_bchno, department.Number, strconv.FormatInt(department.ID, 10), strconv.FormatInt(roles.AdminUserId, 10), miConfig.SecretKey, miConfig.OrgName, miConfig.Code, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+				saveLog(result, requestLog, "2301", "上传明细")
+
 			} else {
 				result, 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), doctor_info.UserName, doctor_info.DoctorNumber)
 				saveLog(result, requestLog, "2301", "上传明细")
@@ -3263,6 +3509,11 @@ func (c *ZHHisApiController) ZHRefund() {
 			//saveLog(result, requestLog, "2404", "入院登记撤销")
 			saveLog(result, requestLog, "2305", "退费")
 
+		} else if miConfig.MdtrtareaAdmvs == "360399" {
+
+			result, requestLog := service.Jxyb2305(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+			saveLog(result, requestLog, "2305", "退费")
+
 		} else {
 			result, requestLog := service.Gdyb2305(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 			saveLog(result, requestLog, "2305", "退费")
@@ -3414,6 +3665,9 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 				result = string(result_byte)
 				saveLog(result, requestLog, "2302", "日结退明细")
 
+			} else if miConfig.MdtrtareaAdmvs == "360399" {
+				result, requestLog := service.Jxyb2302(record.PsnNo, record.Number, 1, item.FeedetlSn, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+				saveLog(result, requestLog, "2302", "日结退明细")
 			} else {
 				result, requestLog := service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, item.FeedetlSn, 1)
 				saveLog(result, requestLog, "2302", "日结退明细")
@@ -3510,6 +3764,10 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 				result = string(result_byte)
 				//saveLog(result, requestLog, "2302", "日结退明细")
 
+			} else if miConfig.MdtrtareaAdmvs == "360399" {
+				result, requestLog = service.Jxyb2302(record.PsnNo, record.Number, 0, "0000", miConfig.SecretKey, miConfig.OrgName, miConfig.Code, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+				saveLog(result, requestLog, "2302", "月结退明细")
+
 			} else {
 				result, requestLog = service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, roles.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
 				saveLog(result, requestLog, "2302", "月结退明细")
@@ -3566,7 +3824,6 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 	}
 
 }
-
 func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 	id, _ := this.GetInt64("id")
 	admin_user_id, _ := this.GetInt64("admin_user_id")
@@ -3615,6 +3872,11 @@ func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 		result_byte, _ := json.Marshal(respJSON)
 		result = string(result_byte)
 
+	} else if miConfig.MdtrtareaAdmvs == "360399" {
+
+		result, requestLog = service.Jxyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+		saveLog(result, requestLog, "2405", "出院登记撤销")
+
 	} else {
 		result, requestLog = service.ZHGdyb2405(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 		saveLog(result, requestLog, "2405", "出院登记撤销")
@@ -3716,6 +3978,9 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 			result = string(result_byte)
 			saveLog(result, requestLog, "2302", "月结退明细")
 
+		} else if miConfig.MdtrtareaAdmvs == "360399" {
+			result, requestLog = service.Jxyb2302(record.PsnNo, record.Number, 0, "0000", miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+			saveLog(result, requestLog, "2302", "月结退明细")
 		} else {
 			result, requestLog = service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
 			saveLog(result, requestLog, "2302", "月结退明细")
@@ -3790,6 +4055,10 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 				result_byte, _ := json.Marshal(respJSON)
 				result = string(result_byte)
 
+			} else if miConfig.MdtrtareaAdmvs == "360399" {
+				result, requestLog = service.Jxyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+				saveLog(result, requestLog, "2404", "入院登记撤销")
+
 			} else {
 				result, requestLog = service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 				saveLog(result, requestLog, "2404", "入院登记撤销")
@@ -3881,6 +4150,10 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 			result_byte, _ := json.Marshal(respJSON)
 			result = string(result_byte)
 
+		} else if miConfig.MdtrtareaAdmvs == "360399" {
+			result, requestLog = service.Jxyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+			saveLog(result, requestLog, "2404", "入院登记撤销")
+
 		} else {
 			result, requestLog = service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
 			saveLog(result, requestLog, "2404", "入院登记撤销")

main.go

@@ -7,9 +7,11 @@ import (
 	"gdyb/models"
 	_ "gdyb/routers"
 	"gdyb/service"
+	"gdyb/utils"
 	"github.com/shopspring/decimal"
 	"io/ioutil"
 	"net/http"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -66,25 +68,25 @@ func GetBatchSettleList() {
 
 	org_id, _ := beego.AppConfig.Int64("org_id")
 	//list, _ := service.GetLastFundList(org_id)
-	orders, _ := service.GetOrderError(org_id)
+	//orders, _ := service.GetOrderError(org_id)
 	//order, _ := service.GetHisOrderByID(list.OrderId)
-	//var orders []*models.HisOrder
+	var orders []*models.HisOrder
 	//if order.ID > 0 {
 	//
 	//	orders, _ = service.GetAllHisOrderTwo(org_id, order.ID)
 	//
 	//} else {
-	//	orders, _ = service.GetAllHisOrder(org_id)
+	orders, _ = service.GetAllHisOrder10106(org_id)
 	//
 	//}
 
 	for _, item := range orders {
-		order_id := item.PatientId
+		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.GetAdminUserInfoByID(org_id, 2185)
+		curRoles, _ := service.GetAdminUserInfoByID(org_id, 2495)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 
@@ -131,14 +133,10 @@ func GetBatchSettleList() {
 			MedinsFillDept: depart.Name,
 			IptMedType:     "2",
 		}
+
 		struct4101.SetlBegnDate = order.SetlTime
 		struct4101.SetlEndDate = order.SetlTime
 
-		if len(order.SetlTime) == 0 {
-			struct4101.SetlBegnDate = time.Unix(order.Ctime, 0).Format("2006-01-02 15:04:05")
-			struct4101.SetlEndDate = time.Unix(order.Ctime, 0).Format("2006-01-02 15:04:05")
-
-		}
 		//if order.SettleType == 1 {
 		//	t := time.Unix(int64(order.SettleAccountsDate), 0)
 		//	dateStr := t.Format("2006-01-02")
@@ -612,167 +610,164 @@ func GetBatchSettleList() {
 
 		var iteminfoStructs []service.IteminfoStruct
 
-		if order.Insutype != "310" {
-			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 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 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 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)
+		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)
+			//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 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 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 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 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 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 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 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 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 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
-				//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
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
 
 		}
 
@@ -780,7 +775,6 @@ func GetBatchSettleList() {
 		time_arr := strings.Split(order.SetlTime, " ")
 		struct4101.AdmTime = time_arr[0]
 		struct4101.AdmEndTime = time_arr[0]
-
 		struct4101.DoctorName = doctor.UserName
 		struct4101.DoctorCode = doctor.DoctorNumber
 
@@ -835,9 +829,9 @@ func GetBatchSettleList() {
 			}
 
 		} else {
-			result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
+			result, request := service.Gdyb4101For10106(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, org_id)
 			fmt.Println(result)
-
+			saveLog(result, request, "4205", "自费就诊和诊断信息上传")
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -856,7 +850,7 @@ func GetBatchSettleList() {
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     90000,
+					Stage:     50000,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
@@ -872,7 +866,7 @@ func GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     90000,
+				Stage:     50000,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
@@ -892,6 +886,48 @@ func GetBatchSettleList() {
 	}
 }
 
+func saveLog(result string, request string, infno string, desc string) {
+
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	dir := miConfig.OrgName + "日志"
+	utils.Mkdir(dir)
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	hour := time.Now().Format("15")
+	min := time.Now().Format("04")
+	sec := time.Now().Format("05")
+
+	result_time := year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec
+
+	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+	file_name := file + ".txt"
+	file_path := miConfig.OrgName + "日志" + "/" + file_name
+	exist, _ := utils.PathExists(file_path)
+	if exist { //存在
+		fmt.Println("存在")
+		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+		if err != nil {
+			fmt.Println("read fail")
+		}
+		content := "\r\n" + "\r\n" + "\r\n" + result_time + " " + "【 " + desc + infno + "入参" + " 】：" + "\r\n" + request + "\r\n" + result_time + " " + "【 " + desc + infno + "出参" + " 】：" + "\r\n" + result
+		n, _ := f.Seek(0, 2)
+		_, err = f.WriteAt([]byte(content), n)
+
+	} else { //不存在
+		fmt.Println("文件不存在，创建文件")
+		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+		defer f.Close()
+		if err != nil {
+		} else {
+			_, err = f.Write([]byte("记录日志"))
+		}
+	}
+
+}
+
 //func UploadSettleList(org_id int64) {
 //	orders, _ := service.GetAllHisOrder(org_id)
 //	for _, item := range orders {

models/drug.go

@@ -63,12 +63,12 @@ type BaseDrugLib struct {
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 
-	MinNumber int64 `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	//Dose      string  `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	DrugDay  string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	MinPrice float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	IsUser   int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	MinNumber int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose      string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit  string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDay   string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MinPrice  float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsUser    int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }

models/his_models.go

@@ -1713,3 +1713,119 @@ type Item struct {
 	Vaf58  string `json:"vaf58"`
 	Vaf61  string `json:"vaf61"`
 }
+type NewHisOrder111 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"`
+	HisPatientId            int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate      int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	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"`
+	Number                  string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId               int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode                 int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg                 string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                  string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                  string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime             string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid             string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus             int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId                 string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                  string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                   string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName                 string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType             string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                  string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                    string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                    string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                    time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                     float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype                string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType                 string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag             string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime                string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType           string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType                 string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt            float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt         float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay          float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt           float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt             float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc              float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay                 float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay              float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay         float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay                float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay                float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay                float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                  float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                  float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt           float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt              float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay                 float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay              float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt             float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                    float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay           float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId            string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins               string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                  string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType                 string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail              string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance     int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                  int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice                float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo               string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice           float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice       float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice            float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice              float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice   float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice            float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	Creator                 int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                  int64     `gorm:"column:modify" json:"modify" form:"modify"`
+	AccountPrice            float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	PayWays                 string    `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
+	SzChargeInfo            string    `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo           string    `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo string    `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	YiliaoNumber            string    `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	OthDesc                 string    `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
+
+	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+
+	MzNumber      string `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber string `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+
+	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime   int64 `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+
+	RefundLog string `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
+	DetailLog string `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
+
+	RequestLog       string `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog string `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+
+	PType   int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre   int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Decimal float64 `gorm:"column:decimal" json:"decimal" form:"decimal"`
+
+	Diagnosis string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+
+	AcctUsedFlag string `gorm:"column:acct_used_flag" json:"acct_used_flag" form:"acct_used_flag"`
+	CashPay      string `gorm:"cash_pay" json:"cash_pay" form:"cash_pay"`
+	BandCardPay  string `gorm:"band_card_pay" json:"band_card_pay" form:"band_card_pay"`
+	WechatPay    string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
+	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
+	JifenPay     string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+}
+
+func (NewHisOrder111) TableName() string {
+	return "his_order"
+}

models/yb_models.go

@@ -9,7 +9,7 @@ type Result3260 struct {
 			Certno          string  `json:"certno"`
 			MdtrtId         string  `json:"mdtrt_id"`
 			MdtrtSetlTime   string  `json:"mdtrt_setl_time"`
-			SetlNo          string  `json:"setl_no"`
+			SetlSn          string  `json:"setl_sn"`
 			MedfeeSumamt    float64 `json:"medfee_sumamt"`
 			OptinsPaySumamt float64 `json:"optins_pay_sumamt"`
 		} `json:"data"`

service/fj_service.go

@@ -30,7 +30,7 @@ import (
 
 //
 // 人员基本信息
-func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, name string) (string, string, string) {
+func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, name string, id_card_no string) (string, string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -67,7 +67,7 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 
 		}
 	}
-	inputData["certno"] = certNo // 证件号码
+	inputData["certno"] = id_card_no // 证件号码
 
 	inputData["begntime"] = ""   // 开始时间
 	inputData["psn_name"] = name // 人员姓名
@@ -552,7 +552,7 @@ func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 }
 
 //  门诊预结算
-func FJyb2206(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, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
+func FJyb2206(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, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, acct_used_flag string) (string, string, string) {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -593,13 +593,13 @@ func FJyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
 
-	inputData["medfee_sumamt"] = total  // 医疗费总额
-	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
-	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
-	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
-	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
-	inputData["insutype"] = insutype    // 险种类型
-	inputData["invono"] = ""            // 发票号
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
 
 	inputData2 := make(map[string]interface{})
 	inputData2["trum_flag"] = "0"
@@ -628,7 +628,7 @@ func FJyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	return output, requestLog, err_msg
 }
 
-func FJyb2206ForToken(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, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
+func FJyb2206ForToken(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, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, acct_used_flag string) (string, string, string) {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -673,13 +673,13 @@ func FJyb2206ForToken(psnNo string, mdtrtId string, chrgBchno string, certNo str
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
 
-	inputData["medfee_sumamt"] = total  // 医疗费总额
-	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
-	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
-	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
-	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
-	inputData["insutype"] = insutype    // 险种类型
-	inputData["invono"] = ""            // 发票号
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/gdyb_service.go

@@ -1221,6 +1221,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["acct_used_flag"] = "0"   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype    // 险种类型
 	inputData["invono"] = ""            // 发票号
+	inputData["dise_codg"] = "M07803"   // 发票号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -2883,7 +2884,7 @@ type Struct4101 struct {
 }
 
 //
-func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, org_id int64) string {
+func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, org_id int64) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -2950,12 +2951,13 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
 	inputData["ipt_med_type"] = ""                            // 住院医疗类型  必填
 	inputData["adm_way"] = ""                                 // 入院途径  必填
-	inputData["trt_type"] = ""                                // 治疗类别  必填
+	inputData["trt_type"] = "10"                              // 治疗类别  必填
 	inputData["adm_time"] = ""                                // 入院时间  必填
-	inputData["adm_caty"] = ""                                // 入院科别  必填
+	inputData["adm_caty"] = "A03.06"                          // 入院科别  必填
 	inputData["refldept_dept"] = ""                           // 转科科别  必填
 	inputData["dscg_time"] = ""                               // 出院时间  必填
-	inputData["dscg_caty"] = ""                               // 出院科别  必填
+	inputData["dscg_caty"] = "A03.06"                         // 出院科别  必填
+	inputData["caty"] = "A03.06"                              // 出院科别  必填
 	inputData["act_ipt_days"] = ""                            // 实际住院天数  必填
 	inputData["otp_wm_dise"] = ""                             // 门（急） 诊西医诊断  必填
 	inputData["wm_dise_code"] = ""                            // 门（急） 诊中医诊断  必填
@@ -3057,7 +3059,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 
 	input["setlinfo"] = inputData
 	input["payinfo"] = payinfo
-	//input["opspdiseinfo"] = opspdiseinfo
+	input["opspdiseinfo"] = opspdiseinfo
 	input["diseinfo"] = diseinfo
 	input["iteminfo"] = iteminfo
 	inputMessage["input"] = input //交易输入
@@ -3066,7 +3068,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -3087,7 +3089,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -3100,16 +3102,233 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), ""
 	}
 	str := string(respBytes)
 	fmt.Println(str)
-	return str
+	return str, string(bytesData)
+}
+
+func Gdyb4101For10106(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, org_id int64) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4101A" // 交易编码
+
+	year := time.Now().Format("2006")
+	month := time.Now().Format("01")
+	day := time.Now().Format("02")
+
+	inputData["mdtrt_id"] = struct4101.MdtrtId // 就诊 ID  必填（来自2201接口返回）
+	inputData["setl_id"] = struct4101.SetlId   // 结算 ID  必填
+	inputData["psn_no"] = struct4101.PsnNo     // 结算 ID  必填
+
+	inputData["fixmedins_name"] = org_name                    // 定点医药机构名称  必填
+	inputData["fixmedins_code"] = fixmedins_code              // 定点医药机构编码  必填
+	inputData["hi_setl_lv"] = ""                              // 医保结算等级
+	inputData["hi_no"] = struct4101.PsnNo                     // 医保编号
+	inputData["medcasno"] = struct4101.PsnNo                  // 病案号  必填
+	inputData["dcla_time"] = year + "-" + month + "-" + day   // 申报时间  必填
+	inputData["psn_name"] = struct4101.PsnName                // 人员姓名  必填
+	inputData["gend"] = struct4101.Gend                       // 性别  必填
+	inputData["brdy"] = struct4101.Brdy                       // 出生日期  必填
+	inputData["age"] = struct4101.Age                         // 年龄  必填
+	inputData["ntly"] = struct4101.Ntly                       // 国籍  必填
+	inputData["nwb_age"] = ""                                 // 年龄  必填
+	inputData["naty"] = struct4101.Naty                       // 民族  必填
+	inputData["patn_cert_type"] = struct4101.PatnCertType     // 患者证件类别  必填
+	inputData["certno"] = struct4101.Certno                   // 证件号码  必填
+	inputData["prfs"] = struct4101.Prfs                       // 职业  必填
+	inputData["curr_addr"] = ""                               // 现住址  必填
+	inputData["emp_name"] = ""                                // 单位名称  必填
+	inputData["emp_addr"] = ""                                // 单位地址  必填
+	inputData["emp_tel"] = ""                                 // 单位电话  必填
+	inputData["poscode"] = ""                                 // 邮编  必填
+	inputData["coner_name"] = struct4101.ConerName            // 联系人姓名  必填
+	inputData["patn_rlts"] = struct4101.PatnRlts              // 与患者关系  必填
+	inputData["coner_addr"] = struct4101.ConerAddr            // 联系人地址  必填
+	inputData["coner_tel"] = struct4101.ConerTel              // 联系人电话  必填
+	inputData["hi_type"] = struct4101.HiType                  // 医保类型  必填
+	inputData["insuplc"] = struct4101.Insuplc                 // 参保地  必填
+	inputData["sp_psn_type"] = ""                             // 特殊人员类型  必填
+	inputData["nwb_adm_type"] = ""                            // 新生儿入院类型  必填
+	inputData["nwb_bir_wt"] = ""                              // 新生儿出生体重  必填
+	inputData["nwb_adm_wt"] = ""                              // 新生儿入院体重  必填
+	inputData["opsp_diag_caty"] = ""                          // 门诊慢特病诊断  必填
+	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
+	inputData["ipt_med_type"] = ""                            // 住院医疗类型  必填
+	inputData["adm_way"] = ""                                 // 入院途径  必填
+	inputData["trt_type"] = "10"                              // 治疗类别  必填
+	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
+	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
+	inputData["refldept_dept"] = ""                           // 转科科别  必填
+	inputData["dscg_time"] = struct4101.AdmEndTime            // 出院时间  必填
+	inputData["dscg_caty"] = struct4101.DscgCaty              // 出院科别  必填
+	inputData["act_ipt_days"] = ""                            // 实际住院天数  必填
+	inputData["otp_wm_dise"] = ""                             // 门（急） 诊西医诊断  必填
+	inputData["wm_dise_code"] = ""                            // 门（急） 诊中医诊断  必填
+	inputData["otp_tcm_dise"] = ""                            // 西医诊断疾病代码  必填
+	inputData["tcm_dise_code"] = ""                           // 中医诊断代码  必填
+	inputData["oprn_oprt_code_cnt"] = ""                      // 手术操作代码计数  必填
+	inputData["vent_used_dura"] = ""                          // 呼吸机使用时长  必填
+	inputData["pwcry_bfadm_coma_dura"] = ""                   // 颅脑损伤患者入院前昏迷时长  必填
+	inputData["pwcry_afadm_coma_dura"] = ""                   // 颅脑损伤患者入院后昏迷时长  必填
+	inputData["bld_cat"] = ""                                 // 输血品种  必填
+	inputData["bld_amt"] = ""                                 // 输血量  必填
+	inputData["bld_unt"] = ""                                 // 输血计量单位  必填
+	inputData["spga_nurscare_days"] = ""                      // 特级护理天数  必填
+	inputData["lv1_nurscare_days"] = ""                       // 一级护理天数  必填
+	inputData["scd_nurscare_days"] = ""                       // 二级护理天数  必填
+	inputData["lv3_nurscare_days"] = ""                       // 三级护理天数  必填
+	inputData["acp_medins_name"] = ""                         // 拟接收机构名称  必填
+	inputData["acp_optins_code"] = ""                         // 拟接收机构代码  必填
+	inputData["bill_code"] = struct4101.BillCode              // 票据代码  必填
+	inputData["bill_no"] = struct4101.BillNo                  // 票据号码  必填
+	inputData["biz_sn"] = struct4101.BizSn                    // 业务流水号  必填
+	inputData["days_rinp_flag_31"] = ""                       // 出院 31 天内再住院计划标志  必填
+	inputData["days_rinp_pup_31"] = ""                        // 出院 31 天内再住院目的  必填
+	inputData["chfpdr_name"] = struct4101.DoctorName          // 主诊医师姓名  必填
+	inputData["chfpdr_code"] = struct4101.DoctorCode          // 主诊医师代码  必填
+	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
+	inputData["setl_end_date"] = struct4101.SetlEndDate       // 结算结束日期  必填
+	inputData["psn_selfpay"] = struct4101.PsnSelfPay          // 个人自付  必填
+	inputData["psn_ownpay"] = struct4101.PsnOwnPay            // 个人自费  必填
+	inputData["acct_pay"] = struct4101.AcctPay                // 个人账户支出  必填
+	inputData["hi_paymtd"] = struct4101.HiPaymtd              // 医保支付方式  必填
+	inputData["hsorg"] = struct4101.Hsorg                     // 医保机构  必填
+	inputData["hsorg_opter"] = struct4101.HsorgOpter          // 医保机构经办人  必填
+	inputData["medins_fill_dept"] = struct4101.MedinsFillDept // 医疗机构填报部门  必填
+	inputData["medins_fill_psn"] = struct4101.MedinsFillPsn   // 医疗机构填报人  必填
+	inputData["psn_cashpay"] = struct4101.PsnCashpay          // 医疗机构填报人  必填
+
+	payinfo := make([]map[string]interface{}, 0) // 基金支付信息
+	for _, item := range struct4101.CustomStruct {
+		payinfotemp := make(map[string]interface{})
+		if item.FundPayType == "310100" || item.FundPayType == "310200" || item.FundPayType == "320100" || item.FundPayType == "330100" || item.FundPayType == "340100" || item.FundPayType == "350100" || item.FundPayType == "370100" || item.FundPayType == "390100" || item.FundPayType == "610100" || item.FundPayType == "640100" || item.FundPayType == "620100" {
+			payinfotemp["fund_pay_type"] = item.FundPayType // 基金支付类型  必填
+			payinfotemp["fund_payamt"] = item.FundPayamt    // 基金支付金额
+			payinfo = append(payinfo, payinfotemp)
+		}
+	}
+	opspdiseinfo := make([]map[string]interface{}, 0) // 门诊慢特病诊断信息
+
+	opspdiseinfotemp := make(map[string]interface{})
+	opspdiseinfotemp["diag_name"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagName // 诊断名称  必填
+	opspdiseinfotemp["diag_code"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagCode // 诊断代码 必填
+	opspdiseinfotemp["oprn_oprt_name"] = "血液透析"                                              // 手术操作名称 必填
+	opspdiseinfotemp["oprn_oprt_code"] = "39.9500"                                           // 手术操作代码 必填
+	opspdiseinfo = append(opspdiseinfo, opspdiseinfotemp)
+
+	diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
+	for _, item := range struct4101.Diseinfo {
+		diseinfotemp := make(map[string]interface{})
+		diseinfotemp["maindiag_flag"] = item.MaindiagFlag // 手术操作代码 必填
+		diseinfotemp["diag_type"] = item.DiagType         // 诊断类别  必填
+		diseinfotemp["diag_code"] = item.DiagCode         // 诊断代码 必填
+		diseinfotemp["diag_name"] = item.DiagName         // 诊断名称 必填
+		diseinfotemp["adm_cond_type"] = "3"               // 入院病情类型 必填
+		diseinfo = append(diseinfo, diseinfotemp)
+	}
+
+	iteminfo := make([]map[string]interface{}, 0)
+	for _, item := range struct4101.IteminfoStruct {
+		iteminfotemp := make(map[string]interface{})
+		iteminfotemp["med_chrgitm"] = item.MedChrgitm            // 医疗收费项目  必填
+		iteminfotemp["amt"] = item.Amt                           // 金额 必填
+		iteminfotemp["claa_sumfee"] = item.ClaaSumfee            // 甲类费用合计 必填
+		iteminfotemp["clab_amt"] = item.ClabAmt                  // 乙类金额 必填
+		iteminfotemp["fulamt_ownpay_amt"] = item.FulamtOwnpayAmt // 全自费金额 必填
+		iteminfotemp["oth_amt"] = item.OthAmt                    // 其他金额 必填
+		iteminfo = append(iteminfo, iteminfotemp)
+	}
+
+	oprninfo := make([]map[string]interface{}, 0) // 手术操作信息
+	oprninfotemp := make(map[string]interface{})
+	oprninfotemp["oprn_oprt_type"] = "" // 手术操作类别  必填
+	oprninfotemp["oprn_oprt_name"] = "" // 手术操作名称 必填
+	oprninfotemp["oprn_oprt_code"] = "" // 手术操作代码 必填
+	oprninfotemp["oprn_oprt_date"] = "" // 手术操作日期 必填
+	oprninfotemp["anst_way"] = ""       // 麻醉方式 必填
+	oprninfotemp["oper_dr_name"] = ""   // 术者医师姓名 必填
+	oprninfotemp["oper_dr_code"] = ""   // 术者医师代码 必填
+	oprninfotemp["anst_dr_name"] = ""   // 麻醉医师姓名 必填
+	oprninfotemp["anst_dr_code"] = ""   // 麻醉医师代码 必填
+	oprninfo = append(oprninfo, oprninfotemp)
+
+	icuinfo := make([]map[string]interface{}, 0) // 重症监护信息
+	icuinfotemp := make(map[string]interface{})
+	icuinfotemp["scs_cutd_ward_type"] = ""   // 重症监护病房类型  必填
+	icuinfotemp["scs_cutd_inpool_time"] = "" // 重症监护进入时间 必填
+	icuinfotemp["scs_cutd_exit_time"] = ""   // 重症监护退出时间 必填
+	icuinfotemp["scs_cutd_sum_dura"] = ""    // 重症监护合计时长 必填
+	icuinfo = append(icuinfo, icuinfotemp)
+
+	input["setlinfo"] = inputData
+	input["payinfo"] = payinfo
+	input["opspdiseinfo"] = opspdiseinfo
+	input["diseinfo"] = diseinfo
+	input["iteminfo"] = iteminfo
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := gdyb_url + "4101"
+
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+
+		url = gdyb_url + "4101A"
+
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/4101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str, string(bytesData)
 }
 
 //func Gdyb7101(psnNo string, insutype string, org_name string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string) string {
@@ -3844,10 +4063,10 @@ func Gdyb1101f(certNo string, org_name string, doctor string, fixmedins_code str
 			}
 
 		} else if certificates == 6 {
-			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "17"   // 人员证件类型
+			inputData["psn_cert_type"] = ""     // 人员证件类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 
 		}
@@ -4056,6 +4275,80 @@ func Gdyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 
 }
 
+func Gdyb1101ForEleCerttwo(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, token string, user_name string, idNo string) (string, string) {
+	//生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+	inputData["card_sn"] = ""           // 卡识别码
+	inputData["certno"] = idNo          // 证件号码
+	inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+	inputData["mdtrt_cert_no"] = token // 就诊凭证编号
+	inputData["begntime"] = ""         // 开始时间
+	inputData["psn_name"] = user_name  // 人员姓名
+	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(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	//url := gdyb_url + "1101"
+	var url string
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "1101"
+	}
+
+	fmt.Println(url)
+	fmt.Println(gdyb_paasid)
+	fmt.Println(secret_key)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, string(bytesData)
+
+}
+
 func Gdyb6101(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -4311,7 +4604,7 @@ func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData["sign"] = sign       // 就诊凭证编号
 	inputData["trt_year"] = year   // 就诊凭证编号
 	inputData["trt_month"] = month // 开始时间
-	inputData["startrow"] = "100"  // 人员姓名
+	inputData["startrow"] = "0"    // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	var inputLog string
@@ -4375,7 +4668,7 @@ func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	}
 
 }
-func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260) (string, string, string) {
+func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260, sign_no string) (string, string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -4395,59 +4688,111 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	msg_id := fixmedins_code + msg_year + msg_month + day + hour + min + sec + msec + "0"
 
 	//生成输入报文
-	inputMessage := SetInputMessageThree(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, msg_id)
+	inputMessage := SetInputMessageTwo(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, sign_no)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3261"                      // 交易编码
-	inputData["trt_year"] = year                        // 就诊凭证编号
-	inputData["trt_month"] = month                      // 开始时间
-	inputData["startrow"] = len(result3260.Output.Data) // 人员姓名
-
+	inputMessage["infno"] = "3261" // 交易编码
+	inputData["trt_year"] = year   // 就诊凭证编号
+	inputData["trt_month"] = month // 开始时间
 	feedetail := make([]map[string]interface{}, 0)
 
-	for _, item := range result3260.Output.Data {
-		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["certno"] = item.Certno
-		feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
-		feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
-		feedetailInfo["setl_no"] = item.SetlNo                    // 收费批次号
-		feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
-		feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
-		feedetail = append(feedetail, feedetailInfo)
-	}
-	inputData["detail"] = feedetail // 人员姓名
+	var curpage int
+	var pagesize int = 10
+	var start int = 1
+	var stop int
+	pagecount := 10
+	for curpage = 1; curpage <= pagecount; curpage++ {
+		if curpage == 1 {
+			start = 1
+		} else {
+			start = (curpage-1)*pagesize + 1
+		}
+		stop = curpage * pagesize
+		if stop > len(result3260.Output.Data) {
+			stop = len(result3260.Output.Data)
+		}
 
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
-	var inputLog string
-	bytesData, err := json.Marshal(inputMessage)
-	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), "", ""
-	}
-	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+		for _, item := range result3260.Output.Data[start-1 : stop] {
+			if item.MdtrtId != "out20230406681871" && item.MdtrtId != "out20230406681868" && item.MdtrtId != "out20230418732788" {
+				feedetailInfo := make(map[string]interface{})
+				feedetailInfo["certno"] = item.Certno
+				feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+				feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+				feedetailInfo["setl_sn"] = item.SetlSn                    // 收费批次号
+				feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+				feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+				feedetailInfo["cnfm_flag"] = "1"                          // 处方号
+				feedetail = append(feedetail, feedetailInfo)
+			}
 
-	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "3261"
-	}
+		}
+		for _, item := range result3260.Output.Data[start-1 : stop] {
+			if item.MdtrtId == "out20230406681871" {
+				feedetailInfo := make(map[string]interface{})
+				feedetailInfo["certno"] = item.Certno
+				feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+				feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+				feedetailInfo["setl_sn"] = item.SetlSn                    // 收费批次号
+				feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+				feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+				feedetailInfo["cnfm_flag"] = "0"                          // 处方号
+				feedetail = append(feedetail, feedetailInfo)
+			}
 
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
+		}
+
+		for _, item := range result3260.Output.Data[start-1 : stop] {
+			if item.MdtrtId == "out20230406681868" {
+				feedetailInfo := make(map[string]interface{})
+				feedetailInfo["certno"] = item.Certno
+				feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+				feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+				feedetailInfo["setl_sn"] = item.SetlSn                    // 收费批次号
+				feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+				feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+				feedetailInfo["cnfm_flag"] = "0"                          // 处方号
+				feedetail = append(feedetail, feedetailInfo)
+			}
+
+		}
+		for _, item := range result3260.Output.Data[start-1 : stop] {
+			if item.MdtrtId == "out20230418732788" {
+				feedetailInfo := make(map[string]interface{})
+				feedetailInfo["certno"] = item.Certno
+				feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+				feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+				feedetailInfo["setl_sn"] = item.SetlSn                    // 收费批次号
+				feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+				feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+				feedetailInfo["cnfm_flag"] = "0"                          // 处方号
+				feedetail = append(feedetail, feedetailInfo)
+			}
+
+		}
+
+		inputData["totalrow"] = 119 // 人员姓名
+
+		input["data"] = inputData
+		input["detail"] = feedetail
+		inputMessage["input"] = input //交易输入
+		var inputLog string
+		bytesData, err := json.Marshal(inputMessage)
+		inputLog = string(bytesData)
+		fmt.Println(string(bytesData))
 		if err != nil {
-			fmt.Println("error:", err.Error())
+			fmt.Println(err.Error())
+			return err.Error(), "", ""
+		}
+		reader := bytes.NewReader(bytesData)
+		gdyb_url := beego.AppConfig.String("gdyb_url")
+		gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+		var url string
+		if fixmedins_code == "H15049901371" {
+			url = gdyb_url
+		} else {
+			url = gdyb_url + "3261"
 		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog, ""
-	} else {
 
 		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 		request, err := http.NewRequest("POST", url, reader)
@@ -4478,22 +4823,22 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		return str, inputLog, msg_id
 
 	}
-
+	return "", "", msg_id
 }
-func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, otransid string) (string, string) {
+func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, otransid string, sign_no string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessageTwo(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, sign_no)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3262" // 交易编码
 
-	inputData["trt_year"] = year     // 就诊凭证编号
-	inputData["trt_month"] = ""      // 开始时间
-	inputData["otransid"] = otransid // 开始时间
+	inputData["trt_year"] = year  // 就诊凭证编号
+	inputData["trt_month"] = "04" // 开始时间
+	inputData["otransid"] = "0"   // 开始时间
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -4513,7 +4858,7 @@ func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		url = gdyb_url + "3261"
+		url = gdyb_url + "3262"
 	}
 
 	if insuplc_admdvs == "421300" {

service/gdyb_zifei_service.go

@@ -407,8 +407,11 @@ func Gdyb4205(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	signature := setSignature(timestamp, nonce, secret_key)
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-	input := make(map[string]interface{})
+	//input := make(map[string]interface{})
+	inputData0 := make(map[string]interface{})
+
 	inputData := make(map[string]interface{})
+
 	inputMessage["infno"] = "4205" // 交易编码
 
 	inputData["fixmedins_mdtrt_id"] = struct4202.OwnPayPatnMdtrtD.FixmedinsMdtrtID
@@ -459,10 +462,11 @@ func Gdyb4205(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		diagInfo["vali_flag"] = "1"
 		diagInfos = append(diagInfos, diagInfo)
 	}
-	inputData["diseinfo"] = diagInfos
-
+	inputData0["diseinfo"] = diagInfos
 	feedetail := make([]map[string]interface{}, 0)
 	for _, item := range struct4201A.Fopfd {
+		fmt.Println("item.BkkpSn")
+		fmt.Println(item.BkkpSn)
 		inputData := make(map[string]interface{})
 		inputData["fixmedins_mdtrt_id"] = item.FixmedinsMdtrtID
 		inputData["med_type"] = item.MedType
@@ -503,9 +507,9 @@ func Gdyb4205(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		feedetail = append(feedetail, inputData)
 
 	}
-	inputData["feedetail"] = feedetail
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
+	inputData0["feedetail"] = feedetail
+	inputData0["mdtrtinfo"] = inputData
+	inputMessage["input"] = inputData0 //交易输入
 
 	var inputLog string
 	bytesData, err := json.Marshal(inputMessage)

service/hb_service.go

@@ -3572,111 +3572,112 @@ func HeBeiyb3260(org_name string, doctor string, fixmedins_code string, insuplc_
 	}
 
 }
-func HeBeiyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260) (string, string, string) {
-	//生成签名
-	nonce := GetRandomString(32)
-	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
-
-	msg_month := time.Unix(1557042972, 0).Format("1")
-	msg_year := time.Now().Format("2006")
-	msg_month = time.Now().Format("01")
-	day := time.Now().Format("02")
-
-	hour := time.Now().Format("15")
-	min := time.Now().Format("04")
-	sec := time.Now().Format("05")
-
-	msec := time.Now().Format("000")
-
-	msg_id := fixmedins_code + msg_year + msg_month + day + hour + min + sec + msec + "0"
-
-	//生成输入报文
-	inputMessage := SetInputMessageThree(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, msg_id)
-	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3261"                      // 交易编码
-	inputData["trt_year"] = year                        // 就诊凭证编号
-	inputData["trt_month"] = month                      // 开始时间
-	inputData["startrow"] = len(result3260.Output.Data) // 人员姓名
-
-	feedetail := make([]map[string]interface{}, 0)
-
-	for _, item := range result3260.Output.Data {
-		feedetailInfo := make(map[string]interface{})
-		feedetailInfo["certno"] = item.Certno
-		feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
-		feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
-		feedetailInfo["setl_no"] = item.SetlNo                    // 收费批次号
-		feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
-		feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
-		feedetail = append(feedetail, feedetailInfo)
-	}
-	inputData["detail"] = feedetail // 人员姓名
-
-	input["data"] = inputData
-	inputMessage["input"] = input //交易输入
-	var inputLog string
-	bytesData, err := json.Marshal(inputMessage)
-	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), "", ""
-	}
-	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-
-	var url string
-	if fixmedins_code == "H15049901371" {
-		url = gdyb_url
-	} else {
-		url = gdyb_url + "3261"
-	}
-
-	if insuplc_admdvs == "421300" {
-		var json2 string
-		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-		out, err := cmd.Output()
-		if err != nil {
-			fmt.Println("error:", err.Error())
-		}
-		fmt.Println(string(out))
-		return hex.EncodeToString(out), inputLog, ""
-	} else {
-
-		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
-		request, err := http.NewRequest("POST", url, reader)
-		if err != nil {
-			fmt.Println(err.Error())
-			return err.Error(), "", ""
-		}
-
-		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-		request.Header.Set("x-tif-paasid", gdyb_paasid)
-		request.Header.Set("x-tif-signature", signature)
-		request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-		request.Header.Set("x-tif-nonce", nonce)
 
-		client := http.Client{}
-		resp, err := client.Do(request)
-		if err != nil {
-			fmt.Println(err.Error())
-			return err.Error(), "", ""
-		}
-		respBytes, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			fmt.Println(err.Error())
-			return err.Error(), "", ""
-		}
-		fmt.Println(string(respBytes))
-		str := string(respBytes)
-		return str, inputLog, msg_id
-
-	}
-
-}
+//func HeBeiyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260) (string, string, string) {
+//	//生成签名
+//	nonce := GetRandomString(32)
+//	timestamp := time.Now().Unix()
+//	signature := setSignature(timestamp, nonce, secret_key)
+//
+//	msg_month := time.Unix(1557042972, 0).Format("1")
+//	msg_year := time.Now().Format("2006")
+//	msg_month = time.Now().Format("01")
+//	day := time.Now().Format("02")
+//
+//	hour := time.Now().Format("15")
+//	min := time.Now().Format("04")
+//	sec := time.Now().Format("05")
+//
+//	msec := time.Now().Format("000")
+//
+//	msg_id := fixmedins_code + msg_year + msg_month + day + hour + min + sec + msec + "0"
+//
+//	//生成输入报文
+//	inputMessage := SetInputMessageThree(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, msg_id)
+//	input := make(map[string]interface{})
+//	inputData := make(map[string]interface{})
+//	inputMessage["infno"] = "3261"                      // 交易编码
+//	inputData["trt_year"] = year                        // 就诊凭证编号
+//	inputData["trt_month"] = month                      // 开始时间
+//	inputData["startrow"] = len(result3260.Output.Data) // 人员姓名
+//
+//	feedetail := make([]map[string]interface{}, 0)
+//
+//	for _, item := range result3260.Output.Data {
+//		feedetailInfo := make(map[string]interface{})
+//		feedetailInfo["certno"] = item.Certno
+//		feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+//		feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+//		feedetailInfo["setl_no"] = item.SetlNo                    // 收费批次号
+//		feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+//		feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+//		feedetail = append(feedetail, feedetailInfo)
+//	}
+//	inputData["detail"] = feedetail // 人员姓名
+//
+//	input["data"] = inputData
+//	inputMessage["input"] = input //交易输入
+//	var inputLog string
+//	bytesData, err := json.Marshal(inputMessage)
+//	inputLog = string(bytesData)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error(), "", ""
+//	}
+//	reader := bytes.NewReader(bytesData)
+//	gdyb_url := beego.AppConfig.String("gdyb_url")
+//	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+//
+//	var url string
+//	if fixmedins_code == "H15049901371" {
+//		url = gdyb_url
+//	} else {
+//		url = gdyb_url + "3261"
+//	}
+//
+//	if insuplc_admdvs == "421300" {
+//		var json2 string
+//		cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
+//		out, err := cmd.Output()
+//		if err != nil {
+//			fmt.Println("error:", err.Error())
+//		}
+//		fmt.Println(string(out))
+//		return hex.EncodeToString(out), inputLog, ""
+//	} else {
+//
+//		//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+//		request, err := http.NewRequest("POST", url, reader)
+//		if err != nil {
+//			fmt.Println(err.Error())
+//			return err.Error(), "", ""
+//		}
+//
+//		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+//		request.Header.Set("x-tif-paasid", gdyb_paasid)
+//		request.Header.Set("x-tif-signature", signature)
+//		request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+//		request.Header.Set("x-tif-nonce", nonce)
+//
+//		client := http.Client{}
+//		resp, err := client.Do(request)
+//		if err != nil {
+//			fmt.Println(err.Error())
+//			return err.Error(), "", ""
+//		}
+//		respBytes, err := ioutil.ReadAll(resp.Body)
+//		if err != nil {
+//			fmt.Println(err.Error())
+//			return err.Error(), "", ""
+//		}
+//		fmt.Println(string(respBytes))
+//		str := string(respBytes)
+//		return str, inputLog, msg_id
+//
+//	}
+//
+//}
 func HeBeiyb3262(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, otransid string) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)

service/his_service.go

@@ -1478,8 +1478,14 @@ func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
 	return
 }
 
-func GetAllHisOrderTwo(org_id int64, id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND id > ?", org_id, id).Order("setl_time asc").Find(&his).Error
+func GetAllHisOrderTwo(org_id int64) (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND id >= 247903", org_id).Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+
+func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND id >= 264212").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1532,7 +1538,10 @@ func UpdateOrder(order models.HisOrder) (err error) {
 	err = writeDb.Save(&order).Error
 	return
 }
-
+func UpdateOrderTwo(order models.NewHisOrder111) (err error) {
+	err = writeDb.Save(&order).Error
+	return
+}
 func GetNewHisPrescriptionTen(org_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescriptionTen, err error) {
 	err = readDb.Model(&models.HisPrescriptionTen{}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -1545,3 +1554,8 @@ func GetNewHisPrescriptionTen(org_id int64, his_patient_id int64, record_date in
 		Find(&prescription).Error
 	return
 }
+
+func GetHisOrderByIDTwo1111(order_id int64) (order models.NewHisOrder111, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
+	return
+}

service/jx_service.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	"gdyb/utils/csbhttp"
+	"github.com/astaxie/beego"
 
 	//"net/http"
 	"strconv"
@@ -1012,6 +1013,503 @@ func Jxyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	return JXHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData), "5203"), string(bytesData)
 }
 
+func JxybZY1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, request_url string, access_key string, pBusiCardInfo string, id_card_no string, cainfo string) (string, string) {
+	timestamp := time.Now().Unix()
+	//生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+			inputData["card_sn"] = card_sn                            // 卡识别码
+			inputData["certno"] = id_card_no                          // 证件号码
+			inputData["psn_cert_type"] = "01"                         // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + pBusiCardInfo // 就诊凭证编号
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+
+	inputData["begntime"] = "" // 开始时间
+	inputData["psn_name"] = "" // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var inputLog string
+	bytesData, _ := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "1101"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "1101"), inputLog
+
+}
+
+// 住院登记
+func Jxyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	//inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2401"              // 交易编码
+	inputData["psn_no"] = struct2401.PsnNo      // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = struct2401.Insutype // 险种类型（来自1101接口返回）
+	inputData["tel"] = ""
+	inputData["coner_name"] = ""
+	inputData["begntime"] = struct2401.Begntime             // 开始时间
+	inputData["mdtrt_cert_type"] = struct2401.MdtrtCertType // 就诊凭证类型
+	inputData["mdtrt_cert_no"] = struct2401.MdtrtCertNo     // 就诊凭证编号
+	inputData["med_type"] = struct2401.MedType              // 就诊凭证编号
+	inputData["ipt_no"] = struct2401.IptNo                  // 住院/门诊号
+	inputData["medrcdno"] = ""
+	inputData["atddr_no"] = struct2401.AtddrNo
+	inputData["chfpdr_name"] = struct2401.ChfpdrName
+	inputData["adm_diag_dscr"] = struct2401.AdmDiagDscr
+	inputData["adm_dept_codg"] = struct2401.AdmDeptCodg
+	inputData["adm_dept_name"] = struct2401.AdmDeptName
+	inputData["adm_bed"] = struct2401.AdmBed
+	inputData["dscg_maindiag_code"] = struct2401.DscgMaindiagCode
+	inputData["dscg_maindiag_name"] = struct2401.DscgMaindiagName
+	inputData["main_cond_dscr"] = ""
+	inputData["dise_codg"] = struct2401.DiseCodg
+	inputData["dise_name"] = struct2401.DiseName
+	inputData["oprn_oprt_code"] = ""
+	inputData["oprn_oprt_name"] = ""
+	inputData["fpsc_no"] = ""
+	inputData["matn_type"] = ""
+	inputData["birctrl_type"] = ""
+	inputData["latechb_flag"] = ""
+	inputData["geso_val"] = ""
+	inputData["fetts"] = ""
+	inputData["fetus_cnt"] = ""
+	inputData["pret_flag"] = ""
+	inputData["birctrl_matn_date"] = ""
+	inputData["dise_type_code"] = ""
+	inputData["insuplc_admdvs"] = insuplc_admdvs
+	inputData["mdtrtarea_admvs"] = mdtrtarea_admvs
+
+	inputDataArr := make([]map[string]interface{}, 0)
+	for _, item := range struct2401.Diseinfo {
+		inputDataTwo := make(map[string]interface{})
+		inputDataTwo["psn_no"] = item.PsnNo
+		inputDataTwo["diag_type"] = item.DiagType
+		inputDataTwo["maindiag_flag"] = item.MaindiagFlag
+		inputDataTwo["diag_srt_no"] = item.DiagSrtNo
+		inputDataTwo["diag_code"] = item.DiagCode
+		inputDataTwo["diag_name"] = item.DiagName
+		inputDataTwo["adm_cond"] = ""
+		inputDataTwo["diag_dept"] = item.DiagDept
+		inputDataTwo["dise_dor_no"] = item.DiseDorNo
+		inputDataTwo["dise_dor_name"] = item.DiseDorName
+		inputDataTwo["diag_time"] = item.DiagTime
+		inputDataArr = append(inputDataArr, inputDataTwo)
+	}
+	input["mdtrtinfo"] = inputData
+	input["diseinfo"] = inputDataArr
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "2401"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2401"), requestLog
+
+}
+func Jxyb2404(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2404"   // 交易编码
+	inputData["mdtrt_id"] = mdtrt_id // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = psn_no     // 人员编号 （来自1101接口返回）
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2404"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2404"), requestLog
+
+}
+func Jxyb2405(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2405"   // 交易编码
+	inputData["mdtrt_id"] = mdtrt_id // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = psn_no     // 人员编号 （来自1101接口返回）
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2405"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2405"), requestLog
+
+}
+
+func Jxyb2402(struct2402 Struct2402, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2402"               // 交易编码
+	inputData["mdtrt_id"] = struct2402.MdtrtId   // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = struct2402.PsnNo       // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = struct2402.Insutype  // 险种类型（来自1101接口返回）
+	inputData["endtime"] = struct2402.Endtime    // 结束时间
+	inputData["dise_codg"] = struct2402.DiseCode // 就诊凭证类型
+
+	inputData["dise_name"] = struct2402.DiseName // 就诊凭证类型
+	inputData["oprn_oprt_code"] = ""             // 就诊凭证类型
+	inputData["oprn_oprt_name"] = ""             // 就诊凭证类型
+	inputData["fpsc_no"] = ""                    // 就诊凭证类型
+
+	inputData["matn_type"] = ""    // 就诊凭证类型
+	inputData["birctrl_type"] = "" // 就诊凭证类型
+	inputData["latechb_flag"] = "" // 就诊凭证类型
+	inputData["geso_val"] = ""
+	inputData["fetts"] = ""
+	inputData["fetus_cnt"] = ""
+	inputData["pret_flag"] = ""
+	inputData["birctrl_matn_date"] = ""
+	inputData["cop_flag"] = ""
+
+	inputData["dscg_dept_codg"] = struct2402.DscgDeptCodg
+	inputData["dscg_dept_name"] = struct2402.DscgDeptName
+	inputData["dscg_bed"] = "待定"
+	inputData["dscg_way"] = struct2402.DscgWay
+	inputData["die_date"] = ""
+
+	inputDataArr := make([]map[string]interface{}, 0)
+	for _, item := range struct2402.Diseinfo {
+		inputDataTwo := make(map[string]interface{})
+		inputDataTwo["psn_no"] = item.PsnNo
+		inputDataTwo["mdtrt_id"] = item.MdtrtId
+		inputDataTwo["diag_type"] = item.DiagType
+		inputDataTwo["maindiag_flag"] = item.MaindiagFlag
+		inputDataTwo["diag_srt_no"] = item.DiagSrtNo
+		inputDataTwo["diag_code"] = item.DiagCode
+		inputDataTwo["diag_name"] = item.DiagName
+		inputDataTwo["diag_dept"] = item.DiagDept
+		inputDataTwo["dise_dor_no"] = item.DiseDorNo
+		inputDataTwo["dise_dor_name"] = item.DiseDorName
+		inputDataTwo["diag_time"] = item.DiagTime
+		inputDataArr = append(inputDataArr, inputDataTwo)
+	}
+
+	input["dscginfo"] = inputData
+	input["diseinfo"] = inputDataArr
+
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2402"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2402"), requestLog
+
+}
+
+func Jxyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, med_type string, chrg_bchno string, dept_code string, dept string, doctor_id string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	var customs []*models.NewCustom
+
+	customs = hisPrescription
+	// 生成输入报文
+	input := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+	inputMessage["infno"] = "2301" // 交易编码
+
+	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+	for _, item := range customs {
+		org_id, _ := beego.AppConfig.Int64("org_id")
+		doctor_info, _ := GetAdminUserInfoByID(org_id, item.DoctorId)
+
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["feedetl_sn"] = item.FeedetlSn
+		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+		feedetailInfo["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+		feedetailInfo["med_type"] = med_type
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
+		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
+		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
+		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
+		feedetailInfo["cnt"] = item.Cut                              // 数量
+		feedetailInfo["pric"] = item.Price                           // 单价
+		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
+		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
+		feedetailInfo["bilg_dr_codg"] = doctor_info.DoctorNumber     // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = doctor_info.UserName
+		feedetailInfo["acord_dept_codg"] = dept_code               // 受单科室编码
+		feedetailInfo["acord_dept_name"] = dept                    // 受单科室名称
+		feedetailInfo["orders_dr_code"] = doctor_info.DoctorNumber // 受单医生编码
+		feedetailInfo["orders_dr_name"] = doctor_info.UserName     // 受单医生姓名
+		feedetailInfo["chrg_bchno"] = chrg_bchno                   // 收费批次号
+		feedetailInfo["dise_codg"] = ""                            // 病种编码
+		feedetailInfo["rxno"] = ""                                 // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"                        // 外购处方标志
+		feedetailInfo["sin_dos_dscr"] = ""                         // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""                       // 使用频次描述
+		feedetailInfo["prd_days"] = "0"                            // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""                        // 用药途径描述
+		// 开单医师姓名
+
+		if item.HospApprFlag != -1 {
+			if item.HospApprFlag == 1 {
+				feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
+			} else if item.HospApprFlag == 2 {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			} else if item.HospApprFlag == 3 {
+				feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+			} else {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			}
+		} else {
+			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+		}
+
+		//feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		feedetailInfo["etip_flag"] = ""        // 外检标志
+		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
+		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
+		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	input["feedetail"] = feedetail
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2301"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2301"), requestLog
+
+}
+
+func Jxyb2302(psnNo string, mdtrtId string, refund_type int64, number string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2302" // 交易编码
+	if refund_type == 1 {
+		inputData["feedetl_sn"] = number //
+
+	} else {
+		inputData["feedetl_sn"] = "0000" //
+	}
+
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID
+	inputData["psn_no"] = psnNo     // 人员编号
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2302"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2302"), requestLog
+
+}
+
+func Jxyb2303(psnNo string, mdtrtId string, certNo string, insutype string, total string, certificates int64, id_card_type int64, mid_setl_flag string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2303" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	inputData["mdtrt_cert_sn"] = ""
+	inputData["mid_setl_flag"] = mid_setl_flag // 中途退费标志
+	inputData["medfee_sumamt"] = total         // 医疗费总额
+	inputData["psn_setlway"] = "02"            // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId            // 就诊 ID（来自2201接口返回）
+	inputData["acct_used_flag"] = "1"          // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype           // 险种类型
+	inputData["invono"] = ""                   // 发票号
+	inputData["dise_codg"] = "M07803"          // 发票号
+
+	inputData["insuplc_admdvs"] = insuplc_admdvs   // 发票号
+	inputData["mdtrtarea_admvs"] = mdtrtarea_admvs // 发票号
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2303"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2303"), requestLog
+
+}
+
+func Jxyb2304(psnNo string, mdtrtId string, certNo string, insutype string, total string, certificates int64, id_card_type int64, mid_setl_flag string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string, fapiao_number string, acct_used_flag string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2304" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else if id_card_type == 4 {
+
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	inputData["insuplc_admdvs"] = insuplc_admdvs
+	inputData["mdtrtarea_admvs"] = mdtrtarea_admvs
+
+	inputData["mdtrt_cert_sn"] = ""
+	inputData["mid_setl_flag"] = mid_setl_flag   // 中途退费标志
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2304"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2304"), requestLog
+
+}
+func Jxyb2305(psnNo string, mdtrtId string, setlId string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2305" // 交易编码
+
+	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+	inputData["setl_id"] = setlId   // 结算 ID
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2305"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2305"), requestLog
+
+}
+
 //CBS总线
 func JXHttpRequest(url string, ak string, sk string, timestamp int64, json string, infno string) string {
 	fmt.Println(url)

service/zh_his_service.go

@@ -99,6 +99,90 @@ func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code st
 	resultLog = str
 	return str, requestLog, resultLog
 }
+func ZHGdyb1101C(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name string) (string, string, string) {
+	//生成签名
+	var requestLog string
+	var resultLog string
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+		}
+	}
+
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = name        // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "1101"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	resultLog = str
+	return str, requestLog, resultLog
+}
 
 func ZHGdyb1101B(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name string) (string, string) {
 	//生成签名