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

controllers/patient_api_controller.go

@@ -3452,17 +3452,33 @@ func (c *PatientApiController) ExportPatients() {
 			if patientNameM["phone"] != nil || reflect.TypeOf(patientNameM["phone"]).String() == "string" {
 				phone, _ := patientNameM["phone"].(string)
 				if VerifyMobileFormat(phone) == false { //手机号码不符合要求则生成一条导入错误日志
-					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,
+
+					if len(phone) == 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
+					} else {
+						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
 					}
-					service.CreateExportErrLog(&err_log)
-					continue
+
 				} else {
 					var tempPatient *models.Patients
 					for _, item := range all_patient {
@@ -3492,19 +3508,37 @@ func (c *PatientApiController) ExportPatients() {
 
 			if patientNameM["id_card_no"] != nil || reflect.TypeOf(patientNameM["id_card_no"]).String() == "string" {
 				id_card_no, _ := patientNameM["id_card_no"].(string)
-				fmt.Println(IsIdCard(id_card_no))
+
 				if IsIdCard(id_card_no) == false { //身份证号码不符合要求则生成一条导入错误日志
-					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,
+
+					if len(id_card_no) == 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
+
+					} else {
+						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
+
 					}
-					service.CreateExportErrLog(&err_log)
-					continue
+
 				} else {
 					var tempPatient *models.Patients
 					for _, item := range all_patient {
@@ -3538,24 +3572,40 @@ func (c *PatientApiController) ExportPatients() {
 				first_dialysis_date, err := time.ParseInLocation(timeLayout, first_treatment_date, loc)
 
 				if err != nil { //首次肾脏治疗时间不符合要求则生成一条导入错误日志
-					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,
+					if len(first_treatment_date) == 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
+
+					} else {
+						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
+
 					}
-					service.CreateExportErrLog(&err_log)
-					continue
 
 				} else {
-					if first_dialysis_date.Unix() == 0 { //首次肾脏治疗时间不符合要求则生成一条导入错误日志
+					if len(first_treatment_date) == 0 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
 							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-							ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的首次肾脏治疗时间格式不符合要求",
+							ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的首次肾脏治疗时间不能为空",
 							Status:     1,
 							CreateTime: time.Now().Unix(),
 							UpdateTime: time.Now().Unix(),
@@ -3564,8 +3614,25 @@ func (c *PatientApiController) ExportPatients() {
 						service.CreateExportErrLog(&err_log)
 						continue
 					} else {
-						patient.FirstDialysisDate = first_dialysis_date.Unix()
+
+						if first_dialysis_date.Unix() == 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
+						} else {
+							patient.FirstDialysisDate = first_dialysis_date.Unix()
+						}
+
 					}
+
 				}
 			}
 
@@ -3583,6 +3650,19 @@ func (c *PatientApiController) ExportPatients() {
 					}
 					service.CreateExportErrLog(&err_log)
 					continue
+				} else if source == 3 {
+					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
+
 				} else {
 					patient.Source = source
 				}
@@ -3602,6 +3682,19 @@ func (c *PatientApiController) ExportPatients() {
 					}
 					service.CreateExportErrLog(&err_log)
 					continue
+				} else if lapseto == 3 {
+					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
+
 				} else {
 					patient.Lapseto = lapseto
 				}
@@ -3621,6 +3714,19 @@ func (c *PatientApiController) ExportPatients() {
 					}
 					service.CreateExportErrLog(&err_log)
 					continue
+				} else if is_infectious == 3 {
+					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
+
 				} else {
 					patient.IsInfectious = is_infectious
 				}