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

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"fmt"
 )
 
 type MobileBaseAPIController struct {
@@ -46,6 +47,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 	this.MobileBaseAPIController.Prepare()
 
 	adminUserInfo := this.GetMobileAdminUserInfo()
+	fmt.Println(adminUserInfo)
 
 	if adminUserInfo == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -141,16 +141,7 @@ func (this *ForgetPwdController) ModifyPassword() {
 			//service.GetOrgSubscibeState(&subscibe)
 			templateInfo, _ := service.GetOrgInfoTemplate(org.Id)
 
-			type MobileAdminUserInfo struct {
-				AdminUser    *models.AdminUser
-				Org          *models.Org
-				App          *models.OrgApp
-				AppRole      *models.App_Role
-				Subscibe     *models.ServeSubscibe
-				TemplateInfo *models.GobalTemplate
-			}
-
-			mobileAdminUserInfo := &MobileAdminUserInfo{
+			mobileAdminUserInfo := &mobile_api_controllers.MobileAdminUserInfo{
 				AdminUser:    &adminUser,
 				Org:          &org,
 				App:          &app,

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -6,7 +6,14 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"bytes"
+	"encoding/json"
 	"github.com/astaxie/beego"
+	"log"
+	"os"
+	"path"
+	"regexp"
+	"runtime"
 	"time"
 )
 
@@ -123,13 +130,13 @@ func (this *MobileRegistController) CreateOrg() {
 		return
 	}
 
-	name := this.GetString("name")
+	name := this.GetString("org_name")
 	shortName := name
-	provinceName := this.GetString("province")
-	cityName := this.GetString("city")
-	districtName := this.GetString("district")
+	provinceName := this.GetString("provinces_name")
+	cityName := this.GetString("city_name")
+	districtName := this.GetString("district_name")
 	address := this.GetString("address")
-	category, _ := this.GetInt64("category")
+	org_type := this.GetString("org_type")
 	contactName := this.GetString("contact_name")
 
 	//openXT, _ := this.GetBool("open_xt")
@@ -142,12 +149,12 @@ func (this *MobileRegistController) CreateOrg() {
 	openSCRM := false
 	openMall := false
 
-	if len(name) == 0 || len(shortName) == 0 || len(contactName) == 0 || len(address) == 0 || len(provinceName) <= 0 || len(cityName) <= 0 || len(districtName) <= 0 || category <= 0 {
+	if len(name) == 0 || len(shortName) == 0 || len(contactName) == 0 || len(address) == 0 || len(provinceName) <= 0 || len(cityName) <= 0 || len(districtName) <= 0 || len(org_type) <= 0 {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		this.ServeJSON()
 		return
 	}
-	orgPhone := this.GetString("org_phone")
+	orgPhone := this.GetString("telephone")
 
 	if len(orgPhone) > 0 {
 		if utils.PhoneRegexp().MatchString(orgPhone) == false {
@@ -189,6 +196,8 @@ func (this *MobileRegistController) CreateOrg() {
 		}
 	}
 
+	orgType := service.GetOrgTypeByName(org_type)
+
 	org := models.Org{
 		Creator:      adminUser.Id,
 		OrgName:      name,
@@ -197,7 +206,7 @@ func (this *MobileRegistController) CreateOrg() {
 		City:         int64(cityID),
 		District:     int64(districtID),
 		Address:      address,
-		OrgType:      category,
+		OrgType:      orgType.ID,
 		Telephone:    orgPhone,
 		ContactName:  contactName,
 		Claim:        1,
@@ -207,9 +216,115 @@ func (this *MobileRegistController) CreateOrg() {
 		ModifyTime:   time.Now().Unix(),
 	}
 
-	//创建机构，创建应用，创建显示配置， 创建打印模版
-
 	createErr := service.CreateOrg(&org, adminUser.Mobile, openXT, openCDM, openSCRM, openMall) // 创建机构以及所有类型的 app，如果有新类型的平台，则需要在这个方法里面把创建这一新类型的 app 的代码加上
+	var ids []int64
+
+	//数据初始化
+	//创建两个虚拟病人
+	patients := LoadConfig("./patient.json").patients
+	for _, item := range patients {
+		item.UserOrgId = org.Id
+		item.CreatedTime = time.Now().Unix()
+		item.UpdatedTime = time.Now().Unix()
+		item.Status = 1
+		service.CreateVMOrgPatient(item)
+		ids = append(ids, item.ID)
+	}
+
+	//创建1个分组
+	vmGroup := &models.VMDeviceGroup{
+		OrgId:  org.Id,
+		Name:   "测试分组1",
+		Status: 1,
+		Ctime:  time.Now().Unix(),
+		Mtime:  time.Now().Unix(),
+	}
+
+	service.CreateVMGroup(vmGroup)
+
+	//创建两个虚拟分区
+	vmZone1 := &models.VMDeviceZone{
+		OrgId:  org.Id,
+		Name:   "分区1",
+		Type:   1,
+		Status: 1,
+		Ctime:  time.Now().Unix(),
+		Mtime:  time.Now().Unix(),
+	}
+	service.CreateVMZone(vmZone1)
+
+	vmZone2 := &models.VMDeviceZone{
+		OrgId:  org.Id,
+		Name:   "分区2",
+		Type:   2,
+		Status: 1,
+		Ctime:  time.Now().Unix(),
+		Mtime:  time.Now().Unix(),
+	}
+	service.CreateVMZone(vmZone2)
+
+	//创建4个虚拟床位
+	vmDeviceNumber1 := &models.VMDeviceNumber{
+		OrgId:   org.Id,
+		Number:  "1",
+		GroupId: vmGroup.ID,
+		ZoneId:  vmZone1.ID,
+		Status:  1,
+		Ctime:   time.Now().Unix(),
+		Mtime:   time.Now().Unix(),
+	}
+	service.CreateVMDeviceNumber(vmDeviceNumber1)
+
+	vmDeviceNumber2 := &models.VMDeviceNumber{
+		OrgId:   org.Id,
+		Number:  "2",
+		GroupId: vmGroup.ID,
+		ZoneId:  vmZone2.ID,
+		Status:  1,
+		Ctime:   time.Now().Unix(),
+		Mtime:   time.Now().Unix(),
+	}
+	service.CreateVMDeviceNumber(vmDeviceNumber2)
+
+	//创建两个虚拟病人排班
+	stime, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+	for index, id := range ids {
+		if index == 0 {
+			sch := &models.VMSchedule{
+				UserOrgId:    org.Id,
+				PartitionId:  vmZone1.ID,
+				BedId:        vmDeviceNumber1.ID,
+				PatientId:    id,
+				ScheduleDate: stime.Unix(),
+				ScheduleType: 1,
+				ScheduleWeek: int64(time.Now().Weekday()),
+				ModeId:       1,
+				Status:       1,
+				CreatedTime:  time.Now().Unix(),
+				UpdatedTime:  time.Now().Unix(),
+			}
+			service.CreateVMSch(sch)
+		}
+
+		if index == 1 {
+
+			sch := &models.VMSchedule{
+				UserOrgId:    org.Id,
+				PartitionId:  vmZone2.ID,
+				BedId:        vmDeviceNumber2.ID,
+				PatientId:    id,
+				ScheduleDate: stime.Unix(),
+				ScheduleType: 1,
+				ScheduleWeek: int64(time.Now().Weekday()),
+				ModeId:       1,
+				Status:       1,
+				CreatedTime:  time.Now().Unix(),
+				UpdatedTime:  time.Now().Unix(),
+			}
+			service.CreateVMSch(sch)
+		}
+	}
+
 	if createErr != nil {
 		utils.ErrorLog("mobile=%v的超级管理员创建机构失败：%v", adminUser.Mobile, createErr)
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
@@ -243,16 +358,8 @@ func (this *MobileRegistController) Login() {
 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		this.ServeJSON()
 	} else {
-		type MobileAdminUserInfo struct {
-			AdminUser    *models.AdminUser
-			Org          *models.Org
-			App          *models.OrgApp
-			AppRole      *models.App_Role
-			Subscibe     *models.ServeSubscibe
-			TemplateInfo *models.GobalTemplate
-		}
 
-		mobileAdminUserInfo := &MobileAdminUserInfo{
+		mobileAdminUserInfo := &mobile_api_controllers.MobileAdminUserInfo{
 			AdminUser:    adminUser,
 			Org:          nil,
 			App:          nil,
@@ -286,3 +393,59 @@ func (this *MobileRegistController) Login() {
 	}
 
 }
+
+type Config struct {
+	patients []*models.VMOrgPatients "json:patients"
+}
+
+func LoadConfig(dataFile string) *Config {
+	var config Config
+	_, filename, _, _ := runtime.Caller(1)
+	datapath := path.Join(path.Dir(filename), dataFile)
+	config_file, err := os.Open(datapath)
+	if err != nil {
+		emit("Failed to open config file '%s': %s\n", datapath, err)
+		return &config
+	}
+
+	fi, _ := config_file.Stat()
+
+	buffer := make([]byte, fi.Size())
+	_, err = config_file.Read(buffer)
+
+	buffer, err = StripComments(buffer) //去掉注释
+	if err != nil {
+		emit("Failed to strip comments from json: %s\n", err)
+		return &config
+	}
+
+	buffer = []byte(os.ExpandEnv(string(buffer))) //特殊
+	err = json.Unmarshal(buffer, &config)         //解析json格式数据
+	if err != nil {
+		emit("Failed unmarshalling json: %s\n", err)
+		return &config
+	}
+	return &config
+}
+
+func emit(msgfmt string, args ...interface{}) {
+	log.Printf(msgfmt, args...)
+}
+
+func StripComments(data []byte) ([]byte, error) {
+	data = bytes.Replace(data, []byte("\r"), []byte(""), 0) // Windows
+	lines := bytes.Split(data, []byte("\n"))                //split to muli lines
+	filtered := make([][]byte, 0)
+
+	for _, line := range lines {
+		match, err := regexp.Match(`^\s*#`, line)
+		if err != nil {
+			return nil, err
+		}
+		if !match {
+			filtered = append(filtered, line)
+		}
+	}
+
+	return bytes.Join(filtered, []byte("\n")), nil
+}

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
@@ -88,25 +89,19 @@ func (this *NewLoginApiController) GetLogin() {
 				FiledList, _ = service.FindFiledByOrgId(org.Id)
 			}
 
-			type MobileAdminUserInfo struct {
-				AdminUser    *models.AdminUser
-				Org          *models.Org
-				App          *models.OrgApp
-				AppRole      *models.App_Role
-				Subscibe     *models.ServeSubscibe
-				TemplateInfo *models.GobalTemplate
-			}
-
-			mobileAdminUserInfo := &MobileAdminUserInfo{
+			mobileAdminUserInfo := &mobile_api_controllers.MobileAdminUserInfo{
 				AdminUser:    adminUser,
 				Org:          org,
 				App:          app,
 				AppRole:      appRole,
 				TemplateInfo: &templateInfo,
 			}
+			fmt.Println(this.GetSession("mobile_admin_user_info"))
+
 			if this.GetSession("mobile_admin_user_info") == nil {
 				this.SetSession("mobile_admin_user_info", mobileAdminUserInfo)
 			}
+			fmt.Println(this.GetSession("mobile_admin_user_info"))
 
 			this.ServeSuccessJSON(map[string]interface{}{
 				"admin": adminUser,
@@ -447,16 +442,7 @@ func (this *NewLoginApiController) LoginByCs() {
 					service.GetOrgSubscibeState(&subscibe)
 					templateInfo, _ := service.GetOrgInfoTemplate(org.Id)
 
-					type MobileAdminUserInfo struct {
-						AdminUser    *models.AdminUser
-						Org          *models.Org
-						App          *models.OrgApp
-						AppRole      *models.App_Role
-						Subscibe     *models.ServeSubscibe
-						TemplateInfo *models.GobalTemplate
-					}
-
-					mobileAdminUserInfo := &MobileAdminUserInfo{
+					mobileAdminUserInfo := &mobile_api_controllers.MobileAdminUserInfo{
 						AdminUser:    &adminUser,
 						Org:          &org,
 						App:          &app,

controllers/new_mobile_api_controllers/patient.json

@@ -0,0 +1,163 @@
+{
+  "patients": [
+    {
+      "avatar": "https://images.shengws.com/201809182128111.png",
+      "patient_type": 1,
+      "dialysis_no": "01",
+      "admission_number": "",
+      "source": 1,
+      "lapseto": 2,
+      "partition_id": 0,
+      "bed_id": 0,
+      "name": "测试病人",
+      "alias": "",
+      "gender": 2,
+      "nation": "汉",
+      "native_place": "广东深圳",
+      "marital_status": 1,
+      "id_card_no": "430503196002063010",
+      "birthday": -312537600,
+      "reimbursement_way_id": 7,
+      "health_care_type": 0,
+      "health_care_no": "604324517",
+      "health_care_due_date": 0,
+      "height": 158,
+      "blood_type": 0,
+      "rh": 0,
+      "health_care_due_alert_date": 0,
+      "education_level": 5,
+      "profession": 10,
+      "phone": "13535547901",
+      "home_telephone": "12221903097",
+      "relative_phone": "18123074302",
+      "relative_relations": "哥哥",
+      "home_address": "深圳市罗湖区鸿翔花园",
+      "work_unit": "无",
+      "unit_address": "无",
+      "children": 2,
+      "receiving_date": 0,
+      "is_hospital_first_dialysis": 1,
+      "first_dialysis_date": 1110816000,
+      "first_dialysis_hospital": "深圳市人民医院",
+      "predialysis_condition": "",
+      "pre_hospital_dialysis_frequency": "每周3次",
+      "pre_hospital_dialysis_times": 1820,
+      "hospital_first_dialysis_date": 1511366400,
+      "induction_period": 0,
+      "initial_dialysis": 0,
+      "total_dialysis": 14,
+      "attending_doctor_id": 0,
+      "head_nurse_id": 0,
+      "evaluate": "",
+      "diagnose": "慢病肾功能不全（尿毒症期）",
+      "remark": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "registrars_id": 185,
+      "registrars": "",
+      "qr_code": "",
+      "binding_state": 2,
+      "patient_complains": "慢病肾功能不全（尿毒症期）",
+      "present_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "past_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "temperature": 39,
+      "pulse": 60,
+      "respiratory": 100,
+      "sbp": 0,
+      "dbp": 0,
+      "status": 1,
+      "created_time": 1537347970,
+      "updated_time": 1584343696,
+      "solutions": null,
+      "age": 60,
+      "schedules": null,
+      "contagions": null,
+      "diseases": null,
+      "response_result": "",
+      "is_open_remind": 1,
+      "dialysis_age": 0,
+      "expense_kind": 3,
+      "tell_phone": "21212",
+      "first_treatment_date": 1582560000,
+      "contact_name": "21221"
+    },
+    {
+      "avatar": "https://images.shengws.com/201809182128111.png",
+      "patient_type": 1,
+      "dialysis_no": "01",
+      "admission_number": "",
+      "source": 1,
+      "lapseto": 2,
+      "partition_id": 0,
+      "bed_id": 0,
+      "name": "测试病人2",
+      "alias": "",
+      "gender": 2,
+      "nation": "汉",
+      "native_place": "广东深圳",
+      "marital_status": 1,
+      "id_card_no": "430503196002063010",
+      "birthday": -312537600,
+      "reimbursement_way_id": 7,
+      "health_care_type": 0,
+      "health_care_no": "604324517",
+      "health_care_due_date": 0,
+      "height": 158,
+      "blood_type": 0,
+      "rh": 0,
+      "health_care_due_alert_date": 0,
+      "education_level": 5,
+      "profession": 10,
+      "phone": "13535547901",
+      "home_telephone": "12221903097",
+      "relative_phone": "18123074302",
+      "relative_relations": "哥哥",
+      "home_address": "深圳市罗湖区鸿翔花园",
+      "work_unit": "无",
+      "unit_address": "无",
+      "children": 2,
+      "receiving_date": 0,
+      "is_hospital_first_dialysis": 1,
+      "first_dialysis_date": 1110816000,
+      "first_dialysis_hospital": "深圳市人民医院",
+      "predialysis_condition": "",
+      "pre_hospital_dialysis_frequency": "每周3次",
+      "pre_hospital_dialysis_times": 1820,
+      "hospital_first_dialysis_date": 1511366400,
+      "induction_period": 0,
+      "initial_dialysis": 0,
+      "total_dialysis": 14,
+      "attending_doctor_id": 0,
+      "head_nurse_id": 0,
+      "evaluate": "",
+      "diagnose": "慢病肾功能不全（尿毒症期）",
+      "remark": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "registrars_id": 185,
+      "registrars": "",
+      "qr_code": "",
+      "binding_state": 2,
+      "patient_complains": "慢病肾功能不全（尿毒症期）",
+      "present_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "past_history": "慢病肾功能不全（尿毒症期）肾性贫血，肾性高血压，多囊肾，多囊肝，支气管炎；",
+      "temperature": 39,
+      "pulse": 60,
+      "respiratory": 100,
+      "sbp": 0,
+      "dbp": 0,
+      "status": 1,
+      "created_time": 1537347970,
+      "updated_time": 1584343696,
+      "solutions": null,
+      "age": 60,
+      "schedules": null,
+      "contagions": null,
+      "diseases": null,
+      "response_result": "",
+      "is_open_remind": 1,
+      "dialysis_age": 0,
+      "expense_kind": 3,
+      "tell_phone": "21212",
+      "first_treatment_date": 1582560000,
+      "contact_name": "21221"
+    }
+  ]
+}
+

models/vm_models.go

@@ -0,0 +1,153 @@
+package models
+
+type VMOrgPatients 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"`
+	UserId                       int64                `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                       string               `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType                  int64                `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                   string               `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber              string               `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                       int64                `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                      int64                `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId                  int64                `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                        int64                `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                         string               `gorm:"column:name" json:"name" form:"name"`
+	Alias                        string               `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                       int64                `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                       string               `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace                  string               `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	MaritalStatus                int64                `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo                     string               `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                     int64                `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ReimbursementWayId           int64                `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	HealthCareType               int64                `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo                 string               `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	HealthCareDueDate            int64                `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
+	Height                       int64                `gorm:"column:height" json:"height" form:"height"`
+	BloodType                    int64                `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                           int64                `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate       int64                `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	EducationLevel               int64                `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                   int64                `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                        string               `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone                string               `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone                string               `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations            string               `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress                  string               `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                     string               `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress                  string               `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                     int64                `gorm:"column:children" json:"children" form:"children"`
+	ReceivingDate                int64                `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis      int64                `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate            int64                `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital        string               `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition         string               `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	PreHospitalDialysisFrequency string               `gorm:"column:pre_hospital_dialysis_frequency" json:"pre_hospital_dialysis_frequency" form:"pre_hospital_dialysis_frequency"`
+	PreHospitalDialysisTimes     int64                `gorm:"column:pre_hospital_dialysis_times" json:"pre_hospital_dialysis_times" form:"pre_hospital_dialysis_times"`
+	HospitalFirstDialysisDate    int64                `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	InductionPeriod              int64                `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
+	InitialDialysis              int64                `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
+	TotalDialysis                int64                `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	AttendingDoctorId            int64                `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId                  int64                `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Evaluate                     string               `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                     string               `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                       string               `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId                 int64                `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                   string               `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode                       string               `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState                 int64                `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	PatientComplains             string               `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory               string               `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory                  string               `gorm:"column:past_history" json:"past_history"`           // 既往史
+	Temperature                  float64              `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
+	Pulse                        int64                `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
+	Respiratory                  int64                `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
+	SBP                          int64                `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
+	DBP                          int64                `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
+	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"`
+	DialysisSolutions            []DialysisSolution   `json:"solutions" gorm:"foreignkey:PatientId"`
+	Age                          int64                `gorm:"column:age" json:"age"`
+	Schedules                    []Schedule           `json:"schedules" gorm:"foreignkey:PatientId"`
+	Contagions                   []InfectiousDiseases `json:"contagions" gorm:"foreignkey:PatientId"`
+	Diseases                     []ChronicDiseases    `json:"diseases" gorm:"foreignkey:PatientId"`
+
+	InfectiousNextRecordTime int64  `gorm:"column:infectious_next_record_time" json:"infectious_next_record_time"`
+	IsInfectious             int64  `gorm:"column:is_infectious" json:"is_infectious"`
+	RemindCycle              int64  `gorm:"column:remind_cycle" json:"remind_cycle"`
+	ResponseResult           string `gorm:"column:response_result" json:"response_result"`
+	IsOpenRemind             int64  `gorm:"column:is_open_remind" json:"is_open_remind"`
+	DialysisAge              int64  `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	ExpenseKind              int64  `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone                string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate       int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	ContactName              string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+}
+
+func (VMOrgPatients) TableName() string {
+	return "xt_patients"
+}
+
+type VMDeviceGroup struct {
+	ID     int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name   string `gorm:"column:name" json:"name" form:"name"`
+	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 (VMDeviceGroup) TableName() string {
+	return "xt_device_group"
+}
+
+type VMDeviceZone struct {
+	ID     int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Name   string `gorm:"column:name" json:"name" form:"name"`
+	Type   int64  `gorm:"column:type" json:"type" form:"type"`
+	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 (VMDeviceZone) TableName() string {
+	return "xt_device_zone"
+}
+
+type VMDeviceNumber struct {
+	ID      int64  `gorm:"column:id" json:"id" form:"id"`
+	OrgId   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number  string `gorm:"column:number" json:"number" form:"number"`
+	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId  int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_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"`
+}
+
+func (VMDeviceNumber) TableName() string {
+	return "xt_device_number"
+}
+
+type VMSchedule 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"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	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 (VMSchedule) TableName() string {
+	return "xt_schedule"
+}

service/orginfo_service.go

@@ -135,3 +135,8 @@ func createOrgApp(tx *gorm.DB, superAdminRole *models.Role, userName string, app
 	}
 	return nil
 }
+
+func GetOrgTypeByName(org_type_name string) (org_type models.OrgType) {
+	readUserDb.Model(&models.OrgType{}).Where("status = 1 AND name = ?", org_type_name).First(&org_type)
+	return
+}

service/vm_service.go

@@ -0,0 +1,23 @@
+package service
+
+import "XT_New/models"
+
+func CreateVMOrgPatient(patients *models.VMOrgPatients) {
+	writeDb.Model(&models.VMOrgPatients{}).Create(&patients)
+}
+
+func CreateVMZone(zone *models.VMDeviceZone) {
+	writeDb.Model(&models.VMDeviceZone{}).Create(&zone)
+}
+
+func CreateVMGroup(group *models.VMDeviceGroup) {
+	writeDb.Model(&models.VMDeviceGroup{}).Create(&group)
+}
+
+func CreateVMDeviceNumber(number *models.VMDeviceNumber) {
+	writeDb.Model(&models.VMDeviceNumber{}).Create(&number)
+}
+
+func CreateVMSch(sch *models.VMSchedule) {
+	writeDb.Model(&models.VMSchedule{}).Create(&sch)
+}