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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 10215
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,8 +53,8 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-# 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://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+# gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
 # gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
@@ -65,9 +65,9 @@ gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-gdyb_paasid = "sz_prd_yjyy"
+# gdyb_paasid = "sz_prd_yjyy"
 #肇庆
-#  gdyb_paasid = "zq_prd_yjyy"
+gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/zh/zh_his_api_controller.go

@@ -480,7 +480,87 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/zh/api/patient/info", &ZHHisApiController{}, "get:GetZHPatientInfo")
 	beego.Router("/zh/api/readcard", &ZHHisApiController{}, "get:ReadCard")
 
+	beego.Router("/zh/api/clearsettle", &ZHHisApiController{}, "get:ClearSettle")
+
 }
+func (c *ZHHisApiController) ClearSettle() {
+	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	var order models.HisOrder
+	order, _ = service.GetHisOrderByID(order_id)
+	record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
+	if config.IsOpen == 1 { //对接了医保，走医保流程
+		var result string
+		var requestLog string
+		result, requestLog = service.Gdyb90306(order.PsnNo, order.MdtrtId, order.SetlId, miConfig.OrgName, roles.UserName, miConfig.SecretKey, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+		saveLog(result, requestLog, "90306", "撤销结算清单")
+
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat)
+
+		var res ResultSixteen
+		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 {
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "撤销成功",
+			})
+
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"code": -10,
+				"msg":  res.ErrMsg,
+			})
+		}
+
+	} else {
+		err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", "")
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "退费成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+	}
+
+}
+
 func (c *ZHHisApiController) GetZHPatientInfo() {
 	id_card_no := c.GetString("id_card_no")
 	admin_user_id, _ := c.GetInt64("admin_user_id")

service/zh_his_service.go

@@ -1107,6 +1107,65 @@ func Gdyb2305(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	return str, str2
 }
 
+func Gdyb90306(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs 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"] = "90306" // 交易编码
+	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+	inputData["setl_id"] = setlId   // 结算 ID
+	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 := gdyb_url + "90306"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+	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)
+	mjson, _ := json.Marshal(inputMessage)
+	str2 := string(mjson)
+	return str, str2
+}
+
 func CreateHospitalRecord(record *models.HisHospitalCheckRecord) (err error) {
 	err = writeDb.Save(&record).Error
 	return