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

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -238,7 +238,7 @@ func (this *MobileRegistController) CreateOrg() {
 		//初始化角色和权限
 
 		//初始化设备管理
-
+		InitEquitMentInformation(org)
 		//初始化显示配置
 
 		//创建完机构后进行登录验证操作
@@ -515,17 +515,16 @@ func InitPatientAndSchedule(org *models.Org) {
 
 	//创建两个血透的虚拟病人到新表
 	fmt.Print("patients", patients)
-	for _, it := range patients {
+	for _, it := range ids {
 		patientsNew := models.XtPatientsNew{
 			UserOrgId:     org.Id,
 			CreatedTime:   time.Now().Unix(),
 			UpdatedTime:   time.Now().Unix(),
 			Status:        1,
-			BloodId:       it.ID,
+			BloodId:       it,
 			BloodPatients: 1,
 		}
 		service.CreateVMOrgNewPatient(&patientsNew)
-		ids = append(ids, it.ID)
 	}
 	//创建1个分组
 	vmGroup := &models.VMDeviceGroup{
@@ -964,3 +963,98 @@ func LoadConfig(dataFile string) *Config {
 	}
 	return &config
 }
+
+func InitEquitMentInformation(org *models.Org) {
+	//添加设备型号
+	mode := models.VMDeviceMode{
+		DeviceMode: "5008S",
+		Status:     1,
+		UserOrgId:  org.Id,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+	}
+	service.CreatedDeviceMode(&mode)
+
+	deviceMode := models.VMDeviceMode{
+		DeviceMode: "4008S",
+		Status:     1,
+		UserOrgId:  org.Id,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+	}
+	service.CreatedDeviceMode(&deviceMode)
+
+	firstDeviceMode, _ := service.GetFirstDeviceMode(org.Id)
+	//获取机构下对应的第一数据
+	number, _ := service.GetFirstBedNumber(org.Id)
+	//添加设备
+	deviceAddmacher := models.VmDeviceAddmacher{
+		SerialNumber:  "8VSAHE13",
+		DeviceType:    1,
+		BedId:         number.ID,
+		DeviceName:    "费森尤斯",
+		UnitType:      firstDeviceMode.ID,
+		MachineStatus: 1,
+		Status:        1,
+		UserOrgId:     org.Id,
+		Ctime:         time.Now().Unix(),
+	}
+	service.CreateDeviceAddMacher(&deviceAddmacher)
+	macher, _ := service.GetLastMacher(org.Id)
+	fmt.Print(macher.ID)
+	treatmentmode := models.VmDeviceTreatmentmode{
+		MachineId:  macher.ID,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		UserOrgId:  org.Id,
+		TreateMode: 1,
+	}
+	service.CreatedTreateMode(&treatmentmode)
+	treatmentmodeone := models.VmDeviceTreatmentmode{
+		MachineId:  macher.ID,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		UserOrgId:  org.Id,
+		TreateMode: 2,
+	}
+	service.CreatedTreateMode(&treatmentmodeone)
+	treatmentmodetwo := models.VmDeviceTreatmentmode{
+		MachineId:  macher.ID,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		UserOrgId:  org.Id,
+		TreateMode: 3,
+	}
+	service.CreatedTreateMode(&treatmentmodetwo)
+
+	treatmentmodethree := models.VmDeviceTreatmentmode{
+		MachineId:  macher.ID,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		UserOrgId:  org.Id,
+		TreateMode: 4,
+	}
+	service.CreatedTreateMode(&treatmentmodethree)
+	treatmentmodefour := models.VmDeviceTreatmentmode{
+		MachineId:  macher.ID,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		UserOrgId:  org.Id,
+		TreateMode: 5,
+	}
+	service.CreatedTreateMode(&treatmentmodefour)
+	treatmentmodefive := models.VmDeviceTreatmentmode{
+		MachineId:  macher.ID,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		UserOrgId:  org.Id,
+		TreateMode: 12,
+	}
+	service.CreatedTreateMode(&treatmentmodefive)
+}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1113,14 +1113,14 @@ func (this *NewDialysisApiController) GetDoctorAdviceDetail() {
 	appid := adminUser.App.Id
 	id, _ := this.GetInt64("id")
 	doctorAdvicedetail, err := service.GetDoctorAdviceDetail(id, orgid)
-	doctor, err := service.GetAllDoctorTwo(orgid, appid)
+	doctorDetail, err := service.GetAllDoctorTwo(orgid, appid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"doctorAdvicedetail": doctorAdvicedetail,
-		"doctor":             doctor,
+		"doctorDetail":       doctorDetail,
 	})
 }
 
@@ -1396,3 +1396,75 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		})
 	}
 }
