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

controllers/zh/zh_his_api_controller.go

@@ -1994,8 +1994,11 @@ func (c *ZHHisApiController) ZHRefund() {
 
 		if res.Infcode == 0 {
 			err := service.UpdataOrderStatusThree(order_id, order.Number, adminUser.CurrentOrgId, src_resquest, result)
-			record.OutHospitalStatus = 0
-			service.CreateHospitalRecord(&record)
+			//不同地区退费流程不一样，肇庆那边退费就包括撤销出院，内蒙古退费不包括撤销明细，所以下面需要根据不同情况进行判断
+			if miConfig.UserOrgId == 10215 {
+				record.OutHospitalStatus = 0
+				service.CreateHospitalRecord(&record)
+			}
 			service.UpdataOrderStatusByNumber(record.Number)
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{