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

controllers/manage_api_controller.go

@@ -3029,10 +3029,10 @@ func (this *MachineApiController) GetTimeData() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
 	timeData, err := service.GetTimeData(equitid, orgid, theTime.Unix())
-	fmt.Print("报错----------------", err)
+	fmt.Print("报错", err)
 	timeDataTwo, err := service.GetTimeTwo(equitid, orgid, theTime.Unix())
 	timeDataThree, err := service.GetTimeThree(equitid, orgid, theTime.Unix())
-	fmt.Print("err报错了没有-------------------------------", err)
+	fmt.Print("err报错了没有", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -3047,7 +3047,7 @@ func (this *MachineApiController) GetTimeData() {
 func (this *MachineApiController) DeleteImages() {
 	id, _ := this.GetInt64("id")
 	err := service.DeleteImages(id)
-	fmt.Print("err========", err)
+	fmt.Print("err", err)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
 		return

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -719,9 +719,11 @@ func (this *NewDialysisApiController) GetAllBloodDialysisPatient() {
 	fmt.Print("page", page)
 	limit, _ := this.GetInt64("limit")
 	fmt.Print("limit", limit)
+	lapseto, _ := this.GetInt64("patientstatus")
+	source, _ := this.GetInt64("source")
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	orgid := adminUserInfo.Org.Id
-	patient, total, err := service.GetAllBloodDialysisPatient(orgid, page, limit)
+	patient, total, err := service.GetAllBloodDialysisPatient(orgid, page, limit, lapseto, source)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1546,14 +1548,15 @@ func (this *NewDialysisApiController) GetInspection() {
 }
 
 func (this *NewDialysisApiController) GetMyInformation() {
-	adminUserInfo := this.GetMobileAdminUserInfo()
-
-	roleInfo := adminUserInfo.AppRole
-	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
-
+	id, _ := this.GetInt64("id")
+	fmt.Println("id--------------", id)
+	roleInfo, err := service.GetPosition(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"electronic_signature": es,
-		"roleInfo":             roleInfo,
+		"roleInfo": roleInfo,
 	})
 	return
 }
@@ -1661,16 +1664,14 @@ func (this *NewDialysisApiController) DeleteChildInspection() {
 }
 
 func (this *NewDialysisApiController) SaveMessage() {
-	orgid := this.GetMobileAdminUserInfo().Org.Id
-	appid := this.GetMobileAdminUserInfo().App.Id
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
 	message := this.GetString("message")
 	fmt.Println("message", message)
-	role := models.App_Role{
+	role := models.SgjUserAdminRole{
 		Message: message,
 	}
-	err := service.SaveMessage(orgid, appid, id, &role)
+	err := service.SaveMessage(id, &role)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1681,16 +1682,14 @@ func (this *NewDialysisApiController) SaveMessage() {
 }
 
 func (this *NewDialysisApiController) SaveSex() {
-	orgid := this.GetMobileAdminUserInfo().Org.Id
-	appid := this.GetMobileAdminUserInfo().App.Id
 	sex, _ := this.GetInt64("sex")
 	fmt.Println("sex", sex)
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
-	role := models.App_Role{
+	role := models.SgjUserAdminRole{
 		Sex: sex,
 	}
-	err := service.SaveSex(id, orgid, appid, &role)
+	err := service.SaveSex(id, &role)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1701,8 +1700,6 @@ func (this *NewDialysisApiController) SaveSex() {
 }
 
 func (this *NewDialysisApiController) SaveBirthday() {
-	orgid := this.GetMobileAdminUserInfo().Org.Id
-	appid := this.GetMobileAdminUserInfo().App.Id
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println(err)
@@ -1713,10 +1710,10 @@ func (this *NewDialysisApiController) SaveBirthday() {
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
 	birth := theTime.Unix()
-	role := models.App_Role{
+	role := models.SgjUserAdminRole{
 		Birthday: birth,
 	}
-	err = service.SaveBirthday(ids, orgid, appid, &role)
+	err = service.SaveBirthday(ids, &role)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1934,3 +1931,53 @@ func (this *NewDialysisApiController) DeleteBed() {
 	this.ServeSuccessJSON(returnData)
 	return
 }
+
+func (this *NewDialysisApiController) LoginOut() {
+
+	this.DelSession("mobile_admin_user_info")
+	this.Ctx.SetCookie("token_cookie", "")
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "删除失败"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *NewDialysisApiController) GetMemberPatient() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	patient, err := service.GetMemberPatient(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}
+
+func (this *NewDialysisApiController) GetSlowPatient() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	patient, err := service.GetSlowPatient(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}
+
+func (this *NewDialysisApiController) GetBloodPatient() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	patient, err := service.GetBloodPatient(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -123,4 +123,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/savebed", &NewDialysisApiController{}, "Get:SaveBed")
 	beego.Router("/m/api/patient/getallnumber", &NewDialysisApiController{}, "Get:GetAllNumber")
 	beego.Router("/m/api/patient/deletebed", &NewDialysisApiController{}, "Delete:DeleteBed")
+	beego.Router("/m/api/patient/loginout", &NewDialysisApiController{}, "Get:LoginOut")
+	beego.Router("/m/api/patient/getmemberpatient", &NewDialysisApiController{}, "Get:GetMemberPatient")
+	beego.Router("/m/api/patient/getslowpatient", &NewDialysisApiController{}, "Get:GetSlowPatient")
+	beego.Router("/m/api/patient/getbloodpatient", &NewDialysisApiController{}, "Get:GetBloodPatient")
 }

models/dialysis.go

@@ -817,6 +817,9 @@ type SgjUserAdminRole struct {
 	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"`
+	Message     string `gorm:"column:message" json:"message" form:"message"`
+	Sex         int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
 }
 
 func (SgjUserAdminRole) TableName() string {

service/manage_service.go

@@ -1064,3 +1064,9 @@ func GetPositionName(adminid int64, orgid int64, appid int64) (models.App_Role,
 	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and app_id = ?", adminid, orgid, appid).Find(&role).Error
 	return role, err
 }
+
+func GetPosition(id int64) (models.SgjUserAdminRole, error) {
+	roles := models.SgjUserAdminRole{}
+	err = UserReadDB().Model(&roles).Where("id=? and status = 1", id).Find(&roles).Error
+	return roles, err
+}

service/patientmanage_service.go

@@ -26,11 +26,17 @@ func GetBloodDialysisPatient(orgid int64, page int64, limit int64) (patients []*
 	return
 }
 
-func GetAllBloodDialysisPatient(orgid int64, page int64, limit int64) (patients []*models.XtPatientsNew, total int64, err error) {
+func GetAllBloodDialysisPatient(orgid int64, page int64, limit int64, lapseto int64, source int64) (patients []*models.XtPatientsNew, total int64, err error) {
 	db := XTReadDB().Table("xt_patients_new as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ? and x.blood_patients = 1", orgid)
 	}
+	if lapseto > 0 {
+		db = db.Where("x.lapseto = ?", lapseto)
+	}
+	if source > 0 {
+		db = db.Where("x.source = ?", source)
+	}
 	offset := (page - 1) * limit
 	err = db.Count(&total).Order("x.created_time desc").Offset(offset).Limit(limit).
 		Select("x.id,x.user_org_id,x.user_id,x.avatar,x.patient_type,x.dialysis_no,x.admission_number,x.source,x.lapseto,x.partition_id,x.bed_id,x.name,x.alias,x.gender,x.marital_status,x.id_card_no,x.birthday,x.reimbursement_way_id,x.health_care_type,x.health_care_no,x.health_care_due_date,x.height,x.blood_type,x.rh,x.health_care_due_alert_date,x.education_level,x.profession,x.phone,x.home_telephone,x.relative_phone,x.relative_relations,x.home_address,x.work_unit,x.unit_address,x.children,x.receiving_date,x.is_hospital_first_dialysis,x.first_dialysis_date,x.first_dialysis_hospital,x.predialysis_condition,x.pre_hospital_dialysis_frequency,x.pre_hospital_dialysis_times,x.hospital_first_dialysis_date,x.induction_period,x.initial_dialysis,x.total_dialysis,x.attending_doctor_id,x.head_nurse_id,x.evaluate,x.diagnose,x.remark,x.registrars_id,x.registrars,x.qr_code,x.binding_state,x.patient_complains,x.present_history,x.past_history,x.temperature,x.pulse,x.respiratory,x.sbp,x.dbp,x.status,x.created_time,x.updated_time,x.nation,x.native_place,x.age,x.blood_patients,x.slow_patients,x.member_patients,x.ecommer_patients,x.blood_id,x.slow_id,x.member_id").Find(&patients).Error
@@ -986,19 +992,19 @@ func DeleteChildInspection(name string, date int64, orgid int64) error {
 	return err
 }
 
-func SaveMessage(orgid int64, appid int64, id int64, role *models.App_Role) error {
+func SaveMessage(id int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.App_Role{}).Where("org_id = ? and app_id = ? and admin_user_id = ?", orgid, appid, id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
-func SaveSex(id int64, orgid int64, appid int64, role *models.App_Role) error {
-	err := UserWriteDB().Model(models.App_Role{}).Where("org_id = ? and app_id = ? and admin_user_id = ?", orgid, appid, id).Update(map[string]interface{}{"sex": role.Sex, "mtime": time.Now().Unix()}).Error
+func SaveSex(id int64, role *models.SgjUserAdminRole) error {
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"sex": role.Sex, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
-func SaveBirthday(id int64, orgid int64, appid int64, role *models.App_Role) error {
-	err := UserWriteDB().Model(models.App_Role{}).Where("org_id = ? and app_id = ? and admin_user_id = ?", orgid, appid, id).Update(map[string]interface{}{"birthday": role.Birthday, "mtime": time.Now().Unix()}).Error
+func SaveBirthday(id int64, role *models.SgjUserAdminRole) error {
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"birthday": role.Birthday, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1079,3 +1085,21 @@ func DeleteBed(id int64) error {
 	err := XTWriteDB().Model(models.DeviceNumber{}).Where("id=?", id).Update(map[string]interface{}{"status": 0, "ctime": time.Now().Unix()}).Error
 	return err
 }
+
+func GetMemberPatient(orgid int64) (patients []*models.XtPatientsNew, err error) {
+
+	err = XTReadDB().Model(&patients).Where("user_org_id = ? AND member_patients = ? AND status = 1", orgid, 1).Find(&patients).Error
+	return patients, err
+}
+
+func GetSlowPatient(orgid int64) (patients []*models.XtPatientsNew, err error) {
+
+	err = XTReadDB().Model(&patients).Where("user_org_id = ? AND slow_patients = ? AND status = 1", orgid, 1).Find(&patients).Error
+	return patients, err
+
+}
+
+func GetBloodPatient(orgid int64) (patients []*models.XtPatientsNew, err error) {
+	err = XTReadDB().Model(&patients).Where("user_org_id = ? AND blood_patients = ? AND status = 1", orgid, 1).Find(&patients).Error
+	return patients, err
+}