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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10215
+org_id = 10188
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,11 +57,11 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"
-gdyb_paasid = "zq_prd_yjyy"
+# gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/sg/his_api_controller.go

@@ -3558,11 +3558,18 @@ func (c *HisApiController) GetUploadInfo() {
 			fmt.Println("log")
 			fmt.Println(string(userJSONBytes))
 
-			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+			if err := json.Unmarshal(userJSONBytes, &ressix10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+			res2.InfRefmsgid = ressix10265.InfRefmsgid
+			res2.Output = ressix10265.Output
+			res2.ErrMsg = ressix10265.ErrMsg
+			res2.Cainfo = ressix10265.Cainfo
+			res2.WarnMsg = ressix10265.WarnMsg
+			infocode, _ := strconv.ParseInt(ressix10265.Infcode, 10, 64)
+			res2.Infcode = infocode
 
 		} else {
 			if miConfig.MdtrtareaAdmvs == "440781" { //
@@ -3781,11 +3788,18 @@ func (c *HisApiController) GetUploadInfo() {
 					userJSONBytes, _ := json.Marshal(respJSON)
 					fmt.Println("log")
 					fmt.Println(string(userJSONBytes))
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					if err := json.Unmarshal(userJSONBytes, &resFour10265); err != nil {
 						utils.ErrorLog("解析失败：%v", err)
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 						return
 					}
+					res.InfRefmsgid = resFour10265.InfRefmsgid
+					res.Output = resFour10265.Output
+					res.ErrMsg = resFour10265.ErrMsg
+					res.Cainfo = resFour10265.Cainfo
+					res.WarnMsg = resFour10265.WarnMsg
+					infocode, _ := strconv.ParseInt(resFour10265.Infcode, 10, 64)
+					res.Infcode = infocode
 
 				} else {
 
@@ -4126,12 +4140,20 @@ func (c *HisApiController) GetUploadInfo() {
 							respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 							result, _ := json.Marshal(respJSON)
 
-							if err := json.Unmarshal([]byte(result), &res); err != nil {
+							if err := json.Unmarshal([]byte(result), &resSeven10265); err != nil {
 								utils.ErrorLog("解析失败：%v", err)
 								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 								return
 							}
 
+							res.InfRefmsgid = resSeven10265.InfRefmsgid
+							res.Output = resSeven10265.Output
+							res.ErrMsg = resSeven10265.ErrMsg
+							res.Cainfo = resSeven10265.Cainfo
+							res.WarnMsg = resSeven10265.WarnMsg
+							infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+							res.Infcode = infocode
+
 						} else {
 							if miConfig.Code == "H15049901371" {
 								//赤峰地区国家医保医疗类别
@@ -4469,12 +4491,20 @@ func (c *HisApiController) GetUploadInfo() {
 				result, _ := json.Marshal(respJSON)
 				fmt.Println("log")
 				fmt.Println(string(result))
-				if err := json.Unmarshal([]byte(result), &res); err != nil {
+				if err := json.Unmarshal([]byte(result), &resSeven10265); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
 
+				res.InfRefmsgid = resSeven10265.InfRefmsgid
+				res.Output = resSeven10265.Output
+				res.ErrMsg = resSeven10265.ErrMsg
+				res.Cainfo = resSeven10265.Cainfo
+				res.WarnMsg = resSeven10265.WarnMsg
+				infocode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+				res.Infcode = infocode
+
 			} else {
 
 				var src_resquest string
@@ -6258,12 +6288,20 @@ func (c *HisApiController) Refund() {
 
 			respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			userJSONBytes3, _ := json.Marshal(respJSON3)
-			if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
+			if err := json.Unmarshal(userJSONBytes3, &resSixteen10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
+			res.InfRefmsgid = resSixteen10265.InfRefmsgid
+			res.Output = resSixteen10265.Output
+			res.ErrMsg = resSixteen10265.ErrMsg
+			res.Cainfo = resSixteen10265.Cainfo
+			res.WarnMsg = resSixteen10265.WarnMsg
+			infocode, _ := strconv.ParseInt(resSixteen10265.Infcode, 10, 64)
+			res.Infcode = infocode
+
 		} else {
 
 			if miConfig.Code == "H15049901371" {
@@ -6375,12 +6413,20 @@ func (c *HisApiController) Refund() {
 				userJSONBytes3, _ := json.Marshal(respJSON3)
 				fmt.Println("log")
 				fmt.Println(string(userJSONBytes3))
-				if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+				if err := json.Unmarshal(userJSONBytes3, &resSix10265); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
 
+				res2.InfRefmsgid = resSix10265.InfRefmsgid
+				res2.Output = resSix10265.Output
+				res2.ErrMsg = resSix10265.ErrMsg
+				res2.Cainfo = resSix10265.Cainfo
+				res2.WarnMsg = resSix10265.WarnMsg
+				infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+				res2.Infcode = infocode
+
 			} else {
 
 				if miConfig.Code == "H15049901371" {
@@ -6548,14 +6594,20 @@ func (c *HisApiController) RefundNumber() {
 
 			respJSON3 = respJSON3["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			userJSONBytes3, _ := json.Marshal(respJSON3)
-			fmt.Println("log")
-			fmt.Println(string(userJSONBytes3))
-			if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+			if err := json.Unmarshal(userJSONBytes3, &resSix10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
+			res2.InfRefmsgid = resSix10265.InfRefmsgid
+			res2.Output = resSix10265.Output
+			res2.ErrMsg = resSix10265.ErrMsg
+			res2.Cainfo = resSix10265.Cainfo
+			res2.WarnMsg = resSix10265.WarnMsg
+			infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+			res2.Infcode = infocode
+
 		} else {
 			var api3 string
 
@@ -6731,6 +6783,8 @@ func (c *HisApiController) RefundDetail() {
 				return
 			}
 		} else if miConfig.MdtrtareaAdmvs == "320921" {
+			var resSix10265 ResultSix10265
+
 			api3 := "http://192.168.3.111:9532/" + "jsyb/2205?psn_no=" + order.PsnNo +
 				"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&ak=" + miConfig.ChannelNumber
@@ -6756,12 +6810,20 @@ func (c *HisApiController) RefundDetail() {
 			userJSONBytes3, _ := json.Marshal(respJSON3)
 			fmt.Println("log")
 			fmt.Println(string(userJSONBytes3))
-			if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+			if err := json.Unmarshal(userJSONBytes3, &resSix10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
+			res2.InfRefmsgid = resSix10265.InfRefmsgid
+			res2.Output = resSix10265.Output
+			res2.ErrMsg = resSix10265.ErrMsg
+			res2.Cainfo = resSix10265.Cainfo
+			res2.WarnMsg = resSix10265.WarnMsg
+			infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+			res2.Infcode = infocode
+
 			err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -7492,12 +7554,20 @@ func (c *HisApiController) GetSettleAccounts() {
 			result, _ := json.Marshal(respJSON)
 			fmt.Println("log")
 			fmt.Println(string(result))
-			if err := json.Unmarshal([]byte(result), &res); err != nil {
+			if err := json.Unmarshal([]byte(result), &resEleven10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
+			res.InfRefmsgid = resEleven10265.InfRefmsgid
+			res.Output = resEleven10265.Output
+			res.ErrMsg = resEleven10265.ErrMsg
+			res.Cainfo = resEleven10265.Cainfo
+			res.WarnMsg = resEleven10265.WarnMsg
+			infocode, _ := strconv.ParseInt(resEleven10265.Infcode, 10, 64)
+			res.Infcode = infocode
+
 		} else {
 			result2 := service.Gdyb5204(baseParams, businessParams)
 			saveLog(result2, "", "5204", "查询")

service/gdyb_service.go

@@ -772,15 +772,17 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 }
 
 type Custom struct {
-	DetItemFeeSumamt string
-	Cut              string
-	FeedetlSn        string
-	Price            string
-	MedListCodg      string
-	LmtUsedFlag      int64
-	HospApprFlag     int64
-	DoctorNumber     string
-	DoctorName       string
+	DetItemFeeSumamt        string
+	Cut                     string
+	FeedetlSn               string
+	Price                   string
+	MedListCodg             string
+	LmtUsedFlag             int64
+	HospApprFlag            int64
+	DoctorNumber            string
+	DoctorName              string
+	ProvinceDrugMedListCodg string
+	ProvinceGoodMedListCodg string
 }
 
 type RequestResult struct {

service/jsyb_service.go

@@ -329,6 +329,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						HospApprFlag:     subItem.HospApprFlag,
 						DoctorNumber:     doctor_id,
 						DoctorName:       new_doctor_name,
+						//ProvinceDrugMedListCodg:  subItem.BaseDrugLib.
 					}
 
 					customs = append(customs, cus)