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

controllers/sg/his_api_controller.go

@@ -3126,6 +3126,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.IdCardNo = patient.IdCardNo
 			his.PhoneNumber = patient.Phone
 			his.UserOrgId = adminInfo.CurrentOrgId
+			his.Insutype = insutype
 			his.Ctime = time.Now().Unix()
 			his.Mtime = time.Now().Unix()
 			his.InsuplcAdmdvs = insuplc_admdvs
@@ -3321,7 +3322,24 @@ func (c *HisApiController) GetUploadInfo() {
 				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			} else {
 				if miConfig.Code == "H15049901371" {
-					result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+					//赤峰地区国家医保医疗类别
+					//职工透析：医疗类别选特殊情况门诊990502
+					//居民定额血透门慢： 医疗类别选门诊慢病140104
+					var med_type string
+					if his.Insutype == "390" {
+						if reg_type == 14 {
+							med_type = "140104"
+						} else if reg_type == 11 {
+							med_type = "11"
+						}
+					} else if his.Insutype == "310" {
+						if reg_type == 14 {
+							med_type = "990502"
+						} else if reg_type == 11 {
+							med_type = "11"
+						}
+					}
+					result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, med_type, doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 
 				} else {
 					result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
@@ -3789,7 +3807,30 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 
 						} else {
-							result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
+							if miConfig.Code == "H15049901371" {
+								//赤峰地区国家医保医疗类别
+								//职工透析：医疗类别选特殊情况门诊990502
+								//居民定额血透门慢： 医疗类别选门诊慢病140104
+								var med_type string
+								if his.Insutype == "390" {
+									if reg_type == 14 {
+										med_type = "140104"
+									} else if reg_type == 11 {
+										med_type = "11"
+									}
+								} else if his.Insutype == "310" {
+									if reg_type == 14 {
+										med_type = "990502"
+									} else if reg_type == 11 {
+										med_type = "11"
+									}
+								}
+								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+							} else {
+								result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+							}
+
+							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
 							var dat map[string]interface{}
 							if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 								fmt.Println(dat)
@@ -4065,7 +4106,31 @@ func (c *HisApiController) GetUploadInfo() {
 				}
 
 			} else {
-				result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+
+				var src_resquest string
+				if miConfig.Code == "H15049901371" {
+					//赤峰地区国家医保医疗类别
+					//职工透析：医疗类别选特殊情况门诊990502
+					//居民定额血透门慢： 医疗类别选门诊慢病140104
+					var med_type string
+					if his.Insutype == "390" {
+						if reg_type == 14 {
+							med_type = "140104"
+						} else if reg_type == 11 {
+							med_type = "11"
+						}
+					} else if his.Insutype == "310" {
+						if reg_type == 14 {
+							med_type = "990502"
+						} else if reg_type == 11 {
+							med_type = "11"
+						}
+					}
+					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+				} else {
+					result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag)
+				}
+
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result2), &dat); err == nil {
 					fmt.Println(dat)
@@ -4829,10 +4894,26 @@ func (c *HisApiController) GetPreUploadInfo() {
 			result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 		} else {
 			if miConfig.Code == "H15049901371" {
-				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
-
+				//赤峰地区国家医保医疗类别
+				//职工透析：医疗类别选特殊情况门诊990502
+				//居民定额血透门慢： 医疗类别选门诊慢病140104
+				var med_type string
+				if his.Insutype == "390" {
+					if reg_type == 14 {
+						med_type = "140104"
+					} else if reg_type == 11 {
+						med_type = "11"
+					}
+				} else if his.Insutype == "310" {
+					if reg_type == 14 {
+						med_type = "990502"
+					} else if reg_type == 11 {
+						med_type = "11"
+					}
+				}
+				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, med_type, doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			} else {
-				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 
 			}
 			saveLog(result, requestLog, "2203", "上传就诊信息")
@@ -5239,7 +5320,31 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 					} else {
 
-						result, request_log := service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+						var result string
+						var request_log string
+						if miConfig.Code == "H15049901371" {
+							//赤峰地区国家医保医疗类别
+							//职工透析：医疗类别选特殊情况门诊990502
+							//居民定额血透门慢： 医疗类别选门诊慢病140104
+							var med_type string
+							if his.Insutype == "390" {
+								if reg_type == 14 {
+									med_type = "140104"
+								} else if reg_type == 11 {
+									med_type = "11"
+								}
+							} else if his.Insutype == "310" {
+								if reg_type == 14 {
+									med_type = "990502"
+								} else if reg_type == 11 {
+									med_type = "11"
+								}
+							}
+							result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, 0, 0, 0, 0, his.IdType)
+						} else {
+							result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+						}
+
 						var dat map[string]interface{}
 						if err := json.Unmarshal([]byte(result), &dat); err == nil {
 							fmt.Println(dat)

controllers/zh/zh_his_api_controller.go

@@ -57,6 +57,41 @@ type ResultTwo struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnInfo    interface{} `json:"warn_info"`
 }
+type ResultTwo10265 struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Baseinfo struct {
+			Age         float64 `json:"age"`
+			Brdy        string  `json:"brdy"`
+			Certno      string  `json:"certno"`
+			Gend        string  `json:"gend"`
+			Naty        string  `json:"naty"`
+			PsnCertType string  `json:"psn_cert_type"`
+			PsnName     string  `json:"psn_name"`
+			PsnNo       string  `json:"psn_no"`
+		} `json:"baseinfo"`
+		Idetinfo []interface{} `json:"idetinfo"`
+		Iinfo    []struct {
+			Balc                   float64 `json:"balc"`
+			CvlservFlag            string  `json:"cvlserv_flag"`
+			EmpName                string  `json:"emp_name"`
+			InsuplcAdmdvs          string  `json:"insuplc_admdvs"`
+			Insutype               string  `json:"insutype"`
+			PausInsuDansuplcAdmdvs string  `json:"paus_insu_dansuplc_admdvs"`
+			PausInsuDate           string  `json:"paus_insu_date"`
+			PsnInsuDate            string  `json:"psn_insu_date"`
+			PsnInsuStas            string  `json:"psn_insu_stas"`
+			PsnType                string  `json:"psn_type"`
+		} `json:"insuinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
 type ResultThree struct {
 	Cainfo      interface{} `json:"cainfo"`
 	ErrMsg      string      `json:"err_msg"`
@@ -72,6 +107,22 @@ type ResultThree struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+type ResultThree10265 struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     string      `json:"infcode"`
+	Output      struct {
+		Result struct {
+			MdtrtID string `json:"mdtrt_id"`
+		} `json:"result"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
 type ResultFour struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -105,6 +156,40 @@ type ResultFour struct {
 	Signtype    string `json:"signtype"`
 	WarnMsg     string `json:"warn_msg"`
 }
+type ResultFour10265 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Result []struct {
+			BasMednFlag      string  `json:"bas_medn_flag"`
+			ChldMedcFlag     string  `json:"chld_medc_flag"`
+			ChrgitmLv        string  `json:"chrgitm_lv"`
+			Cnt              float64 `json:"cnt"`
+			DetItemFeeSumamt float64 `json:"det_item_fee_sumamt"`
+			DrtReimFlag      string  `json:"drt_reim_flag"`
+			FeedetlSn        string  `json:"feedetl_sn"`
+			FulamtOwnpayAmt  float64 `json:"fulamt_ownpay_amt"`
+			HiNegoDrugFlag   string  `json:"hi_nego_drug_flag"`
+			InscpScpAmt      float64 `json:"inscp_scp_amt"`
+			ListSpItemFlag   string  `json:"list_sp_item_flag"`
+			LmtUsedFlag      string  `json:"lmt_used_flag"`
+			MedChrgitmType   string  `json:"med_chrgitm_type"`
+			Memo             string  `json:"memo"`
+			OverlmtAmt       float64 `json:"overlmt_amt"`
+			PreselfpayAmt    float64 `json:"preselfpay_amt"`
+			Pric             float64 `json:"pric"`
+			PricUplmtAmt     float64 `json:"pric_uplmt_amt"`
+			SelfpayProp      float64 `json:"selfpay_prop"`
+		} `json:"result"`
+	} `json:"output"`
+	RefmsgTime  string `json:"refmsg_time"`
+	RespondTime string `json:"respond_time"`
+	Signtype    string `json:"signtype"`
+	WarnMsg     string `json:"warn_msg"`
+}
+
 type ResultFive struct {
 	Balc                   float64 `json:"balc"`
 	CvlservFlag            string  `json:"cvlserv_flag"`
@@ -174,6 +259,64 @@ type ResultSeven struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+type ResultSeven10265 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `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             float64 `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 ResultSixteen struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -216,6 +359,48 @@ type ResultSixteen struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+type ResultSixteen10265 struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		Setldetail []interface{} `json:"setldetail"`
+		Setlinfo   struct {
+			MdtrtID         string  `json:"mdtrt_id"`
+			SetlID          string  `json:"setl_id"`
+			ClrOptins       string  `json:"clr_optins"`
+			SetlTime        string  `json:"setl_time"`
+			MedfeeSumamt    float64 `json:"medfee_sumamt"`
+			FulamtOwnpayAmt float64 `json:"fulamt_ownpay_amt"`
+			OverlmtSelfpay  float64 `json:"overlmt_selfpay"`
+			PreselfpayAmt   float64 `json:"preselfpay_amt"`
+			InscpScpAmt     float64 `json:"inscp_scp_amt"`
+			ActPayDedc      float64 `json:"act_pay_dedc"`
+			HifpPay         float64 `json:"hifp_pay"`
+			PoolPropSe      float64 `json:"pool_prop_selfpay"`
+			Lfpay           float64 `json:"selfpay"`
+			CvlservPay      float64 `json:"cvlserv_pay"`
+			HifesPay        float64 `json:"hifes_pay"`
+			HifmiPay        float64 `json:"hifmi_pay"`
+			HifobPay        float64 `json:"hifob_pay"`
+			MafPay          float64 `json:"maf_pay"`
+			OthPay          float64 `json:"oth_pay"`
+			FundPaySumamt   float64 `json:"fund_pay_sumamt"`
+			PsnPartAmt      float64 `json:"psn_part_amt"`
+			AcctPay         float64 `json:"acct_pay"`
+			Balc            float64 `json:"balc"`
+			AcctMulaidPay   float64 `json:"acct_mulaid_pay"`
+			HospPartAmt     float64 `json:"hosp_part_amt"`
+			MedinsSetlID    string  `json:"medins_setl_id"`
+			PdnCashPay      string  `json:"pdn_cash_pay"`
+		} `json:"setlinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
 
 type Custom struct {
 	DetItemFeeSumamt string
@@ -241,6 +426,18 @@ type ResultEmpty struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+type ResultEmpty10265 struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     string      `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
 
 type CustomResult struct {
 	BasMednFlag      string  `json:"bas_medn_flag"`
@@ -302,14 +499,33 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 
 		userJSONBytes, _ := json.Marshal(dat)
 		var res ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		var resTwo10265 ResultTwo10265
+
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &resTwo10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			Infcode, _ := strconv.ParseInt(resTwo10265.Infcode, 10, 64)
+			res.Infcode = Infcode
+			res.ErrMsg = resTwo10265.ErrMsg
+			res.Output = resTwo10265.Output
+			res.InfRefmsgid = resTwo10265.InfRefmsgid
+			res.RespondTime = resTwo10265.RespondTime
+			res.WarnInfo = resTwo10265.WarnInfo
+
+		} else {
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		}
 
 		var insutypes []string
-
 		var insutype string
 		var is390 int = 0
 		var is310 int = 0
@@ -337,11 +553,9 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 		if is310 == 1 {
 			insutype = "310"
 		}
-
 		if len(insutypes) == 0 {
 			insutype = "310"
 		}
-
 		if res.Infcode != 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"failed_code": -10,
@@ -354,7 +568,6 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 				"insutype":    insutype,
 			})
 		}