+
+func (this *NewDialysisApiController) GetAllDoctor() {
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	id := this.GetMobileAdminUserInfo().App.Id
+	doctor, err := service.GetAllDoctorTwo(orgid, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"doctor": doctor,
+	})
+}
+
+func (this *NewDialysisApiController) GetAllInspection() {
+
+	inspection, err := service.GetAllInspection(0)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inspection": inspection,
+	})
+}
+
+func (this *NewDialysisApiController) GetInspection() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	id, _ := this.GetInt64("id")
+	fmt.Print("id", id)
+	patient, _ := service.GetPatientDetailTwo(id)
+	start := this.GetString("startime")
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", start+" 00:00:00", loc)
+	startime := startTimes.Unix()
+	fmt.Print("startime", startime)
+	end := this.GetString("endtime")
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 00:00:00", loc)
+	endtime := endTimes.Unix()
+	fmt.Print("endtime", endtime)
+	limit, _ := this.GetInt64("limit")
+	fmt.Print("limit", limit)
+	page, _ := this.GetInt64("page")
+	fmt.Print("page", page)
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	fmt.Print("patient", patient)
+	fmt.Print("orgid", orgid)
+	inspection, total, err := service.GetInspection(patient.BloodId, startime, endtime, limit, page, orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inspection": inspection,
+		"total":      total,
+	})
+}
+
+func (this *NewDialysisApiController) GetMyInformation() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+
+	roleInfo := adminUserInfo.AppRole
+
+	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"electronic_signature": es,
+		"roleInfo":             roleInfo,
+	})
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -87,5 +87,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getdoctoradvicedetail", &NewDialysisApiController{}, "Get:GetDoctorAdviceDetail")
 	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/getallinspection", &NewDialysisApiController{}, "Get:GetAllInspection")
+	beego.Router("/m/api/patient/getinspection", &NewDialysisApiController{}, "Get:GetInspection")
+	beego.Router("/m/api/patient/getmyinformation", &NewDialysisApiController{}, "Get:GetMyInformation")
 }

models/dialysis.go

@@ -800,3 +800,23 @@ type GobalTemplate struct {
 func (GobalTemplate) TableName() string {
 	return "xt_gobal_template"
 }
+
+type SgjUserAdminRole struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId       int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId      int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName    string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar      string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType    int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle   int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro       string `gorm:"column:intro" json:"intro" form:"intro"`
+	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"`
+}
+
+func (SgjUserAdminRole) TableName() string {
+	return "sgj_user_admin_role"
+}

models/patient_models.go

@@ -663,3 +663,50 @@ func (XtPatientsInfectiousDiseases) TableName() string {
 
 	return "xt_patients_infectious_diseases"
 }
+
+type XtInspectionReference struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectName      string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Project          string `gorm:"column:project" json:"project" form:"project"`
+	ProjectId        int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemName         string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ItemNameAddition string `gorm:"column:item_name_addition" json:"item_name_addition" form:"item_name_addition"`
+	ItemId           int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Item             string `gorm:"column:item" json:"item" form:"item"`
+	RangeType        int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeMin         string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	RangeMax         string `gorm:"column:range_max" json:"range_max" form:"range_max"`
+	RangeValue       string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	RangeOptions     string `gorm:"column:range_options" json:"range_options" form:"range_options"`
+	Unit             string `gorm:"column:unit" json:"unit" form:"unit"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime      int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime      int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (XtInspectionReference) TableName() string {
+
+	return "xt_inspection_reference"
+}
+
+type XtInspection struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (XtInspection) TableName() string {
+
+	return "xt_inspection"
+}

models/vm_models.go

@@ -231,3 +231,68 @@ type VMPatientScheduleTemplateMode struct {
 func (VMPatientScheduleTemplateMode) TableName() string {
 	return "xt_patient_schedule_template_mode"
 }
+
+type VMDeviceMode struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	DeviceMode string `gorm:"column:device_mode" json:"device_mode" form:"device_mode"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (VMDeviceMode) TableName() string {
+	return "xt_device_mode"
+}
+
+type VmDeviceAddmacher struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	SerialNumber        string `gorm:"column:serial_number" json:"serial_number" form:"serial_number"`
+	DeviceType          int64  `gorm:"column:device_type" json:"device_type" form:"device_type"`
+	BedNumber           string `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+	DeviceName          string `gorm:"column:device_name" json:"device_name" form:"device_name"`
+	ManufactureFactory  string `gorm:"column:manufacture_factory" json:"manufacture_factory" form:"manufacture_factory"`
+	ServiceManufacturer string `gorm:"column:service_manufacturer" json:"service_manufacturer" form:"service_manufacturer"`
+	UnitType            int64  `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
+	UseSection          string `gorm:"column:use_section" json:"use_section" form:"use_section"`
+	SectionNumber       string `gorm:"column:section_number" json:"section_number" form:"section_number"`
+	BuyDate             int64  `gorm:"column:buy_date" json:"buy_date" form:"buy_date"`
+	InstallDate         int64  `gorm:"column:install_date" json:"install_date" form:"install_date"`
+	StartDate           int64  `gorm:"column:start_date" json:"start_date" form:"start_date"`
+	MaintenaceEngineer  string `gorm:"column:maintenace_engineer" json:"maintenace_engineer" form:"maintenace_engineer"`
+	Telephone           string `gorm:"column:telephone" json:"telephone" form:"telephone"`
+	GuaranteeDate       string `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
+	MachineStatus       int64  `gorm:"column:machine_status" json:"machine_status" form:"machine_status"`
+	UserTotal           string `gorm:"column:user_total" json:"user_total" form:"user_total"`
+	DisinfectionMode    int64  `gorm:"column:disinfection_mode" json:"disinfection_mode" form:"disinfection_mode"`
+	Remarks             string `gorm:"column:remarks" json:"remarks" form:"remarks"`
+	RubbishDate         int64  `gorm:"column:rubbish_date" json:"rubbish_date" form:"rubbish_date"`
+	RubbishReason       int64  `gorm:"column:rubbish_reason" json:"rubbish_reason" form:"rubbish_reason"`
+	UserYear            string `gorm:"column:user_year" json:"user_year" form:"user_year"`
+	WorkTime            string `gorm:"column:work_time" json:"work_time" form:"work_time"`
+	ReversMode          int64  `gorm:"column:revers_mode" json:"revers_mode" form:"revers_mode"`
+	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"`
+	ZoneId              int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	BedId               int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+}
+
+func (VmDeviceAddmacher) TableName() string {
+	return "xt_device_addmacher"
+}
+
+type VmDeviceTreatmentmode struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	MachineId  int64 `gorm:"column:machine_id" json:"machine_id" form:"machine_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"`
+	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	TreateMode int64 `gorm:"column:treate_mode" json:"treate_mode" form:"treate_mode"`
+}
+
+func (VmDeviceTreatmentmode) TableName() string {
+	return "xt_device_treatmentmode"
+}

