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

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -160,14 +160,14 @@ func (this *MobileRegistController) CreateOrg() {
 		return
 	}
 	orgPhone := this.GetString("telephone")
-
-	if len(orgPhone) > 0 {
-		if utils.PhoneRegexp().MatchString(orgPhone) == false {
-			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodePhone)
-			this.ServeJSON()
-			return
-		}
-	}
+	//
+	//if len(orgPhone) > 0 {
+	//	if utils.PhoneRegexp().MatchString(orgPhone) == false {
+	//		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodePhone)
+	//		this.ServeJSON()
+	//		return
+	//	}
+	//}
 
 	provinceID := 0
 	cityID := 0
@@ -221,7 +221,9 @@ func (this *MobileRegistController) CreateOrg() {
 		ModifyTime:   time.Now().Unix(),
 	}
 
-	createErr := service.CreateOrg(org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
+	adminUsers, _ := service.GetAdminUserByUserID(adminUser.Id)
+
+	createErr := service.CreateOrg(org, adminUsers.Name, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
 
 	if createErr != nil {
 		utils.ErrorLog("mobile=%v的超级管理员创建机构失败：%v", adminUser.Mobile, createErr)
@@ -515,7 +517,7 @@ func InitPatientAndSchedule(org *models.Org) {
 
 	//创建两个血透的虚拟病人到新表
 	fmt.Print("patients", patients)
-	for index, it := range patients {
+	for _, it := range patients {
 		patientsNew := models.XtPatientsNew{
 			UserOrgId:               org.Id,
 			CreatedTime:             time.Now().Unix(),
@@ -555,13 +557,7 @@ func InitPatientAndSchedule(org *models.Org) {
 			TellPhone:               it.TellPhone,
 			FirstTreatmentDate:      it.FirstTreatmentDate,
 			ContactName:             it.ContactName,
-		}
-		if index == 1 {
-			patientsNew.IsInfectious = 1
-
-		} else {
-			patientsNew.IsInfectious = 2
-
+			IsInfectious:            it.IsInfectious,
 		}
 
 		service.CreateVMOrgNewPatient(&patientsNew)

controllers/new_mobile_api_controllers/patient.json

@@ -45,7 +45,7 @@
       "hospital_first_dialysis_date": 1511366400,
       "induction_period": 0,
       "initial_dialysis": 0,
-      "total_dialysis": 14,
+      "total_dialysis": 0,
       "attending_doctor_id": 0,
       "head_nurse_id": 0,
       "evaluate": "",
@@ -78,7 +78,7 @@
       "tell_phone": "21212",
       "first_treatment_date": 1582560000,
       "contact_name": "21221",
-      " is_infectious":1
+      "is_infectious":1
     },
     {
       "avatar": "https://images.shengws.com/201809182128111.png",
@@ -125,7 +125,7 @@
       "hospital_first_dialysis_date": 1511366400,
       "induction_period": 0,
       "initial_dialysis": 0,
-      "total_dialysis": 14,
+      "total_dialysis": 0,
       "attending_doctor_id": 0,
       "head_nurse_id": 0,
       "evaluate": "",
@@ -158,7 +158,7 @@
       "tell_phone": "21212",
       "first_treatment_date": 1582560000,
       "contact_name": "21221",
-      " is_infectious":2
+      "is_infectious":2
 
     }
   ]