-
 	}
 }
 
@@ -422,11 +635,39 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		fmt.Println(err)
 	}
 	userJSONBytes, _ := json.Marshal(dat)
+	//
+	//var res2 ResultTwo
+	//if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+	//	utils.ErrorLog("解析失败：%v", err)
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//}
+
 	var res2 ResultTwo
-	if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	var resTwo10265 ResultTwo10265
+
+	if miConfig.Code == "H15049901371" {
+		if err := json.Unmarshal(userJSONBytes, &resTwo10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		Infcode, _ := strconv.ParseInt(resTwo10265.Infcode, 10, 64)
+		res2.Infcode = Infcode
+		res2.ErrMsg = resTwo10265.ErrMsg
+		res2.Output = resTwo10265.Output
+		res2.InfRefmsgid = resTwo10265.InfRefmsgid
+		res2.RespondTime = resTwo10265.RespondTime
+		res2.WarnInfo = resTwo10265.WarnInfo
+
+	} else {
+		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
 	}
 
 	if res2.Infcode == 0 {
@@ -477,7 +718,17 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		struct2401.Insutype = strconv.FormatInt(int64(social_type), 10)
 		struct2401.MdtrtCertType = "02"
 		struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
-		struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
+		if miConfig.Code == "H15049901371" {
+			if med_type == 14 {
+				struct2401.MedType = "990502"
+			} else if med_type == 11 {
+				struct2401.MedType = "11"
+
+			}
+
+		} else {
+			struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
+		}
 		struct2401.IptNo = ipt_otp_no
 		struct2401.AtddrNo = strconv.FormatInt(int64(doctorInfo.AdminUserId), 10)
 		struct2401.ChfpdrName = doctorInfo.UserName
@@ -527,11 +778,33 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		}
 		userJSONBytes, _ := json.Marshal(dat)
 		var res ResultThree
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		var resThree10265 ResultThree10265
+
+		if miConfig.Code == "H15049901371" {
+
+			if err := json.Unmarshal(userJSONBytes, &resThree10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			Infcode, _ := strconv.ParseInt(resThree10265.Infcode, 10, 64)
+			res.Infcode = Infcode
+			res.ErrMsg = resThree10265.ErrMsg
+			res.Output = resThree10265.Output
+			res.InfRefmsgid = resThree10265.InfRefmsgid
+			res.RespondTime = resThree10265.RespondTime
+
+		} else {
+
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		}
+
 		if res.Infcode == 0 {
 			Iinfos, _ := json.Marshal(res2.Output.Iinfo)
 			Idetinfos, _ := json.Marshal(res2.Output.Idetinfo)
@@ -689,10 +962,28 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	}
 	userJSONBytes, _ := json.Marshal(dat)
 	var res ResultEmpty
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	var resEmpty10265 ResultEmpty10265
+
+	if miConfig.Code == "H15049901371" {
+
+		if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+		res.Infcode = Infcode
+		res.RespondTime = resEmpty10265.RespondTime
+		res.ErrMsg = resEmpty10265.ErrMsg
+		res.Output = resEmpty10265.Output
+		res.WarnMsg = resEmpty10265.WarnMsg
+
+	} else {
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	}
 
 	if res.Infcode == 0 {
@@ -809,10 +1100,30 @@ func (c *ZHHisApiController) GetSettleInfo() {
 	userJSONBytes, _ := json.Marshal(dat)
 
 	var res ResultSeven
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	var resSeven10265 ResultSeven10265
+	if miConfig.Code == "H15049901371" {
+
+		if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		Infcode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+		res.Infcode = Infcode
+		res.InfRefmsgid = resSeven10265.InfRefmsgid
+		res.RespondTime = resSeven10265.RespondTime
+		res.ErrMsg = resSeven10265.ErrMsg
+		res.Output = resSeven10265.Output
+		res.WarnMsg = resSeven10265.WarnMsg
+		res.Cainfo = resSeven10265.Cainfo
+
+	} else {
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
 	}
 
 	if res.Infcode != 0 {
@@ -990,7 +1301,21 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	} else {
 		data["dept_code"] = department.Number
 	}
-	data["med_type"] = strconv.FormatInt(record.MedType, 10)
+	if miConfig.Code == "H15049901371" {
+		if record.MedType == 14 {
+			data["med_type"] = "990502"
+
+		} else if record.MedType == 11 {
+
+			data["med_type"] = strconv.FormatInt(record.MedType, 10)
+
+		}
+
+	} else {
+
+		data["med_type"] = strconv.FormatInt(record.MedType, 10)
+
+	}
 	data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
 	data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
 	data["secret_key"] = miConfig.SecretKey
@@ -1118,10 +1443,27 @@ func (c *ZHHisApiController) GetUploadInfo() {
 			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			userJSONBytes, _ := json.Marshal(respJSON)
 			var res ResultFour
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			var resFour10265 ResultFour10265
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				res.WarnMsg = resFour10265.WarnMsg
+				res.Output = resFour10265.Output
+				res.ErrMsg = resFour10265.ErrMsg
+				res.RespondTime = resFour10265.RespondTime
+				res.InfRefmsgid = resFour10265.InfRefmsgid
+				Infcode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
+				res.Infcode = Infcode
+
+			} else {
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
 
 			if res.Infcode == 0 {
@@ -1358,11 +1700,31 @@ func (c *ZHHisApiController) ZHRefund() {
 		userJSONBytes, _ := json.Marshal(dat)
 
 		var res ResultSixteen
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		var resSixteen ResultSixteen10265
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &resSixteen); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			res.Cainfo = resSixteen.Cainfo
+			res.WarnMsg = resSixteen.WarnMsg
+			res.Output = resSixteen.Output
+			res.ErrMsg = resSixteen.ErrMsg
+			res.RespondTime = resSixteen.RespondTime
+			Infcode, _ := strconv.ParseInt(resSixteen.Infcode, 10, 64)
+			res.Infcode = Infcode
+
+		} else {
+
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		}
+
 		if res.Infcode == 0 {
 			err := service.UpdataOrderStatusThree(order_id, order.Number, adminUser.CurrentOrgId, src_resquest, result)
 			if err == nil {
@@ -1430,11 +1792,27 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 			}
 			userJSONBytes, _ := json.Marshal(dat)
 			var res2 ResultEmpty
-			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			var resEmpty10265 ResultEmpty10265
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+				res2.Infcode = Infcode
+				res2.RespondTime = resEmpty10265.RespondTime
+				res2.ErrMsg = resEmpty10265.ErrMsg
+				res2.Output = resEmpty10265.Output
+				res2.WarnMsg = resEmpty10265.WarnMsg
+			} else {
+				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
+
 			if res2.Infcode == -1 {
 				isSuccess = false
 			}
@@ -1476,11 +1854,27 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 			userJSONBytes, _ := json.Marshal(dat)
 
 			var res2 ResultEmpty
-			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+			var resEmpty10265 ResultEmpty10265
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+				res2.Infcode = Infcode
+				res2.RespondTime = resEmpty10265.RespondTime
+				res2.ErrMsg = resEmpty10265.ErrMsg
+				res2.Output = resEmpty10265.Output
+				res2.WarnMsg = resEmpty10265.WarnMsg
+			} else {
+				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 			}
+
 			if res2.Infcode == 0 {
 				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", result)
 				if err == nil {
@@ -1535,10 +1929,25 @@ func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 	}
 	userJSONBytes, _ := json.Marshal(dat)
 	var res ResultEmpty
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	var resEmpty10265 ResultEmpty10265
+	if miConfig.Code == "H15049901371" {
+		if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+		res.Infcode = Infcode
+		res.RespondTime = resEmpty10265.RespondTime
+		res.ErrMsg = resEmpty10265.ErrMsg
+		res.Output = resEmpty10265.Output
+		res.WarnMsg = resEmpty10265.WarnMsg
+	} else {
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	}
 
 	if res.Infcode == 0 {
@@ -1578,10 +1987,25 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 	}
 	userJSONBytes, _ := json.Marshal(dat)
 	var res ResultEmpty
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	var resEmpty10265 ResultEmpty10265
+	if miConfig.Code == "H15049901371" {
+		if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+		res.Infcode = Infcode
+		res.RespondTime = resEmpty10265.RespondTime
+		res.ErrMsg = resEmpty10265.ErrMsg
+		res.Output = resEmpty10265.Output
+		res.WarnMsg = resEmpty10265.WarnMsg
+	} else {
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	}
 
 	if res.Infcode == 0 {

models/his_models.go

@@ -125,6 +125,7 @@ type HisPatient struct {
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
 }
 
 func (HisPatient) TableName() string {
@@ -594,6 +595,7 @@ type XtHisPatient struct {
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
 }
 
 func (XtHisPatient) TableName() string {
@@ -803,6 +805,7 @@ type VMHisPatient struct {
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
 }
 
 func (VMHisPatient) TableName() string {

service/his_service.go

@@ -19,6 +19,7 @@ type HisPatient struct {
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	Number          string             `gorm:"column:number" json:"number" form:"number"`
 	PatientInfo     string             `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
+	Insutype        string             `gorm:"column:insutype" json:"insutype" form:"insutype"`
 }
 
 func (HisPatient) TableName() string {