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

conf/app.conf

@@ -161,14 +161,14 @@ front_end_domain = "http://xt.test.sgjyun.com/#"
 
 org_id = 4
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
-#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
-gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
+#gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #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://10.87.67.83:8080/mbs-hi-intf/web/api/webservices/hb/interface/"
-gdyb_paasid = "test_sz"
+#gdyb_paasid = "test_sz"
 #gdyb_paasid = zh_cs
-#gdyb_paasid = test_hosp
+gdyb_paasid = test_hosp
 #gdyb_paasid = zq_prd_yjyy
 
 #gdyb_paasid = "zh_prd_yjyy"

controllers/zh/zh_his_api_controller.go

@@ -1274,7 +1274,7 @@ func (c *ZHHisApiController) ZHRefund() {
 			return
 		}
 		if res.Infcode == 0 {
-			err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, src_resquest, result)
+			err := service.UpdataOrderStatusThree(order_id, order.Number, adminUser.CurrentOrgId, src_resquest, result)
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "退费成功",

service/his_service.go

@@ -722,6 +722,14 @@ func UpdataOrderStatus(id int64, number string, user_org_id int64, log string, r
 
 }
 
+func UpdataOrderStatusThree(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, "status": 0}).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": 4, "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
+
+}
+
 func UpdataRegStatus(patient_id int64, record_time int64, org_id int64) {
 	writeDb.Model(&models.HisPatient{}).Where("patient_id = ? AND status = 1 AND record_date =? AND user_org_id = ?", patient_id, record_time, org_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
 	//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