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

conf/app.conf

 
 
 [prod]
-org_id = 10265
+org_id = 10088
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

 }
 func (c *HisApiController) RefundDetail() {
 	order_id, _ := c.GetInt64("order_id")
+	//admin_user_id, _ := c.GetInt64("admin_user_id")
+
 	//his_patient_id, _ := c.GetInt64("his_patient_id")
 
 	number := c.GetString("number")
 	record_time := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	adminUser := c.GetAdminUserInfo()
+	//roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 	fmt.Println(err)
 	if err != nil {
 	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 
 	if config.IsOpen == 1 { //对接了医保，走医保流程
-		api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
-			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-		resp2, requestErr2 := http.Get(api2)
-		if requestErr2 != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		var res2 ResultSix
 
-		body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-		if ioErr2 != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+		if miConfig.MdtrtareaAdmvs == "421300" {
+			api3 := "http://192.168.124.4:9532/" + "hbyb/2205?psn_no=" + order.PsnNo +
+				"&mdtrt_id=" + order.MdtrtId + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+			resp3, requestErr3 := http.Get(api3)
+			if requestErr3 != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			body3, ioErr3 := ioutil.ReadAll(resp3.Body)
+			if ioErr3 != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr3)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON3 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body3)), &respJSON3); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "退费成功",
-			})
+			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 {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "撤销明细成功",
+				})
+				return
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+			api2 := "http://127.0.0.1:9532/" + "gdyb/six?psn_no=" + his.PsnNo +
+				"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+			resp2, requestErr2 := http.Get(api2)
+			if requestErr2 != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			body2, ioErr2 := ioutil.ReadAll(resp2.Body)
+			if ioErr2 != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "撤销明细成功",
+				})
+				return
+
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
 		}
 	} else {
 		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")