Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gobal_config_api_controller.go

@@ -64,6 +64,11 @@ func GobalConfigRegistRouters() {
 
 	beego.Router("/api/patients/search", &GobalConfigApiController{}, "Post:GetPatientsByKeyWord")
 
+	beego.Router("/api/xtconfig/get", &GobalConfigApiController{}, "get:GetXTHisConfig")
+	beego.Router("/api/xtconfig/isopen", &GobalConfigApiController{}, "post:PostXTHisConfig")
+
+	beego.Router("/api/isopen/init", &GobalConfigApiController{}, "get:GetAllIsOpenConfig")
+
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -343,7 +348,6 @@ func (c *GobalConfigApiController) PostConfig() {
 		ConfigType:     config_type,
 	}
 	err := service.CreateConfigData(config)
-
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"config": config,
@@ -352,7 +356,6 @@ func (c *GobalConfigApiController) PostConfig() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-
 }
 
 func (c *GobalConfigApiController) GetDataUploadConfig() {
@@ -1292,3 +1295,74 @@ func (this *GobalConfigApiController) GetPatientsByKeyWord() {
 		"patient": patient,
 	})
 }
+
+func (c *GobalConfigApiController) PostXTHisConfig() {
+	is_open, _ := c.GetBool("is_open", false)
+	adminUserInfo := c.GetAdminUserInfo()
+	org_id := adminUserInfo.CurrentOrgId
+	isOpen := 0
+
+	if is_open {
+		isOpen = 1
+	} else {
+		isOpen = 2
+	}
+
+	config := models.XtHisConfig{
+		UserOrgId: org_id,
+		IsOpen:    int64(isOpen),
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	errs, configs := service.FindXTHisRecordByOrgId(org_id)
+
+	if errs == gorm.ErrRecordNotFound {
+		err := service.CreateXTHisRecord(&config)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	} else if errs == nil {
+		modifyConfig := models.XtHisConfig{
+			ID:        configs.ID,
+			UserOrgId: org_id,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+			IsOpen:    int64(isOpen),
+		}
+
+		err := service.UpdateXTHisRecord(&modifyConfig)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"is_open": is_open,
+	})
+
+	return
+}
+func (c *GobalConfigApiController) GetXTHisConfig() {
+	adminUserInfo := c.GetAdminUserInfo()
+	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
+func (c *GobalConfigApiController) GetAllIsOpenConfig() {
+	adminUserInfo := c.GetAdminUserInfo()
+	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"is_open_xt_his": config.IsOpen,
+	})
+
+}

controllers/his_api_controller.go

@@ -115,6 +115,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":     his_patient_info,
@@ -122,6 +123,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 		"prescription": prescriptions,
 		"case_history": case_history,
 		"info":         patientPrescriptionInfo,
+		"last_info":    lastPatientPrescriptionInfo,
 	})
 	return
 
@@ -132,13 +134,15 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
 	//获取所有基础药
 	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
-
 	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
 	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
-
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
+
+	//获取诊断信息
+	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"drugs":            drugs,
 		"advices_template": advices,
@@ -146,6 +150,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		"efs":              efs,
 		"doctors":          doctors,
 		"department":       department,
