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

conf/app.conf

@@ -122,6 +122,7 @@ redisdb = 0
 
 
 
+
 niprocart =  63
 jms = 58
 fistula_needle_set = 65

controllers/dialysis_api_controller.go

@@ -1369,7 +1369,17 @@ func (c *DialysisApiController) PostPrescription() {
 			}
 		}
 
-		prescription.Creater = adminUserInfo.AdminUser.Id
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			prescription_doctor := adminUserInfo.AdminUser.Id
+			prescription.PrescriptionDoctor = prescription_doctor
+		}
+		if dialysisPrescription.Creater == 0 { //体重称
+			prescription.Creater = adminUserInfo.AdminUser.Id
+
+		} else {
+			prescription.Creater = dialysisPrescription.Creater
+		}
+
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.UpdatedTime = time.Now().Unix()
 		prescription.Modifier = adminUserInfo.AdminUser.Id

controllers/mobile_api_controllers/admin_user_api_controller.go

@@ -18,9 +18,8 @@ type AdminUserApiController struct {
 func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
-
-	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
-
+	orgId, _ := service.GetCreatByOrgId(adminUserInfo.Org.Id)
+	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, orgId.Creator)
 	if es != nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"state":                1,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2236,14 +2236,13 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.Modifier = adminUserInfo.AdminUser.Id
-		if dialysisPrescription.Creater == 0 {
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			prescription_doctor := adminUserInfo.AdminUser.Id
+			prescription.PrescriptionDoctor = prescription_doctor
+		}
+		if dialysisPrescription.Creater == 0 { //体重称
 			prescription.Creater = adminUserInfo.AdminUser.Id
-			if appRole.UserType == 2 || appRole.UserType == 1 {
-				prescription_doctor = adminUserInfo.AdminUser.Id
-				prescription.PrescriptionDoctor = dialysisPrescription.PrescriptionDoctor
-			} else {
-				prescription_doctor = 0
-			}
+
 		} else {
 			prescription.Creater = dialysisPrescription.Creater
 		}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2186,25 +2186,6 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
 	}
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	//if appRole.UserType == 3{
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdvicePermissionDeniedModify)
-	//	return
-	//}
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-	//if appRole.UserType == 3 {
-	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-	//	if getPermissionErr != nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//		return
-	//	} else if headNursePermission == nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-	//		return
-	//	}
-	//}
-	//TODO根据路由做权限
 
 	group_no, _ := c.GetInt64("group_no")
 	if group_no <= 0 {
@@ -2234,12 +2215,23 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		return
 	}
 
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+	time_arr := strings.Split(startTime2, " ")
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
 	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
 		utils.ErrorLog("advice_date")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	adviceDate, _ := dataBody["advice_date"].(string)
+	adviceDate := startTime2
 	if len(adviceDate) == 0 {
 		utils.ErrorLog("len(adviceDate) == 0")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1496,6 +1496,26 @@ func (this *NewDialysisApiController) GetAllDoctor() {
 	})
 }
 