service/patientmanage_service.go

@@ -824,9 +824,9 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 	return orders, total, err
 }
 
-func GetAllDoctorTwo(orgid int64, appid int64) (appRole []*models.App_Role, err error) {
+func GetAllDoctorTwo(orgid int64, appid int64) (appRole []*models.SgjUserAdminRole, err error) {
 
-	err = UserReadDB().Where("org_id = ? AND app_id = ? AND status = ? ", orgid, appid, 1).Find(&appRole).Error
+	err = UserReadDB().Where("org_id = ? and app_id = ? and status = ? ", orgid, appid, 1).Find(&appRole).Error
 	return appRole, err
 }
 
@@ -875,3 +875,29 @@ func UpdatedCustomer(customer models.SgjUserCustomer, id int64) error {
 	err := UserWriteDB().Model(&customer).Where("id = ?", id).Update(map[string]interface{}{"name": customer.Name, "mobile": customer.Mobile, "gender": customer.Gender, "birthday": customer.Birthday, "ill_date": customer.IllDate, "avatar": customer.Avatar, "illness_id": customer.IllnessId, "treat_type": customer.TreatType}).Error
 	return 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
+	return inspection, err
+}
+
+func GetInspection(patientid int64, startime int64, endtime int64, limit int64, page int64, orgid int64) (inspection []*models.Inspection, total int64, err error) {
+	fmt.Print(limit, page)
+	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Count(&total).Order("x.inspect_date").Group("x.id").
+		Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.created_time").Find(&inspection).Error
+	return inspection, total, err
+}

service/vm_service.go

@@ -43,3 +43,36 @@ func CreateVMSchTemplate(schTemplate *models.VMPatientScheduleTemplateItem) {
 func CreateVMPrescription(sys *models.SystemPrescription) {
 	writeDb.Model(&models.SystemPrescription{}).Create(&sys)
 }
+
+func CreatedDeviceMode(mode *models.VMDeviceMode) {
+
+	UserWriteDB().Model(&models.VMDeviceMode{}).Create(&mode)
+}
+
+func GetFirstDeviceMode(orgid int64) (models.VMDeviceMode, error) {
+	mode := models.VMDeviceMode{}
+	err = UserReadDB().Where("user_org_id = ? and status =1", orgid).First(&mode).Error
+	return mode, err
+}
+
+func GetFirstBedNumber(orgid int64) (models.VMDeviceNumber, error) {
+	number := models.VMDeviceNumber{}
+	err := XTReadDB().Where("org_id = ? and status =1", orgid).First(&number).Error
+	return number, err
+}
+
+func CreateDeviceAddMacher(addmacher *models.VmDeviceAddmacher) {
+
+	UserWriteDB().Model(&models.VmDeviceAddmacher{}).Create(&addmacher)
+}
+
+func GetLastMacher(orgid int64) (models.VmDeviceAddmacher, error) {
+	addmacher := models.VmDeviceAddmacher{}
+	err := UserReadDB().Where("user_org_id = ? and status =1", orgid).First(&addmacher).Error
+	return addmacher, err
+}
+
+func CreatedTreateMode(treatmentmode *models.VmDeviceTreatmentmode) {
+	XTWriteDB().Model(&models.VmDeviceTreatmentmode{}).Create(&treatmentmode)
+
+}