修改bug

controllers/base_api_controller.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"XT_New/enums"
+	//"XT_New/models"
+
 	//"XT_New/models"
 	"XT_New/service"
 	"fmt"
@@ -68,9 +70,9 @@ func (this *BaseAuthAPIController) Prepare() {
 		//var userAdmin models.AdminUser
 		//userAdmin.Id = 400
 		//userAdmin.Mobile = "13535547901"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
+		////
+		//////userAdmin.Id = 597
+		//////userAdmin.Mobile = "19874122664"
 		//userAdmin.IsSuperAdmin = false
 		//userAdmin.Status = 1
 		//userAdmin.CreateTime = 1530786071
@@ -319,8 +321,8 @@ func (this *BaseServeAPIController) Prepare() {
 		//var userAdmin models.AdminUser
 		//userAdmin.Id = 400
 		//userAdmin.Mobile = "13535547901"
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
+		////userAdmin.Id = 597
+		////userAdmin.Mobile = "19874122664"
 		//userAdmin.IsSuperAdmin = false
 		//userAdmin.Status = 1
 		//userAdmin.CreateTime = 1530786071

controllers/patient_api_controller.go

@@ -3479,16 +3479,16 @@ func (c *PatientApiController) ExportPatients() {
 					}
 
 				} else {
-					var tempPatient *models.Patients
-					for _, item := range all_patient {
-						if item.Phone == phone {
-							tempPatient = item
-						}
-					}
+					//var tempPatient *models.Patients
+					//for _, item := range all_patient {
+					//	if item.Phone == phone {
+					//		tempPatient = item
+					//	}
+					//}
 
 					//需要判断该号码是否已经在系统内存在了，存在了则生成一条导入错误日志
-					//count := service.FindPatientPhoneIsExist(phone, c.GetAdminUserInfo().CurrentOrgId)
-					if tempPatient != nil && tempPatient.ID > 0 {
+					count := service.FindPatientPhoneIsExist(phone, c.GetAdminUserInfo().CurrentOrgId)
+					if count >= 1 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
 							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
@@ -3539,14 +3539,15 @@ func (c *PatientApiController) ExportPatients() {
 					}
 
 				} else {
-					var tempPatient *models.Patients
-					for _, item := range all_patient {
-						if item.IdCardNo == id_card_no {
-							tempPatient = item
-						}
-					}
-					//count := service.FindPatientIdCardNoIsExist(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
-					if tempPatient != nil && tempPatient.ID > 0 {
+					//var tempPatient *models.Patients
+					//for _, item := range all_patient {
+					//	if item.IdCardNo == id_card_no {
+					//		tempPatient = item
+					//	}
+					//}
+					count := service.FindPatientIdCardNoIsExist(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
+					if count >= 1 {
+						//if tempPatient != nil && tempPatient.ID > 0 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
 							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
@@ -3796,6 +3797,7 @@ func (c *PatientApiController) ExportPatients() {
 			patient.CreatedTime = time.Now().Unix()
 			patient.UpdatedTime = time.Now().Unix()
 			patient.Status = 1
+			patient.Avatar = "https://images.shengws.com/201809182128111.png"
 			patient.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
 			patient.IsExcelExport = 1
 			patient.PatientType = 1
@@ -3885,13 +3887,19 @@ func IsIdCard(id string) (res bool) {
 		return true
 	} else {
 		tm2, _ := time.Parse("01/02/2006", string([]byte(id)[10:12])+"/"+string([]byte(id)[12:14])+"/"+string([]byte(id)[6:10]))
-		if tm2.Unix() <= 0 {
+		fmt.Println(string([]byte(id)[10:12]) + "/" + string([]byte(id)[12:14]) + "/" + string([]byte(id)[6:10]))
+		fmt.Println(tm2.Unix())
+
+		if tm2.Unix() == 0 {
+
+			fmt.Println("44445555555")
+
 			return false
 		}
 		//检验18位身份证的校验码是否正确。
 		//校验位按照ISO 7064:1983.MOD 11-2的规定生成，X可以认为是数字10。
 		arr_int := []int{7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2}
-		arr_ch := []string{",", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"}
+		arr_ch := []string{"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"}
 		sign := 0
 		for k, v := range arr_int {
 			int_temp, _ := strconv.Atoi(string([]byte(id)[k : k+1]))
@@ -3900,6 +3908,8 @@ func IsIdCard(id string) (res bool) {
 		n := sign % 11
 		val_num := arr_ch[n]
 		if val_num != string([]byte(id)[17:18]) {
+			fmt.Println("5556666666")
+
 			return false
 		}
 		return true