+func (this *NewDialysisApiController) GetAllProjectName() {
+	id := this.GetString("date")
+	fmt.Println("id是", id)
+	ids, _ := strconv.ParseInt(id, 10, 64)
+	patientid := this.GetString("patientid")
+	fmt.Println("patient", patientid)
+	paientids, _ := strconv.ParseInt(patientid, 10, 64)
+	patient, _ := service.GetNewPatient(paientids)
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	projectName, err := service.GetAllProjectName(ids, orgid, patient.BloodId)
+	fmt.Println("projectname----------------------------------", err)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectName": projectName,
+	})
+}
+
 func (this *NewDialysisApiController) GetAllInspection() {
 
 	//查询该机构是否存在检验检测项目
@@ -1701,10 +1721,11 @@ func (this *NewDialysisApiController) SaveMessage() {
 	fmt.Println("id", id)
 	message := this.GetString("message")
 	fmt.Println("message", message)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
 		Message: message,
 	}
-	err := service.SaveMessage(id, &role)
+	err := service.SaveMessage(id, orgid, &role)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1719,8 +1740,10 @@ func (this *NewDialysisApiController) SaveSex() {
 	fmt.Println("sex", sex)
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
-		Sex: sex,
+		Sex:   sex,
+		OrgId: orgid,
 	}
 	err := service.SaveSex(id, &role)
 	if err != nil {
@@ -1743,8 +1766,11 @@ func (this *NewDialysisApiController) SaveBirthday() {
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
 	birth := theTime.Unix()
+	orgid := dataBody["orgid"].(string)
+	orgids, err := strconv.ParseInt(orgid, 10, 64)
 	role := models.SgjUserAdminRole{
 		Birthday: birth,
+		OrgId:    orgids,
 	}
 	err = service.SaveBirthday(ids, &role)
 	if err != nil {
@@ -2205,7 +2231,8 @@ func (this *NewDialysisApiController) EditOrg() {
 
 func (this *NewDialysisApiController) GetMyInforName() {
 	id, _ := this.GetInt64("id")
-	Username, err := service.GetAdminName(id)
+	orgid, _ := this.GetInt64("orgid")
+	Username, err := service.GetAdminName(id, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2217,10 +2244,16 @@ func (this *NewDialysisApiController) GetMyInforName() {
 
 func (this *NewDialysisApiController) GetMyInformationFour() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	creatId := adminUserInfo.AdminUser.Id
-	fmt.Println("创建者ID", creatId)
+	//creatId := adminUserInfo.AdminUser.Id
+	//fmt.Println("创建者ID", creatId)
 	orgid := adminUserInfo.Org.Id
+	//跟剧机构ID获取创建者ID
 	fmt.Println("orgid", orgid)
+	//OrgId, _ := service.GetCreatByOrgId(orgid)
+	//fmt.Println("创建者ID", OrgId.Creator)
+	creatId := adminUserInfo.AdminUser.Id
+	fmt.Println("creatid", creatId)
+	fmt.Println("当前机构ID信息", orgid)
 	Username, err := service.GetMyOrgInformationFour(creatId, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2336,7 +2369,6 @@ func (this *NewDialysisApiController) GetMyOrgInformation() {
 	fmt.Println("cretor", creator)
 	adminInfo := this.GetMobileAdminUserInfo()
 	appId := adminInfo.App.Id
-	//fmt.Println("appid------------------------------------",appId)
 	information, err := service.GetMyOrgInformation(creator, appId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2350,11 +2382,12 @@ func (this *NewDialysisApiController) GetMyOrgInformation() {
 func (this *NewDialysisApiController) SaveNameTwo() {
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
-	fmt.Println("name------------------", name)
+	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
 		UserName: name,
 	}
-	err := service.SaveNameTwo(id, &role)
+	err := service.SaveNameTwo(id, orgid, &role)
+	fmt.Println("err", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2403,3 +2436,68 @@ func (this *NewDialysisApiController) GetMyMobile() {
 		"mobile": mobile,
 	})
 }
+
+func (this *NewDialysisApiController) SumitForm() {
+
+	name := this.GetString("name")
+	fmt.Println("姓名", name)
+	mobile := this.GetString("mobile")
+	fmt.Println("mobile", mobile)
+	address := this.GetString("address")
+	fmt.Println("address", address)
+	positon := this.GetString("position")
+	fmt.Println("职位", positon)
+	hospitalName := this.GetString("hospitalName")
+	fmt.Println("医院名称", hospitalName)
+	systemName := this.GetString("systemName")
+	fmt.Println("系统名称", systemName)
+	isUser, _ := this.GetInt64("isUser")
+	fmt.Println("是否使用", isUser)
+	isThink, _ := this.GetInt64("isThink")
+	fmt.Println("是否考虑", isThink)
+	result := this.GetString("result")
+	fmt.Println("result", result)
+	otherRemark := this.GetString("otherRemark")
+	fmt.Println("result", otherRemark)
+	otherMessage := this.GetString("otherMessage")
+	fmt.Println("otherMessage", otherMessage)
+	gift, _ := this.GetInt64("gift")
+	fmt.Println("gift", gift)
+	admininfo := this.GetMobileAdminUserInfo()
+	creator := admininfo.AdminUser.Id
+	fmt.Println("创建者", creator)
+	_, errcode := service.GetActivtyCreator(creator)
+	if errcode == gorm.ErrRecordNotFound {
+		table := models.KyActivityTable{
+			Name:         name,
+			Phone:        mobile,
+			Address:      address,
+			Position:     positon,
+			HospitalName: hospitalName,
+			SystemName:   systemName,
+			IsUser:       isUser,
+			IsThink:      isThink,
+			OtherMode:    result,
+			OtherRemark:  otherRemark,
+			OtherMessage: otherMessage,
+			Gift:         gift,
+			AdminUserId:  creator,
+			Status:       1,
+			Ctime:        time.Now().Unix(),
+		}
+		err := service.CreateTable(&table)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"table": table,
+		})
+	} else if errcode == nil {
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		this.ServeJSON()
+		return
+	} else {
+		return
+	}
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -101,6 +101,7 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/deletemanagement", &NewDialysisApiController{}, "Delete:DeleteManagement")
 	beego.Router("/m/api/patient/updatedpatient", &NewDialysisApiController{}, "Post:UpdatedPatient")
 	beego.Router("/m/api/patient/getalldoctor", &NewDialysisApiController{}, "Get:GetAllDoctor")
+	beego.Router("/m/api/patient/getallprojectname", &NewDialysisApiController{}, "Get:GetAllProjectName")
 	beego.Router("/m/api/patient/getallinspection", &NewDialysisApiController{}, "Get:GetAllInspection")
 	beego.Router("/m/api/patient/getinspection", &NewDialysisApiController{}, "Get:GetInspection")
 	beego.Router("/m/api/patient/getmyinformation", &NewDialysisApiController{}, "Get:GetMyInformation")
@@ -149,4 +150,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getcurrentorg", &NewDialysisApiController{}, "Get:GetCurrentOrg")
 	beego.Router("/m/api/patient/getmyinformationfour", &NewDialysisApiController{}, "Get:GetMyInformationFour")
 	beego.Router("/m/api/org/getMyMobile", &NewDialysisApiController{}, "Get:GetMyMobile")
+	beego.Router("/m/api/patient/sumitform", &NewDialysisApiController{}, "Get:SumitForm")
 }

controllers/patient_api_controller.go

@@ -1060,7 +1060,27 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	adviceDate, _ := dataBody["advice_date"].(string)
+
+	if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
+		utils.ErrorLog("start_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	startTime2, _ := dataBody["start_time"].(string)
+
+	time_arr := strings.Split(startTime2, " ")
+
+	if len(time_arr) > 0 {
+		startTime2 = time_arr[0]
+	}
+
+	if dataBody["advice_date"] == nil || reflect.TypeOf(dataBody["advice_date"]).String() != "string" {
+		utils.ErrorLog("advice_date")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adviceDate := startTime2
 	if len(adviceDate) == 0 {
 		utils.ErrorLog("len(adviceDate) == 0")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

controllers/public_api_controller.go

@@ -486,7 +486,7 @@ func (c *PublicApiController) HandleData() {
 	//
 	//
 	////创建内置角色
-	InitRoleAndPurviews(org_ids)
+	//InitRoleAndPurviews(org_ids)
 
 	//var org_id int = 0
 	//管理员

models/patient_models.go

@@ -813,3 +813,29 @@ func (SgjUserAdminLoginLog) TableName() string {
 
 	return "sgj_user_admin_login_log"
 }
+
+type KyActivityTable struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Phone        string `gorm:"column:phone" json:"phone" form:"phone"`
+	Address      string `gorm:"column:address" json:"address" form:"address"`
+	Position     string `gorm:"column:position" json:"position" form:"position"`
+	HospitalName string `gorm:"column:hospital_name" json:"hospital_name" form:"hospital_name"`
+	IsUser       int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	IsThink      int64  `gorm:"column:is_think" json:"is_think" form:"is_think"`
+	OtherMode    string `gorm:"column:other_mode" json:"other_mode" form:"other_mode"`
+	OtherRemark  string `gorm:"column:other_remark" json:"other_remark" form:"other_remark"`
+	Gift         int64  `gorm:"column:gift" json:"gift" form:"gift"`
+	OtherMessage string `gorm:"column:other_message" json:"other_message" form:"other_message"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	SystemName   string `gorm:"column:system_name" json:"system_name" form:"system_name"`
+	AdminUserId  int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+}
+
+func (KyActivityTable) TableName() string {
+
+	return "ky_activity_table"
+}

service/manage_service.go

@@ -1068,3 +1068,21 @@ func DeleteImages(id int64) error {
 	err := UserWriteDB().Model(&repair).Where("id=?", id).Update(map[string]interface{}{"images": "", "image_name": ""}).Error
 	return err
 }
+
+func GetActivtyCreator(creator int64) (*models.KyActivityTable, error) {
+	table := models.KyActivityTable{}
+	err := UserReadDB().Model(&table).Where("admin_user_id = ? and status =1", creator).Find(&table).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &table, nil
+}
+
+func CreateTable(table *models.KyActivityTable) error {
+
+	err := UserWriteDB().Model(&table).Create(&table).Error
+	return err
+}

service/patientmanage_service.go

@@ -983,6 +983,13 @@ func GetInspectionByOrgId(orgid int64) (*models.XtInspectionReference, error) {
 
 }
 
+func GetAllProjectName(date int64, orgid int64, patientid int64) (inspection []*models.XtInspection, err error) {
+
+	err = XTReadDB().Model(&inspection).Where("inspect_date = ? and org_id = ? and patient_id = ? and status = 1", date, orgid, patientid).Order("inspect_date desc").Group("project_name").Find(&inspection).Error
+
+	return inspection, err
+}
+
 func GetAllInspection(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
 	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1", orgid).Group("project_name").Find(&inspection).Error
@@ -1053,9 +1060,9 @@ func DeleteChildInspection(name string, date int64, orgid int64) error {
 	return err
 }
 
-func SaveMessage(id int64, role *models.SgjUserAdminRole) error {
+func SaveMessage(id int64, orgid int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ? and org_id = ?", id, orgid).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1250,17 +1257,23 @@ func GetMyInfoName(id int64) (models.SgjUserAdminRole, error) {
 	return role, err
 }
 
-func GetAdminName(id int64) (models.AdminUsers, error) {
+func GetAdminName(id int64, orgid int64) (models.AdminUsers, error) {
 	user := models.AdminUsers{}
 	//err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
 	//return user, err
 	db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)
-	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id").Scan(&user).Error
+	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id and r.org_id = ?", orgid).Scan(&user).Error
 	return user, err
 }
 
+func GetCreatByOrgId(orgid int64) (models.SgjUserOrg, error) {
+	org := models.SgjUserOrg{}
+	err := UserReadDB().Model(&org).Where("id=? and status = 1", orgid).Find(&org).Error
+	return org, err
+}
+
 func GetMyOrgInformationFour(creator int64, orgid int64) (models.SgjUserAdminRole, error) {
 	role := models.SgjUserAdminRole{}
 	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and status = 1", creator, orgid).Find(&role).Error
@@ -1361,8 +1374,8 @@ func GetMyOrgInformation(id int64, appid int64) (models.SgjUserAdminRole, error)
 	return admin, err
 }
 
-func SaveNameTwo(id int64, role *models.SgjUserAdminRole) error {
+func SaveNameTwo(id int64, orgid int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =? and org_id = ?", id, orgid).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
 	return err
 }