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

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -165,3 +165,18 @@ func RemoveRepeatedPurviewElement(arr []string) (newArr []string) {
 	}
 	return
 }
+
+type AdminUserInfo struct {
+	AdminUser    *models.AdminUser                    `json:"user"`
+	CurrentOrgId int64                                `json:"current_org_id"`
+	CurrentAppId int64                                `json:"current_app_id"`
+	OrgIds       []int64                              `json:"org_ids"`
+	Orgs         map[int64]*models.Org                `json:"orgs"`
+	OrgAppIds    map[int64][]int64                    `json:"org_app_ids"`
+	OrgApps      map[int64](map[int64]*models.OrgApp) `json:"org_apps"`
+	App2OrgIds   map[int64]int64                      `json:"app_to_org_ids"`
+	AppRoles     map[int64]*models.App_Role           `json:"app_roles"`
+	AppPurviews  map[int64][]*models.Purview          `json:"app_purviews"`
+	AppUrlfors   map[int64][]string                   `json:"app_urlfors"`
+	Subscibes    map[int64]*models.ServeSubscibe      `json:"org_subscibes"`
+}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -5,8 +5,10 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"crypto/md5"
 	"encoding/json"
 	"fmt"
+	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -242,7 +244,7 @@ func (this *NewDialysisApiController) SavePatient() {
 	fmt.Print("治疗方式", treatmentmethod)
 
 	//查询身份证号码是否存在
-	thisPatientOne, _ := service.FindPatientByIdCardNoOne(orgid, idCard)
+	thisPatientOne, _ := service.FindPatientByIdCardNoFive(orgid, idCard)
 	if thisPatientOne.ID > 0 {
 		returnData := make(map[string]interface{}, 0)
 		returnData["msg"] = "身份证号码已存在"
@@ -251,7 +253,7 @@ func (this *NewDialysisApiController) SavePatient() {
 	}
 
 	//查询手机号码是否存在
-	thisPatient, err := service.FindPatientByMobileOne(phone, orgid)
+	thisPatient, err := service.FindPatientByMobileFive(phone, orgid)
 	if thisPatient.ID > 0 {
 		returnData := make(map[string]interface{}, 0)
 		returnData["msg"] = "手机号码已存在"
@@ -261,7 +263,7 @@ func (this *NewDialysisApiController) SavePatient() {
 	//如果是血透病人
 	if bloodPatient == 1 {
 		//查询透析号是否存在
-		thisPatientTwo, _ := service.FindPatientByDialysisNoOne(orgid, dialysis)
+		thisPatientTwo, _ := service.FindPatientByDialysisNoFive(orgid, dialysis)
 		if thisPatientTwo.ID > 0 {
 			returnData := make(map[string]interface{}, 0)
 			returnData["msg"] = "透析号已存在"
@@ -1293,7 +1295,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		patient, _ := service.GetNewPatient(id)
 
 		//判断身份证号是否相同
-		thisPatient, _ := service.FindPatientByIdCardNoOne(orgid, idCard)
+		thisPatient, _ := service.FindPatientByIdCardNoOne(orgid, idCard, id)
 		if thisPatient.ID > 0 && thisPatient.ID != patient.BloodId {
 			returnData := make(map[string]interface{}, 0)
 			returnData["msg"] = "身份证号码已存在"
@@ -1302,7 +1304,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		}
 
 		//查询手机号码是否存在
-		thisPatientOne, err := service.FindPatientByMobileOne(phone, orgid)
+		thisPatientOne, err := service.FindPatientByMobileOne(phone, orgid, id)
 		if thisPatientOne.ID > 0 && thisPatientOne.ID != patient.BloodId {
 			returnData := make(map[string]interface{}, 0)
 			returnData["msg"] = "手机号码已存在"
@@ -1311,7 +1313,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		}
 
 		//查询号透析号是否相同
-		thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis)
+		thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis, id)
 		if thisPatientother.ID > 0 && thisPatientother.ID != patient.BloodId {
 			returnData := make(map[string]interface{}, 0)
 			returnData["msg"] = "透析号码已存在"
@@ -2332,3 +2334,33 @@ func (this *NewDialysisApiController) SaveNameTwo() {
 		"role": role,
 	})
 }
+
+func (this *NewDialysisApiController) GetCurrentOrg() {
+	nowTime := time.Now().Unix()
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgId := adminInfo.Org.Id
+	fxKey := beego.AppConfig.String("fxtokenkey")
+	stringA := fmt.Sprintf("org_id=%d&time=%d", orgId, nowTime)
+
+	data := []byte(stringA)
+	has := md5.Sum(data)
+	md5str := fmt.Sprintf("%x", has)
+	stringB := fmt.Sprintf("string=%s&key=%s", md5str, fxKey)
+
+	data = []byte(stringB)
+	has = md5.Sum(data)
+	signToken := fmt.Sprintf("%x", has)
+
+	name, err := service.GetOrgName(orgId)
+	//var fxlink = signToken + fmt.Sprintf("&fxtoken=%s&fxorgid=%d&timestamp=%d&fxadmin=%d", signToken, orgId, nowTime, name.Creator)
+	//fmt.Println(fxlink)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"org":       name,
+		"nowTime":   nowTime,
+		"signToken": signToken,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -144,4 +144,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/updatebed", &NewDialysisApiController{}, "Get:UpdatedBed")
 	beego.Router("/m/api/patient/getmyorginformation", &NewDialysisApiController{}, "Get:GetMyOrgInformation")
 	beego.Router("/m/api/patient/savenametwo", &NewDialysisApiController{}, "Get:SaveNameTwo")
+	beego.Router("/m/api/patient/getcurrentorg", &NewDialysisApiController{}, "Get:GetCurrentOrg")
 }

service/patientmanage_service.go

@@ -406,18 +406,33 @@ func CreatePatientTwo(patient *models.Patients, contagions []int64, diseases []i
 	return
 }
 
-func FindPatientByIdCardNoOne(orgID int64, idCardNo string) (patient models.XtPatientsNew, err error) {
-	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and id_card_no=?", orgID, idCardNo).First(&patient).Error
+func FindPatientByMobileFive(mobile string, orgID int64) (patient models.XtPatientsNew, err error) {
+	err = readDb.Model(&models.Patients{}).Where("phone=? and user_org_id=? and status=1", mobile, orgID).First(&patient).Error
 	return
 }
 
-func FindPatientByDialysisNoOne(orgID int64, dialysisNo string) (patient models.Patients, err error) {
+func FindPatientByDialysisNoFive(orgID int64, dialysisNo string) (patient models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and dialysis_no=?", orgID, dialysisNo).First(&patient).Error
 	return
 }
 
-func FindPatientByMobileOne(mobile string, orgID int64) (patient models.XtPatientsNew, err error) {
-	err = readDb.Model(&models.Patients{}).Where("phone=? and user_org_id=? and status=1", mobile, orgID).First(&patient).Error
+func FindPatientByIdCardNoFive(orgID int64, idCardNo string) (patient models.XtPatientsNew, err error) {
+	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and id_card_no=?", orgID, idCardNo).First(&patient).Error
+	return
+}
+
+func FindPatientByIdCardNoOne(orgID int64, idCardNo string, id int64) (patient models.XtPatientsNew, err error) {
+	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and id_card_no=? and id<>?", orgID, idCardNo, id).First(&patient).Error
+	return
+}
+
+func FindPatientByDialysisNoOne(orgID int64, dialysisNo string, id int64) (patient models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and dialysis_no=? and id<>?", orgID, dialysisNo, id).First(&patient).Error
+	return
+}
+
+func FindPatientByMobileOne(mobile string, orgID int64, id int64) (patient models.XtPatientsNew, err error) {
+	err = readDb.Model(&models.Patients{}).Where("phone=? and user_org_id=? and status=1 and id<>?", mobile, orgID, id).First(&patient).Error
 	return
 }
 
@@ -486,10 +501,11 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 	if patientID > 0 {
 		db = db.Where("x.patient_id = ?", patientID)
 	}
-	if advice_type > 0 {
+	if advice_type == 1 {
 		db = db.Where("x.advice_type = ?", advice_type)
-	} else if advice_type == 0 {
-		db = db.Where("x.advice_type in (?)", []int{1, 3})
+	}
+	if advice_type == 3 {
+		db = db.Where("x.advice_type <> 1")
 	}
 	if start > 0 {
 		db = db.Where("x.start_time>=?", start)
@@ -515,11 +531,13 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 	if patientID > 0 {
 		db = db.Where("x.patient_id = ?", patientID)
 	}
-	if advice_type > 0 {
+	if advice_type == 1 {
 		db = db.Where("x.advice_type = ?", advice_type)
-	} else if advice_type == 0 {
-		db = db.Where("x.advice_type in (?)", []int{1, 3})
 	}
+	if advice_type == 3 {
+		db = db.Where("x.advice_type <> 1")
+	}
+
 	if start > 0 {
 		db = db.Where("x.start_time>=?", start)
 	}