hahah

controllers/base_api_controller.go

@@ -72,10 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 3207
+		userAdmin.Id = 2301
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 3207 //4，809
+		userAdmin.Id = 2301 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10751 //机构id
+		subscibe.OrgId = 10164 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10751 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18734 //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -318,10 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 3207
+		userAdmin.Id = 2301
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 3207 //4，809
+		userAdmin.Id = 2301 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10751 //机构id小英9675或4
+		subscibe.OrgId = 10164 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10751 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18734 //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/his_project_api_controller.go

@@ -856,14 +856,22 @@ func (this *HisProjectApiController) SaveDePartment() {
 
 	name := this.GetString("name")
 	number := this.GetString("number")
+	department_type := this.GetString("department_type")
+	lender := this.GetString("lender")
+	phone := this.GetString("phone")
+	start_time := this.GetString("start_time")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	department := models.XtHisDepartment{
-		Name:        name,
-		Number:      number,
-		UserOrgId:   orgId,
-		CreatedTime: time.Now().Unix(),
-		Status:      1,
+		Name:           name,
+		Number:         number,
+		UserOrgId:      orgId,
+		CreatedTime:    time.Now().Unix(),
+		Status:         1,
+		DepartmentType: department_type,
+		Lender:         lender,
+		Phone:          phone,
+		StartTime:      start_time,
 	}
 	err := service.CreateDePartment(&department)
 	if err != nil {
@@ -918,9 +926,17 @@ func (this *HisProjectApiController) UpdatedDeparment() {
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
 	number := this.GetString("number")
+	department_type := this.GetString("department_type")
+	lender := this.GetString("lender")
+	phone := this.GetString("phone")
+	start_time := this.GetString("start_time")
 	department := models.XtHisDepartment{
-		Name:   name,
-		Number: number,
+		Name:           name,
+		Number:         number,
+		DepartmentType: department_type,
+		Lender:         lender,
+		Phone:          phone,
+		StartTime:      start_time,
 	}
 	err := service.UpdatedDepartment(id, &department)
 	if err != nil {

controllers/manage_api_controller.go

@@ -252,6 +252,9 @@ func (this *MachineApiController) SaveManageInfo() {
 	treat_types := dataBody["treat_type"].([]interface{})
 	revers := int64(dataBody["revers_mode"].(float64))
 	zone_id := int64(dataBody["zone_id"].(float64))
+	home_address := dataBody["home_address"].(string)
+
+	home_setting := dataBody["home_setting"].(string)
 	ids := make([]int64, 0)
 	for _, treat := range treat_types {
 		id := int64(treat.(float64))
@@ -295,6 +298,8 @@ func (this *MachineApiController) SaveManageInfo() {
 		Status:              1,
 		Ctime:               time.Now().Unix(),
 		UserOrgId:           orgid,
+		HomeAddress:         home_address,
+		HomeSetting:         home_setting,
 	}
 	err = service.CreateMacher(addmacher)
 	if err != nil {
@@ -375,6 +380,8 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	user_year := dataBody["user_year"].(string)
 	work_time := dataBody["work_time"].(string)
 	treat_types := dataBody["treat_type"].([]interface{})
+	home_address := dataBody["home_address"].(string)
+	home_setting := dataBody["home_setting"].(string)
 	ids := make([]int64, 0)
 	for _, treat := range treat_types {
 		id := int64(treat.(float64))
@@ -412,6 +419,8 @@ func (this *MachineApiController) UpdateMachineInfo() {
 		UserYear:            user_year,
 		WorkTime:            work_time,
 		ZoneId:              zone_id,
+		HomeAddress:         home_address,
+		HomeSetting:         home_setting,
 	}
 	err = service.UpdateMachine(id, orgid, &addmacher)
 	errors := service.UpdateTreatMode(id, orgid, ids)

controllers/manager_center_api_controller.go

@@ -1614,7 +1614,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	good_id, _ := c.GetInt64("good_id", 0)
 	specification_name := c.GetString("specification_name")
 	register_number := c.GetString("register_number")
-
+	register_number_name := c.GetString("register_number_name")
 	good_unit, _ := c.GetInt64("good_unit", -1)
 	buy_price, _ := c.GetFloat("buy_price", 0)
 	sell_price, _ := c.GetFloat("sell_price", 0)
@@ -1752,6 +1752,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		IsShow:                      is_show,
 		IsZeroFlag:                  is_zero_flag,
 		SplitOfNumber:               split_of_number,
+		RegisterNumberName:          register_number_name,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1824,6 +1825,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	is_show, _ := c.GetInt64("is_show")
 	is_zero_flag, _ := c.GetInt64("is_zero_flag")
 	split_of_number, _ := c.GetInt64("split_of_number")
+	register_number_name := c.GetString("register_number_name")
 	// 创建一个拼音转换器
 	p := pinyin.NewArgs()
 
@@ -1901,6 +1903,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		IsShow:                      is_show,
 		IsZeroFlag:                  is_zero_flag,
 		SplitOfNumber:               split_of_number,
+		RegisterNumberName:          register_number_name,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/pharmacy_controller.go

@@ -1227,6 +1227,8 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 
 	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 
+	baseDrug, _ := service.GetBaseDrugMedical(drug_id)
+
 	//盘亏
 	if ord_total > new_total {
 
@@ -1266,7 +1268,7 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 			StockMaxNumber:     stock_max_number,
 			StockMinNumber:     stock_min_number,
 			MinCount:           0,
-			MinUnit:            drugWarehouseInfoOne.MinUnit,
+			MinUnit:            baseDrug.MinUnit,
 			LastStockMaxNumber: last_stock_max_number,
 			LastStockMinNumber: last_stock_min_number,
 			InventoryType:      11,
@@ -1307,8 +1309,8 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 			CancelOutDetailId:       0,
 			ExpireDate:              drugWarehouseInfoOne.ExpiryDate,
 			ProductDate:             0,
-			MaxUnit:                 drugWarehouseInfoOne.MaxUnit,
-			MinUnit:                 drugWarehouseInfoOne.MinUnit,
+			MaxUnit:                 baseDrug.MinUnit,
+			MinUnit:                 baseDrug.MinUnit,
 			StorehouseId:            storehouse_id,
 			OverCount:               sum_count,
 		}
@@ -1327,7 +1329,7 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 		inventory := models.XtDrugInventory{
 			DrugName:           base.DrugName,
 			SpecificationName:  specification_name,
-			WarehousingUnit:    drugWarehouseInfoOne.MaxUnit,
+			WarehousingUnit:    drugWarehouseInfoOne.MinUnit,
 			Count:              consumable_count,
 			LastPrice:          drugWarehouseInfoOne.Price,
 			RetailPrice:        drugWarehouseInfoOne.RetailPrice,
@@ -1358,7 +1360,7 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 			StockMaxNumber:     stock_max_number,
 			StockMinNumber:     stock_min_number,
 			MinCount:           0,
-			MinUnit:            drugWarehouseInfoOne.MinUnit,
+			MinUnit:            baseDrug.MinUnit,
 			LastStockMaxNumber: last_stock_max_number,
 			LastStockMinNumber: last_stock_min_number,
 			InventoryType:      10,
@@ -1399,8 +1401,8 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 			CancelOutDetailId:       0,
 			ExpireDate:              drugWarehouseInfoOne.ExpiryDate,
 			ProductDate:             0,
-			MaxUnit:                 drugWarehouseInfoOne.MaxUnit,
-			MinUnit:                 drugWarehouseInfoOne.MinUnit,
+			MaxUnit:                 baseDrug.MinUnit,
+			MinUnit:                 baseDrug.MinUnit,
 			StorehouseId:            storehouse_id,
 			OverCount:               sum_count,
 		}

controllers/role_controller.go

@@ -2,11 +2,12 @@ package controllers
 
 import (
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/jinzhu/gorm"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
@@ -1136,6 +1137,17 @@ func (this *RoleAPIController) AddAdmin() {
 	outpatient_illnessCategory := this.GetString("outpatient_illnessCategory")
 	is_active, _ := this.GetInt64("is_active")
 	active_status, _ := this.GetInt64("active_status")
+
+	birth := this.GetString("birth")
+	theBirthTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", birth+" 00:00:00", loc)
+
+	work_address := this.GetString("work_address")
+
+	work_start_time := this.GetString("work_start_time")
+	workStartTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", work_start_time+" 00:00:00", loc)
+
+	work_end_time := this.GetString("work_end_time")
+	workEndTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", work_end_time+" 00:00:00", loc)
 	fmt.Println("active_status", active_status)
 	if len(mobile) == 0 || len(name) == 0 || (userType != 2 && userType != 3 && userType != 4) || len(roleIds) <= 0 {
 
@@ -1150,7 +1162,7 @@ func (this *RoleAPIController) AddAdmin() {
 		return
 	} else {
 		if adminUser == nil { //新增账号和用户
-			_, password, createErr := service.CreateGeneralAdminUserOne(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle, department_id, department, sex, age, nation, card_type, id_card, education, study_major_name, work_major_name, role_type, medical_code, doctor_code, licensing, job_number, prescription_qualification_identification, identification_outpatients, theStartTime.Unix(), medical_range_code, medical_level, medical_type_job, pharmacist_registration_number, doctor_range_code, doctor_level, doctor_type_job, doctor_number, outpatient_illnessCategory, is_active, active_status)
+			_, password, createErr := service.CreateGeneralAdminUserOne(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle, department_id, department, sex, age, nation, card_type, id_card, education, study_major_name, work_major_name, role_type, medical_code, doctor_code, licensing, job_number, prescription_qualification_identification, identification_outpatients, theStartTime.Unix(), medical_range_code, medical_level, medical_type_job, pharmacist_registration_number, doctor_range_code, doctor_level, doctor_type_job, doctor_number, outpatient_illnessCategory, is_active, active_status, work_address, theBirthTime.Unix(), workStartTime.Unix(), workEndTime.Unix())
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
@@ -1211,6 +1223,10 @@ func (this *RoleAPIController) AddAdmin() {
 					OutpatientIllnesscategory:               outpatient_illnessCategory,
 					IsActive:                                is_active,
 					ActiveStatus:                            active_status,
+					Birth:                                   theBirthTime.Unix(),
+					WorkAddress:                             work_address,
+					WorkStartTime:                           workStartTime.Unix(),
+					WorkEndTime:                             workEndTime.Unix(),
 				}
 				err := service.CreateUserRole(app_role)
 				if err != nil {
@@ -1348,6 +1364,17 @@ func (this *RoleAPIController) EditAdmin() {
 	is_active, _ := this.GetInt64("is_active")
 	active_status, _ := this.GetInt64("active_status")
 
+	birth := this.GetString("birth")
+	theBirthTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", birth+" 00:00:00", loc)
+
+	work_address := this.GetString("work_address")
+
+	work_start_time := this.GetString("work_start_time")
+	workStartTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", work_start_time+" 00:00:00", loc)
+
+	work_end_time := this.GetString("work_end_time")
+	workEndTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", work_end_time+" 00:00:00", loc)
+
 	_, titleExist := models.UserTitle[userTitle]
 	fmt.Println(titleExist)
 	if adminUserId <= 0 || len(name) == 0 || (userType != 2 && userType != 3 && userType != 4) || !titleExist || len(roleIds) <= 0 {
@@ -1405,6 +1432,10 @@ func (this *RoleAPIController) EditAdmin() {
 	appRole.IsActive = is_active
 	appRole.ActiveStatus = active_status
 	appRole.Sex = sex
+	appRole.Birth = theBirthTime.Unix()
+	appRole.WorkStartTime = workStartTime.Unix()
+	appRole.WorkEndTime = workEndTime.Unix()
+	appRole.WorkAddress = work_address
 	saveErr := service.SaveAppRole(appRole)
 	if saveErr != nil {
 		//beego.Error("修改App_Role失败:", saveErr)

models/device_models.go

@@ -315,6 +315,8 @@ type DeviceAddmachers struct {
 	DeviceMode          string `gorm:"column:device_mode" json:"device_mode" form:"device_mode"`
 	Number              string `gorm:"column:number" json:"number" form:"number"`
 	EquimentId          int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	HomeAddress         string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	HomeSetting         string `gorm:"column:home_setting" json:"home_setting" form:"home_setting"`
 }
 
 type DeviceAddmacher struct {
@@ -349,6 +351,8 @@ type DeviceAddmacher struct {
 	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"`
+	HomeAddress         string `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	HomeSetting         string `gorm:"column:home_setting" json:"home_setting" form:"home_setting"`
 }
 
 func (DeviceAddmacher) TableName() string {

models/good_models.go

@@ -108,6 +108,7 @@ type GoodInfo struct {
 	IsZeroFlag                  int64                `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 	SplitOfNumber               int64                `gorm:"column:split_of_number" json:"split_of_number" form:"split_of_number"`
 	ZuobiaoId                   string               `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	RegisterNumberName          string               `gorm:"column:register_number_name" json:"register_number_name" form:"register_number_name"`
 
 	WarehousingInfoOne []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
 

models/his_models.go

@@ -81,13 +81,17 @@ func (XtHisProjectTeam) TableName() string {
 }
 
 type XtHisDepartment struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	Name        string `gorm:"column:name" json:"name" form:"name"`
-	Number      string `gorm:"column:number" json:"number" form:"number"`
-	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	Name           string `gorm:"column:name" json:"name" form:"name"`
+	Number         string `gorm:"column:number" json:"number" form:"number"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	DepartmentType string `gorm:"column:department_type" json:"department_type" form:"department_type"`
+	Lender         string `gorm:"column:lender" json:"lender" form:"lender"`
+	Phone          string `gorm:"column:phone" json:"phone" form:"phone"`
+	StartTime      string `gorm:"column:start_time" json:"start_time" form:"start_time"`
 }
 
 func (XtHisDepartment) TableName() string {

models/role_models.go

@@ -90,6 +90,10 @@ type App_Role struct {
 	OutpatientIllnesscategory               string `gorm:"column:outpatient_illness_category" json:"outpatient_illness_category" form:"outpatient_illness_category"`
 	IsActive                                int64  `gorm:"column:is_active" json:"is_active" form:"is_active"`
 	ActiveStatus                            int64  `gorm:"column:active_status" json:"active_status" form:"active_status"`
+	Birth                                   int64  `gorm:"column:birth" json:"birth" form:"birth"`
+	WorkAddress                             string `gorm:"column:work_address" json:"work_address" form:"work_address"`
+	WorkStartTime                           int64  `gorm:"column:work_start_time" json:"work_start_time" form:"work_start_time"`
+	WorkEndTime                             int64  `gorm:"column:work_end_time" json:"work_end_time" form:"work_end_time"`
 }
 
 func (App_Role) TableName() string {

service/device_service.go

@@ -725,7 +725,7 @@ func GetMachineDetail(id int64, orgid int64) (models.DeviceAddmachers, error) {
 	db := readUserDb.Table("xt_device_addmacher as a").Where("a.status =1")
 	d := readUserDb.Table("xt_device_mode as d")
 	fmt.Print("d", d)
-	err := db.Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type as device_mode,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.zone_id,a.bed_id").Joins("left join xt_device_mode as d on d.id = a.unit_type ").Where("a.id = ? and a.user_org_id = ?", id, orgid).Find(&addmacher).Error
+	err := db.Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type as device_mode,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.zone_id,a.bed_id,a.home_address,a.home_setting").Joins("left join xt_device_mode as d on d.id = a.unit_type ").Where("a.id = ? and a.user_org_id = ?", id, orgid).Find(&addmacher).Error
 	return addmacher, err
 }
 

service/his_project_service.go

@@ -148,7 +148,7 @@ func GetDepartMentDetail(id int64) (models.XtHisDepartment, error) {
 
 func UpdatedDepartment(id int64, department *models.XtHisDepartment) error {
 
-	err := XTWriteDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"name": department.Name, "number": department.Number, "updated_time": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"name": department.Name, "number": department.Number, "updated_time": time.Now().Unix(), "department_type": department.DepartmentType, "lender": department.Lender, "phone": department.Phone, "start_time": department.StartTime}).Error
 	return err
 }
 

service/manage_service.go

@@ -54,7 +54,7 @@ func CreateMacher(machers *models.DeviceAddmacher) error {
 
 func UpdateMachine(id int64, orgid int64, addmacher *models.DeviceAddmacher) error {
 
-	err := writeUserDb.Model(&addmacher).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"serial_number": addmacher.SerialNumber, "device_type": addmacher.DeviceType, "bed_number": addmacher.BedNumber, "device_name": addmacher.DeviceName, "manufacture_factory": addmacher.ManufactureFactory, "service_manufacturer": addmacher.ServiceManufacturer, "unit_type": addmacher.UnitType, "use_section": addmacher.UseSection, "section_number": addmacher.SectionNumber, "buy_date": addmacher.BuyDate, "install_date": addmacher.InstallDate, "start_date": addmacher.StartDate, "maintenace_engineer": addmacher.MaintenaceEngineer, "telephone": addmacher.Telephone, "guarantee_date": addmacher.GuaranteeDate, "machine_status": addmacher.MachineStatus, "user_total": addmacher.UserTotal, "remarks": addmacher.Remarks, "rubbish_date": addmacher.RubbishDate, "rubbish_reason": addmacher.RubbishReason, "user_year": addmacher.UserYear, "work_time": addmacher.WorkTime, "bed_id": addmacher.BedId, "disinfection_mode": addmacher.DisinfectionMode, "revers_mode": addmacher.ReversMode, "mtime": time.Now().Unix(), "zone_id": addmacher.ZoneId}).Error
+	err := writeUserDb.Model(&addmacher).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"serial_number": addmacher.SerialNumber, "device_type": addmacher.DeviceType, "bed_number": addmacher.BedNumber, "device_name": addmacher.DeviceName, "manufacture_factory": addmacher.ManufactureFactory, "service_manufacturer": addmacher.ServiceManufacturer, "unit_type": addmacher.UnitType, "use_section": addmacher.UseSection, "section_number": addmacher.SectionNumber, "buy_date": addmacher.BuyDate, "install_date": addmacher.InstallDate, "start_date": addmacher.StartDate, "maintenace_engineer": addmacher.MaintenaceEngineer, "telephone": addmacher.Telephone, "guarantee_date": addmacher.GuaranteeDate, "machine_status": addmacher.MachineStatus, "user_total": addmacher.UserTotal, "remarks": addmacher.Remarks, "rubbish_date": addmacher.RubbishDate, "rubbish_reason": addmacher.RubbishReason, "user_year": addmacher.UserYear, "work_time": addmacher.WorkTime, "bed_id": addmacher.BedId, "disinfection_mode": addmacher.DisinfectionMode, "revers_mode": addmacher.ReversMode, "mtime": time.Now().Unix(), "zone_id": addmacher.ZoneId, "home_address": addmacher.HomeAddress, "home_setting": addmacher.HomeSetting}).Error
 
 	return err
 

service/role_service.go

@@ -1,8 +1,6 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
@@ -10,6 +8,9 @@ import (
 	"strings"
 	"time"
 
+	"XT_New/models"
+	"XT_New/utils"
+
 	"github.com/jinzhu/gorm"
 )
 
@@ -328,7 +329,7 @@ func IsUserSuperAdminWithMobile(mobile string) (bool, error) {
 	return user.IsSuperAdmin, nil
 }
 
-func CreateGeneralAdminUserOne(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int, department_id int64, deapartment_name string, sex int64, age int64, nation string, card_type int64, idCard string, education int64, studyMajorName string, workMajorName string, roletype int64, medicalCode string, doctorcode string, licensing int64, jobnumber string, prescriptionQualificationIdentification int64, identificationOutpatients int64, startime int64, medicalRangeCode int64, medicalLevel int64, medicalTypeJob int64, pharmacistRegistrationNumber string, doctorRangeCode int64, doctorLevel int64, doctorTypeJob int64, doctorNumber string, outpatientIllnessCategory string, isActive int64, activeStatus int64) (*models.AdminUser, string, error) {
+func CreateGeneralAdminUserOne(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int, department_id int64, deapartment_name string, sex int64, age int64, nation string, card_type int64, idCard string, education int64, studyMajorName string, workMajorName string, roletype int64, medicalCode string, doctorcode string, licensing int64, jobnumber string, prescriptionQualificationIdentification int64, identificationOutpatients int64, startime int64, medicalRangeCode int64, medicalLevel int64, medicalTypeJob int64, pharmacistRegistrationNumber string, doctorRangeCode int64, doctorLevel int64, doctorTypeJob int64, doctorNumber string, outpatientIllnessCategory string, isActive int64, activeStatus int64, word_address string, birth int64, word_start_time int64, work_end_time int64) (*models.AdminUser, string, error) {
 	now := time.Now().Unix()
 	tx := writeUserDb.Begin()
 	var adminUser models.AdminUser
@@ -345,6 +346,7 @@ func CreateGeneralAdminUserOne(orgID int64, appID int64, mobile string, name str
 			adminUser.Status = 1
 			adminUser.CreateTime = now
 			adminUser.ModifyTime = now
+
 			if createErr := tx.Create(&adminUser).Error; createErr != nil {
 				tx.Rollback()
 				return nil, "", createErr
@@ -394,6 +396,10 @@ func CreateGeneralAdminUserOne(orgID int64, appID int64, mobile string, name str
 		DoctorRangeCode:                         doctorRangeCode,
 		DoctorTypeJob:                           doctorTypeJob,
 		DoctorLevel:                             doctorLevel,
+		WorkStartTime:                           word_start_time,
+		Birth:                                   birth,
+		WorkEndTime:                             work_end_time,
+		WorkAddress:                             word_address,
 	}
 	if createApp_RoleErr := tx.Create(&app_role).Error; createApp_RoleErr != nil {
 		tx.Rollback()

service/stock_service.go

@@ -281,6 +281,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"is_show":                        goodInfo.IsShow,
 		"is_zero_flag":                   goodInfo.IsZeroFlag,
 		"split_of_number":                goodInfo.SplitOfNumber,
+		"register_number_name":           goodInfo.RegisterNumberName,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})