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

controllers/patient_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/utils"
 	"encoding/json"
 	"log"
+	"math/rand"
 	"reflect"
 	"regexp"
 	"strconv"
@@ -3650,7 +3651,6 @@ func (c *PatientApiController) ExportPatients() {
 
 			if patientNameM["dialysis_no"] != nil || reflect.TypeOf(patientNameM["dialysis_no"]).String() == "string" {
 				dialysis_no, _ := patientNameM["dialysis_no"].(string)
-
 				var tempPatient *models.Patients
 				for _, item := range all_patient {
 					if item.DialysisNo == dialysis_no {
@@ -3658,21 +3658,10 @@ func (c *PatientApiController) ExportPatients() {
 					}
 				}
 				if tempPatient != nil && tempPatient.ID > 0 {
-					err_log := models.ExportErrLog{
-						LogType:    1,
-						UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的透析号在系统中已经存在",
-						Status:     1,
-						CreateTime: time.Now().Unix(),
-						UpdateTime: time.Now().Unix(),
-						ExportTime: export_time,
-					}
-					service.CreateExportErrLog(&err_log)
-					continue
+					patient.DialysisNo = GenerateDialysisNoTwo(patients)
+				} else {
+					patient.DialysisNo = dialysis_no
 				}
-
-				patient.DialysisNo = dialysis_no
-
 			}
 
 			if patientNameM["height"] != nil || reflect.TypeOf(patientNameM["height"]).String() == "string" {
@@ -3806,3 +3795,17 @@ func (c *PatientApiController) GetMaxDialysisNo() {
 	})
 
 }
+
+func GenerateDialysisNoTwo(patients []*models.Patients) string {
+	dialysisNo2 := fmt.Sprintf("%06v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(1000000))
+	var tempPatient *models.Patients
+	for _, item := range patients {
+		if item.DialysisNo == dialysisNo2 {
+			tempPatient = item
+		}
+	}
+	if tempPatient == nil || tempPatient.ID == 0 {
+		return dialysisNo2
+	}
+	return GenerateDialysisNoTwo(patients)
+}