Parcourir la source

Merge branch 'xt_statistics_branch' of http://git.shengws.com/csx/XT_New into xt_statistics_branch

XMLWAN il y a 5 ans
Parent
révision
49961ed296

+ 7 - 0
controllers/new_mobile_api_controllers/dialysis_process_api_controller.go Voir le fichier

1
+package new_mobile_api_controllers
2
+
3
+import "XT_New/controllers/mobile_api_controllers"
4
+
5
+type DialysisProcessApiController struct {
6
+	mobile_api_controllers.MobileBaseAPIController
7
+}

+ 2 - 2
controllers/schedule_api_controller.go Voir le fichier

782
 					err_log := models.ExportErrLog{
782
 					err_log := models.ExportErrLog{
783
 						LogType:    2,
783
 						LogType:    2,
784
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
784
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
785
-						ErrMsg:     "存在同名同姓的两个病人",
785
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名,无法确定到具体患者",
786
 						Status:     1,
786
 						Status:     1,
787
 						CreateTime: time.Now().Unix(),
787
 						CreateTime: time.Now().Unix(),
788
 						UpdateTime: time.Now().Unix(),
788
 						UpdateTime: time.Now().Unix(),
1336
 					err_log := models.ExportErrLog{
1336
 					err_log := models.ExportErrLog{
1337
 						LogType:    3,
1337
 						LogType:    3,
1338
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
1338
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
1339
-						ErrMsg:     "存在同名同姓的两个病人",
1339
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名,无法确定到具体患者",
1340
 						Status:     1,
1340
 						Status:     1,
1341
 						CreateTime: time.Now().Unix(),
1341
 						CreateTime: time.Now().Unix(),
1342
 						UpdateTime: time.Now().Unix(),
1342
 						UpdateTime: time.Now().Unix(),