+		"sick":             sick,
 	})
 }
 func (c *HisApiController) CreateHisPrescription() {
@@ -272,8 +277,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 					advices := items["advices"].([]interface{})
-					group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
-					groupNo := group + 1
+					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+					groupNo := int64(0)
 					ctime := time.Now().Unix()
 					mtime := ctime
 					if len(advices) > 0 {
@@ -1537,12 +1542,13 @@ func (c *HisApiController) GetUploadInfo() {
 		order := &models.HisOrder{
 			UserOrgId:          adminUser.CurrentOrgId,
 			HisPatientId:       his.ID,
-			PatientId:          his.PatientId,
+			PatientId:          id,
 			SettleAccountsDate: recordDateTime,
 			Ctime:              time.Now().Unix(),
 			Mtime:              time.Now().Unix(),
 			Status:             1,
-			OrderStatus:        3,
+			OrderStatus:        2,
+			Number:             chrg_bchno,
 		}
 		err = service.CreateOrder(order)
 		if err != nil {
@@ -1609,7 +1615,7 @@ func (c *HisApiController) GetUploadInfo() {
 				DetItemFeeSumamt: detItemFeeSumamt,
 				Cnt:              cut,
 				Pric:             pric,
-				PatientId:        his.PatientId,
+				PatientId:        id,
 				Status:           1,
 				Mtime:            time.Now().Unix(),
 				Ctime:            time.Now().Unix(),
@@ -1622,6 +1628,7 @@ func (c *HisApiController) GetUploadInfo() {
 			service.CreateOrderInfo(info)
 		}
 		err := service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
+		err = service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime)
 		err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{

controllers/manager_center_api_controller.go

@@ -59,6 +59,13 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/stock/good/info/get", &ManagerCenterApiController{}, "get:GetGoodInfoByGoodId")
 	beego.Router("/api/stock/good/info", &ManagerCenterApiController{}, "get:GetGoodInfoById")
 
+	//门诊大病
+	beego.Router("/api/mz/sick/create", &ManagerCenterApiController{}, "post:CreateMZSick")
+	beego.Router("/api/mz/sick/modify", &ManagerCenterApiController{}, "post:ModifyMZSick")
+	beego.Router("/api/mz/sick/list", &ManagerCenterApiController{}, "get:GetMZSickList")
+	beego.Router("/api/mz/sick/delete", &ManagerCenterApiController{}, "post:DeleteMZSick")
+	beego.Router("/api/mz/sick/get", &ManagerCenterApiController{}, "get:GetMZSick")
+
 }
 
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
@@ -1625,3 +1632,150 @@ func (c *ManagerCenterApiController) GetMedicineInsurancePercent() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *ManagerCenterApiController) CreateMZSick() {
+	class_name := c.GetString("class_name")
+	content_code := c.GetString("content_code")
+	country_code := c.GetString("country_code")
+	country_content_name := c.GetString("country_content_name")
+	remark := c.GetString("remark")
+	pinyin := c.GetString("pinyin")
+	wubi := c.GetString("wubi")
+
+	if len(class_name) <= 0 {
+		utils.ErrorLog("len(class_name) == 0")
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(content_code) <= 0 {
+		utils.ErrorLog("len(content_code) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+
+	dealer := models.OutpatientServiceSick{
+		ClassName:          class_name,
+		ContentCode:        content_code,
+		CountryCode:        country_code,
+		CountryContentName: country_content_name,
+		Ctime:              time.Now().Unix(),
+		Mtime:              time.Now().Unix(),
+		Remark:             remark,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		Status:             1,
+		Pinyin:             pinyin,
+		Wubi:               wubi,
+	}
+
+	err, dealers := service.AddSigleMZSick(&dealer)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick": dealers,
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+
+	}
+
+}
+func (c *ManagerCenterApiController) ModifyMZSick() {
+	id, _ := c.GetInt64("id", 0)
+
+	class_name := c.GetString("class_name")
+	content_code := c.GetString("content_code")
+	country_code := c.GetString("country_code")
+	country_content_name := c.GetString("country_content_name")
+	remark := c.GetString("remark")
+	pinyin := c.GetString("pinyin")
+	wubi := c.GetString("wubi")
+
+	if id <= 0 {
+		utils.ErrorLog("id == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(class_name) <= 0 {
+		utils.ErrorLog("len(class_name) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(content_code) <= 0 {
+		utils.ErrorLog("len(content_code) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	dealer := models.OutpatientServiceSick{
+		ID:                 id,
+		ClassName:          class_name,
+		ContentCode:        content_code,
+		CountryCode:        country_code,
+		CountryContentName: country_content_name,
+		Ctime:              time.Now().Unix(),
+		Mtime:              time.Now().Unix(),
+		Remark:             remark,
+		UserOrgId:          adminUserInfo.CurrentOrgId,
+		Pinyin:             pinyin,
+		Wubi:               wubi,
+		Status:             1,
+	}
+
+	err := service.ModifyMZSick(&dealer)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick": dealer,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *ManagerCenterApiController) GetMZSickList() {
+	page, _ := c.GetInt64("page", 1)
+	limit, _ := c.GetInt64("limit", 7)
+	adminUserInfo := c.GetAdminUserInfo()
+	mzSick, total, err := service.FindAllMZSickList(adminUserInfo.CurrentOrgId, page, limit)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick":  mzSick,
+			"total": total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *ManagerCenterApiController) DeleteMZSick() {
+	id, _ := c.GetInt64("id", 0)
+	total, _ := service.FindStockInByDealerId(id)
+	if total > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteDealerWrong)
+		return
+	}
+	err := service.DeleteMZSickById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *ManagerCenterApiController) GetMZSick() {
+	id, _ := c.GetInt64("id", 0)
+	mzSick, err := service.FindMZSickById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"sick": mzSick,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -367,7 +367,12 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	//operators, _ := service.GetAllAdminUserES(adminInfo.Org.Id, adminInfo.App.Id)
 
-	his_advices, _ := service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
+	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
+
+	var his_advices []*models.HisDoctorAdviceInfo
+	if is_open_config.IsOpen == 1 {
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
+	}
 
 	if getLPEErr != nil {
 		this.ErrorLog("获取上一次透前评估失败:%v", getLPEErr)
@@ -1130,7 +1135,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
+		Blood: blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -1893,7 +1898,7 @@ func (c *DialysisAPIController) PostSolution() {
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood:                     blood,
+		Blood: blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -4300,3 +4305,19 @@ func RemoveRepeatedGoodTwo(arr []*models.DialysisBeforePrepare) (newArr []*model
 	}
 	return
 }
+
+func (c *DialysisAPIController) GetDepartment() {
+	adminInfo := c.GetMobileAdminUserInfo()
+	departments, err := service.GetAllDepartMent(adminInfo.Org.Id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"departments": departments,
+		})
+	} else {
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -134,4 +134,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/drug/get", &DialysisAPIController{}, "Get:GetAllDrug")
 
+	beego.Router("/m/api/department/get", &DialysisAPIController{}, "Get:GetDepartment")
+
 }

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -53,6 +53,9 @@ func (this *NewRoleApiController) EditAdmin() {
 	user_type, _ := this.GetInt64("user_type", 0)
 	user_title, _ := this.GetInt64("user_title", 0)
 
+	department_name := this.GetString("department_name")
+	department_id, _ := this.GetInt64("department_id", 0)
+
 	//roleIds := this.GetString("role_ids")
 
 	if adminUserId <= 0 || len(name) == 0 || len(roleIds) <= 0 {
@@ -75,7 +78,10 @@ func (this *NewRoleApiController) EditAdmin() {
 	appRole.ModifyTime = time.Now().Unix()
 	appRole.UserType = int8(user_type)
 	appRole.UserTitle = int8(user_title)
+	appRole.Department = department_name
+	appRole.DepartmentId = department_id
 	saveErr := service.SaveAppRole(appRole)
+
 	if saveErr != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 	} else {
@@ -170,6 +176,9 @@ func (this *NewRoleApiController) CreateAdminUser() {
 	name := this.GetString("name")
 	role_ids := this.GetString("role_ids")
 	userTitle := this.GetString("title")
+	department_name := this.GetString("department_name")
+	department_id, _ := this.GetInt64("department_id")
+
 	user_type, _ := this.GetInt("user_type", 0)
 	user_title, _ := this.GetInt("user_title", 0)
 	if len(mobile) == 0 || len(name) == 0 || len(role_ids) <= 0 {
@@ -184,7 +193,8 @@ func (this *NewRoleApiController) CreateAdminUser() {
 		return
 	} else {
 		if adminUser == nil { //新增账号和用户
-			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.Org.Id, adminUserInfo.App.Id, mobile, name, userTitle, role_ids, user_type, user_title)
+
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.Org.Id, adminUserInfo.App.Id, mobile, name, userTitle, role_ids, user_type, user_title, department_id, department_name)
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

controllers/role_controller.go

@@ -874,6 +874,9 @@ func (this *RoleAPIController) AddAdmin() {
 	userTitle, _ := this.GetInt("title")
 	roleIds := this.GetString("role")
 	user_title_name := this.GetString("user_title_name")
+	department_name := this.GetString("department_name")
+	department_id, _ := this.GetInt64("department_id")
+
 	if len(mobile) == 0 || len(name) == 0 || (userType != 2 && userType != 3 && userType != 4) || len(roleIds) <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -886,7 +889,7 @@ func (this *RoleAPIController) AddAdmin() {
 		return
 	} else {
 		if adminUser == nil { //新增账号和用户
-			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle)
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle, department_id, department_name)
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)

models/data_models.go

@@ -107,3 +107,22 @@ type FiledConfig struct {
 func (FiledConfig) TableName() string {
 	return "xt_filed_config"
 }
+
+type OutpatientServiceSick struct {
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	ClassName          string `gorm:"column:class_name" json:"class_name" form:"class_name"`
+	Pinyin             string `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi               string `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	ContentCode        string `gorm:"column:content_code" json:"content_code" form:"content_code"`
+	CountryCode        string `gorm:"column:country_code" json:"country_code" form:"country_code"`
+	CountryContentName string `gorm:"column:country_content_name" json:"country_content_name" form:"country_content_name"`
+	Remark             string `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+}
+
+func (OutpatientServiceSick) TableName() string {
+	return "outpatient_service_sick"
+}

models/drug.go

@@ -52,6 +52,7 @@ type BaseDrugLib struct {
 	OrgId                       int64                          `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode                    string                         `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	DrugWarehouseInfo           []*DrugWarehouseInfo           `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"stock_in"`
 }
 
 func (BaseDrugLib) TableName() string {

models/his_models.go

@@ -725,3 +725,16 @@ type MedicalInsuranceOrgConfig struct {
 func (MedicalInsuranceOrgConfig) TableName() string {
 	return "medical_insurance_org_config"
 }
+
+type XtHisConfig 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"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (XtHisConfig) TableName() string {
+	return "xt_his_config"
+}

models/patient_models.go

@@ -313,19 +313,22 @@ func (DialysisSolution) TableName() string {
 }
 
 type UserAdminRole struct {
-	ID          int64  `gorm:"column:id" json:"id"`
-	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
-	OrgId       int64  `gorm:"column:org_id" json:"org_id"`
-	AppId       int64  `gorm:"column:app_id" json:"app_id"`
-	RoleId      int64  `gorm:"column:role_id" json:"role_id"`
-	UserName    string `gorm:"column:user_name" json:"user_name"`
-	Avatar      string `gorm:"column:avatar" json:"avatar"`
-	UserType    int64  `gorm:"column:user_type" json:"user_type"`
-	UserTitle   int64  `gorm:"column:user_title" json:"user_title"`
-	Intro       string `gorm:"column:intro" json:"intro"`
-	Status      int64  `gorm:"column:status" json:"status"`
-	Ctime       int64  `gorm:"column:ctime" json:"ctime"`
-	Mtime       int64  `gorm:"column:mtime" json:"mtime"`
+	ID              int64           `gorm:"column:id" json:"id"`
+	AdminUserId     int64           `gorm:"column:admin_user_id" json:"admin_user_id"`
+	OrgId           int64           `gorm:"column:org_id" json:"org_id"`
+	AppId           int64           `gorm:"column:app_id" json:"app_id"`
+	RoleId          int64           `gorm:"column:role_id" json:"role_id"`
+	UserName        string          `gorm:"column:user_name" json:"user_name"`
+	Avatar          string          `gorm:"column:avatar" json:"avatar"`
+	UserType        int64           `gorm:"column:user_type" json:"user_type"`
+	UserTitle       int64           `gorm:"column:user_title" json:"user_title"`
+	Intro           string          `gorm:"column:intro" json:"intro"`
+	Status          int64           `gorm:"column:status" json:"status"`
+	Ctime           int64           `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64           `gorm:"column:mtime" json:"mtime"`
+	Department      string          `gorm:"column:department" json:"department"`
+	DepartmentId    int64           `gorm:"column:department_id" json:"department_id"`
+	XtHisDepartment XtHisDepartment `json:"department" gorm:"foreignkey:DepartmentId;AssociationForeignKey:ID;"`
 }
 
 func (UserAdminRole) TableName() string {

models/role_models.go

@@ -61,6 +61,8 @@ type App_Role struct {
 	Birthday        int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
 	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
 	IsSort          int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
+	DepartmentId    int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Department      string `gorm:"column:department" json:"department" form:"department"`
 }
 
 func (App_Role) TableName() string {

service/dialysis_service.go

@@ -1121,3 +1121,13 @@ func GetExecutionDoctors(orgid int64, patientid int64, id int64) (doctorAdvice [
 	err = readDb.Model(&doctorAdvice).Where("user_org_id = ? and patient_id = ? AND (id = ? Or parent_id=?) and status = 1", orgid, patientid, id, id).Find(&doctorAdvice).Error
 	return doctorAdvice, err
 }
+
+func FindHisDoctorAdviceById(orgID int64, id int64) (advice models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
+	return
+}
+
+func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
+	err = writeDb.Save(&advice).Error
+	return
+}

service/gobal_config_service.go

@@ -177,3 +177,18 @@ func GetExportLogByType(org_id int64, log_type int64) (log []*models.ExportLog,
 		Preload("ExportErrLog", "status = 1").Order("export_time desc").Find(&log).Error
 	return
 }
+
+func FindXTHisRecordByOrgId(org_id int64) (err error, config models.XtHisConfig) {
+	err = readDb.Model(&models.XtHisConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return
+}
+
+func UpdateXTHisRecord(config *models.XtHisConfig) (err error) {
+	err = writeDb.Save(config).Error
+	return
+}
+
+func CreateXTHisRecord(config *models.XtHisConfig) (err error) {
+	err = writeDb.Model(&models.XtHisConfig{}).Create(config).Error
+	return
+}

service/his_service.go

@@ -177,7 +177,7 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 }
 
 func GetAllDrugLibList(org_id int64) (list []*models.BaseDrugLib, err error) {
-	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
+	err = readDb.Model(&models.BaseDrugLib{}).Preload("DrugWarehouseInfo", "status = 1 AND user_org_id = ?", org_id).Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
 	return
 }
 
@@ -199,7 +199,9 @@ func FindAllHisAdviceTemplate(org_id int64) (temps []*models.HisDoctorAdvicePare
 }
 
 func GetHisAdminUserDoctors(org_id int64) (doctors []*models.UserAdminRole, err error) {
-	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1 AND (user_type = 1 OR user_type = 2)", org_id).Find(&doctors).Error
+	err = readUserDb.Model(&models.UserAdminRole{}).Preload("XtHisDepartment", func(db *gorm.DB) *gorm.DB {
+		return readDb.Model(&models.XtHisDepartment{}).Where("status = 1 AND user_org_id = ?", org_id)
+	}).Where("org_id = ? AND status = 1 AND (user_type = 1 OR user_type = 2)", org_id).Find(&doctors).Error
 	return
 }
 
@@ -243,6 +245,12 @@ func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int
 	return
 
 }
+
+func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ?", org_id, record_date, patient_id).Order("record_date desc").First(&info).Error
+	return
+}
+
 func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	err = writeDb.Save(&info).Error
 	return
@@ -315,27 +323,28 @@ func GetHisPrescriptionThree(org_id int64, patient_id int64, record_date int64,
 }
 
 type HisPrescriptionInfo 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"`
-	RecordDate         int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId          int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64             `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_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"`
-	Creator            int64             `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier           int64             `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string            `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType       string            `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor             string            `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments        string            `gorm:"column:departments" json:"departments" form:"departments"`
-	SickHistory        string            `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
-	Patients           models.Patients   `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	HisPatient         models.HisPatient `gorm:"ForeignKey:HisPatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"his_patient"`
-	PrescriptionNumber string            `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	BatchNumber        string            `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PrescriptionStatus int64             `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
-	DoctorId           int64             `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	ID                    int64                        `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate            int64                        `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId             int64                        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64                        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_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"`
+	Creator               int64                        `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier              int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis             string                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType          string                       `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor                string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments           string                       `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory           string                       `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	Patients              models.Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient            models.HisPatient            `gorm:"ForeignKey:HisPatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"his_patient"`
+	HisPatientCaseHistory models.HisPatientCaseHistory `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"case_history"`
+	PrescriptionNumber    string                       `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	BatchNumber           string                       `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionStatus    int64                        `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	DoctorId              int64                        `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -345,7 +354,9 @@ func (HisPrescriptionInfo) TableName() string {
 func GetHisPrescriptionOrderList(org_id int64) (prescriptionOrder []*HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND user_org_id = ?", org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", org_id).
-		Preload("HisPatient", "status = 1 AND user_org_id = ?", org_id).Order("ctime desc").Find(&prescriptionOrder).Error
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisPatientCaseHistory", "status = 1 AND user_org_id = ?", org_id).
+		Order("ctime desc").Find(&prescriptionOrder).Error
 	return
 
 }
@@ -353,7 +364,8 @@ func GetHisPrescriptionOrderList(org_id int64) (prescriptionOrder []*HisPrescrip
 func GetHisPrescriptionOrderInfo(id int64, org_id int64) (prescriptionOrder HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND id = ? AND user_org_id = ? ", id, org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", org_id).
-		Preload("HisPatient", "status = 1 AND user_org_id = ?", org_id).First(&prescriptionOrder).Error
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisPatientCaseHistory", "status = 1 AND user_org_id = ?", org_id).First(&prescriptionOrder).Error
 	return
 
 }
@@ -401,7 +413,7 @@ func UpDateOrder(order models.HisOrder) (err error) {
 }
 
 func UpdataOrderStatusTwo(number string, user_org_id int64) (err error) {
-	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 2, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 3, "mtime": time.Now().Unix()}).Error
 	return
 }
@@ -422,3 +434,10 @@ func FindMedicalInsuranceInfo(org_id int64) (config models.MedicalInsuranceOrgCo
 	err = readDb.Model(&models.MedicalInsuranceOrgConfig{}).Where("status = 1 AND user_org_id = ?", org_id).First(&config).Error
 	return
 }
+
+func FindAllSick(orgId int64) (list []*models.OutpatientServiceSick, err error) {
+	db := readDb.Model(&models.OutpatientServiceSick{})
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
+	err = db.Order("ctime desc").Find(&list).Error
+	return
+}

service/manage_center_service.go

@@ -1,6 +1,9 @@
 package service
 
-import "XT_New/models"
+import (
+	"XT_New/models"
+	"time"
+)
 
 func GetDictionaryConfigList(orgID int64) (dataconfig interface{}, err error) {
 	var configList []*models.DictionaryDataconfig
@@ -218,3 +221,33 @@ func CreateUnitSafeguard(dus *models.DrugUnitSafeguard) (err error) {
 	err = writeDb.Create(dus).Error
 	return
 }
+
+func AddSigleMZSick(dealer *models.OutpatientServiceSick) (error, *models.OutpatientServiceSick) {
+	err := writeDb.Create(&dealer).Error
+	return err, dealer
+}
+
+func ModifyMZSick(mesick *models.OutpatientServiceSick) error {
+	err := writeDb.Save(&mesick).Error
+
+	return err
+}
+
+func FindAllMZSickList(orgId int64, page int64, limit int64) (list []*models.OutpatientServiceSick, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.OutpatientServiceSick{})
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	return
+}
+
+func DeleteMZSickById(id int64) error {
+	err := writeDb.Model(&models.OutpatientServiceSick{}).Where("id = ? AND status = 1", id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	return err
+}
+
+func FindMZSickById(id int64) (*models.OutpatientServiceSick, error) {
+	dealer := &models.OutpatientServiceSick{}
+	err := readDb.Model(&models.OutpatientServiceSick{}).Where("id = ? AND status = 1", id).First(&dealer).Error
+	return dealer, err
+}

service/role_service.go

@@ -310,7 +310,7 @@ func IsUserSuperAdminWithMobile(mobile string) (bool, error) {
 	return user.IsSuperAdmin, nil
 }
 
-func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int) (*models.AdminUser, string, error) {
+func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string, userTitle string, roleIds string, user_type int, user_title int, department_id int64, deapartment_name string) (*models.AdminUser, string, error) {
 	now := time.Now().Unix()
 	tx := writeUserDb.Begin()
 	var adminUser models.AdminUser
@@ -347,6 +347,8 @@ func CreateGeneralAdminUser(orgID int64, appID int64, mobile string, name string
 		ModifyTime:    now,
 		RoleIds:       roleIds,
 		IsSort:        1,
+		Department:    deapartment_name,
+		DepartmentId:  department_id,
 	}
 	if createApp_RoleErr := tx.Create(&app_role).Error; createApp_RoleErr != nil {
 		tx.Rollback()