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

controllers/zh/zh_his_api_controller.go

@@ -945,22 +945,22 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		totals, _ := strconv.ParseFloat(allTotal, 64)
 		if res.Infcode == 0 {
 			order := &models.HisOrder{
-				UserOrgId:          adminUser.CurrentOrgId,
-				HisPatientId:       record.ID,
-				PatientId:          record.PatientId,
-				SettleAccountsDate: recordDateTime,
-				Ctime:              time.Now().Unix(),
-				Mtime:              time.Now().Unix(),
-				Status:             1,
-				Number:             chrg_bchno,
-				Infcode:            res.Infcode,
-				WarnMsg:            res.WarnMsg,
-				Cainfo:             res.Cainfo,
-				ErrMsg:             res.ErrMsg,
-				RespondTime:        res.RefmsgTime,
-				InfRefmsgid:        res.InfRefmsgid,
-				OrderStatus:        1,
-
+				UserOrgId:           adminUser.CurrentOrgId,
+				HisPatientId:        record.ID,
+				PatientId:           record.PatientId,
+				SettleAccountsDate:  recordDateTime,
+				Ctime:               time.Now().Unix(),
+				Mtime:               time.Now().Unix(),
+				Status:              1,
+				Number:              chrg_bchno,
+				Infcode:             res.Infcode,
+				WarnMsg:             res.WarnMsg,
+				Cainfo:              res.Cainfo,
+				ErrMsg:              res.ErrMsg,
+				RespondTime:         res.RefmsgTime,
+				InfRefmsgid:         res.InfRefmsgid,
+				OrderStatus:         1,
+				MdtrtId:             record.Number,
 				IsMedicineInsurance: 1,
 				SettleType:          settle_accounts_type,
 				SettleStartTime:     start_time,