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

controllers/sg/his_api_controller.go

@@ -857,22 +857,7 @@ type ResultSixteen struct {
 			AcctMulaidPay   float64 `json:"acct_mulaid_pay"`
 			HospPartAmt     float64 `json:"hosp_part_amt"`
 			MedinsSetlID    string  `json:"medins_setl_id"`
-			Age             float64 `json:"age"`
-			Brdy            string  `json:"brdy"`
-			Certno          string  `json:"certno"`
-			ClrType         string  `json:"clr_type"`
-			ClrWay          string  `json:"clr_way"`
-			CvlservFlag     string  `json:"cvlserv_flag"`
-			Gend            string  `json:"gend"`
-			Insutype        string  `json:"insutype"`
-			MdtrtCertType   string  `json:"mdtrt_cert_type"`
-			MedType         string  `json:"med_type"`
-			Naty            string  `json:"naty"`
-			PsnCashPay      float64 `json:"psn_cash_pay"`
-			PsnCertType     string  `json:"psn_cert_type"`
-			PsnName         string  `json:"psn_name"`
-			PsnNo           string  `json:"psn_no"`
-			PsnType         string  `json:"psn_type"`
+			PdnCashPay      string  `json:"pdn_cash_pay"`
 		} `json:"setlinfo"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
@@ -2642,7 +2627,7 @@ func (c *HisApiController) Refund() {
 				return
 			}
 			if res2.Infcode == 0 {
-				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, src_resquest)
+				err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, src_resquest, result)
 				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg": "退费成功",
@@ -2664,7 +2649,7 @@ func (c *HisApiController) Refund() {
 			})
 		}
 	} else {
-		err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "")
+		err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", "")
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",
@@ -2822,7 +2807,7 @@ func (c *HisApiController) RefundDetail() {
 			return
 		}
 
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "")
+		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",
@@ -2832,7 +2817,7 @@ func (c *HisApiController) RefundDetail() {
 			return
 		}
 	} else {
-		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "")
+		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId, "", "")
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",
@@ -3135,6 +3120,7 @@ func (c *HisApiController) GetCheckDetailAccount() {
 				_, err = f.Write([]byte(str))
 			}
 			if item.OrderStatus == 3 {
+
 				var str string
 				str = item.SetlId + "	" +
 					item.MdtrtId + "	" +

service/gdyb_service.go

@@ -1391,6 +1391,7 @@ func Gdyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["cash_payamt"] = businessParams.CashPayamt              //现金支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
 	inputData["clr_type"] = "11"                                      // 就诊 ID（来自2201接口返回）
+	inputData["refd_setl_flag"] = 0                                   // 就诊 ID（来自2201接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/his_service.go

@@ -665,8 +665,8 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 
 }
 
-func UpdataOrderStatus(id int64, number string, user_org_id int64, log string) (err error) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "refund_request_log": log}).Error
+func UpdataOrderStatus(id int64, number string, user_org_id int64, log string, result string) (err error) {
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "refund_request_log": log, "refund_log": result}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 	return