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

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -697,6 +697,25 @@ func (c *CheckWeightApiController) GetPatientList() {
 	})
 }
 
+func (c *CheckWeightApiController) GetPatientListById() {
+	patientId, _ := c.GetInt64("patient_id", 0)
+	if patientId <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetMobileAdminUserInfo()
+	patient, error := service.GetPatientListById(adminUserInfo.Org.Id, patientId)
+	if error != nil {
+		c.ErrorLog("获取病人详情失败:%v", error)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patientinfo": patient,
+	})
+}
+
 func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	id, _ := c.GetInt64("patient", 0)
 	if id <= 0 {

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -12,6 +12,7 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/savebloodpressure", &CheckWeightApiController{}, "Post:SaveBloodPressure")
 	beego.Router("/m/api/checkbeforedialysis", &CheckWeightApiController{}, "get:GetPatientInfoBeforeDialysis")
 	beego.Router("/m/api/getpatientlist", &CheckWeightApiController{}, "get:GetPatientList")
+	beego.Router("/m/api/getpatientinfo", &CheckWeightApiController{}, "get:GetPatientListById")
 	beego.Router("/m/api/checkdialysis", &CheckWeightApiController{}, "get:GetPatientInfoDialysis")
 	beego.Router("/m/api/savecheckdialysis", &CheckWeightApiController{}, "Post:SavePatientInfoDialysis")
 	beego.Router("/m/api/scheduals", &DialysisAPIController{}, "get:Scheduals")

controllers/patient_api_controller.go

@@ -3458,8 +3458,7 @@ func (c *PatientApiController) ExportPatients() {
 
 			if patientNameM["phone"] != nil || reflect.TypeOf(patientNameM["phone"]).String() == "string" {
 				phone, _ := patientNameM["phone"].(string)
-				if VerifyMobileFormat(phone) == false { //手机号码不符合要求则生成一条导入错误日志
-
+				if utils.CellPhoneRegexp().MatchString(phone) == false { //手机号码不符合要求则生成一条导入错误日志
 					if len(phone) == 0 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
@@ -3872,13 +3871,6 @@ func GetBirthDay(IDCardNo string) *time.Time {
 	return &birthDay
 }
 
-func VerifyMobileFormat(mobileNum string) bool {
-	regular := "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$"
-
-	reg := regexp.MustCompile(regular)
-	return reg.MatchString(mobileNum)
-}
-
 func IsIdCard(id string) (res bool) {
 	id = strings.ToUpper(id)
 	if len(id) != 15 && len(id) != 18 {

models/patient_models.go

@@ -1,5 +1,14 @@
 package models
 
+type PatientListForFaceList struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (PatientListForFaceList) TableName() string {
+	return "xt_patients"
+}
+
 type PatientListForFace struct {
 	ID          int64  `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`

service/patient_service.go

@@ -80,8 +80,8 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 	return
 }
 
-func GetPatientListByUpdateTime(orgID int64, syncTime int64, force int64) (patients []*models.PatientListForFace, total int64, err error) {
-	db := readDb.Model(&models.PatientListForFace{}).Where("user_org_id=? and status=1", orgID)
+func GetPatientListByUpdateTime(orgID int64, syncTime int64, force int64) (patients []*models.PatientListForFaceList, total int64, err error) {
+	db := readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=? and status=1", orgID)
 	if force == 0 {
 		db = db.Where("updated_time >= ?", syncTime)
 	}
@@ -89,6 +89,11 @@ func GetPatientListByUpdateTime(orgID int64, syncTime int64, force int64) (patie
 	return
 }
 
+func GetPatientListById(orgID int64, patientId int64) (patients models.PatientListForFace, err error) {
+	err = readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=? and id = ? and status=1", orgID,patientId).First(&patients).Error
+	return
+}
+
 func GetPatientCount(orgID int64) (total int64) {
 	readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1", orgID).Count(&total)
 	return

utils/tools.go

@@ -40,7 +40,7 @@ func MarkBackUrl(backUrl, defaultUrl string) string {
 func CheckMobile(mobile string) (match bool) {
 
 	//过滤手机
-	match, _ = regexp.MatchString("^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$", mobile)
+	match, _ = regexp.MatchString("^1\\d{10}$", mobile)
 	return
 }