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

controllers/his_project_api_controller.go

 	beego.Router("/api/hispatient/getchargeprint", &HisProjectApiController{}, "Get:GetChargePrint")
 	beego.Router("/api/hispatient/gettodayschedulepatient", &HisProjectApiController{}, "Get:GetTodaySchedulePatient")
 	beego.Router("/api/hispatient/gethispatientdetail", &HisProjectApiController{}, "Get:GetHisPatientDetail")
+
+	beego.Router("/api/hispatient/getalldepartmentlist", &HisProjectApiController{}, "Get:GetAllDepartmentList")
+	beego.Router("/api/hispatient/getprescription", &HisProjectApiController{}, "Get:GetPrescription")
 }
 
 func (this *HisProjectApiController) SaveProject() {
 	recordDateStr := time.Now().Format("2006-01-02")
 	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	nowtime := recordDate.Unix()
-
+	phone := this.GetString("phone")
+	social_type, _ := this.GetInt64("social_type")
 	bloodPatient, errcode := service.GetBloodPatientByIdCard(idcard, orgId)
 	if errcode == gorm.ErrRecordNotFound {
 		patient := models.XtHisPatient{
 			RecordDate:          nowtime,
 			IsReturn:            1,
 			Ctime:               time.Now().Unix(),
+			Phone:               phone,
+			SocialType:          social_type,
 		}
 		err := service.CreateHisPatient(&patient)
 		lastPatient, err := service.GetLastPatient(orgId)
 		timeStr := time.Now().Format("2006-01-02")
 		timeArr := strings.Split(timeStr, "-")
 		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
-		fmt.Println("str--------", str)
+
 		hisPatient := models.HisPatient{
 			Number: str,
 		}
 			UserOrgId:           orgId,
 			PatientId:           bloodPatient.ID,
 			Ctime:               time.Now().Unix(),
+			Phone:               phone,
+			SocialType:          social_type,
 		}
 		err := service.CreateHisPatient(&patient)
 		if err != nil {
 		"hisPatient": hisPatient,
 	})
 }
+
+func (this *HisProjectApiController) GetAllDepartmentList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	departMent, err := service.GetAllDepartMent(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"departMent": departMent,
+	})
+}
+
+func (this *HisProjectApiController) GetPrescription() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id", patient_id)
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+	list, err := service.GetPrescriptionByPatientId(patient_id, timenow)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/role_controller.go

 	userTitle, _ := this.GetInt("title")
 	roleIds := this.GetString("role")
 	user_title_name := this.GetString("user_title_name")
-	department_name := this.GetString("department_name")
+	department := this.GetString("department")
 	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
 		return
 	} else {
 		if adminUser == nil { //新增账号和用户
-			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle, department_id, department_name)
+			_, password, createErr := service.CreateGeneralAdminUser(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, mobile, name, user_title_name, roleIds, userType, userTitle, department_id, department)
 			if createErr != nil {
 				//beego.Error("创建管理员失败:", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 					CreateTime:    time.Now().Unix(),
 					ModifyTime:    time.Now().Unix(),
 					RoleIds:       roleIds,
+					Department:    department,
+					DepartmentId:  department_id,
 				}
 				err := service.CreateUserRole(app_role)
 				if err != nil {
 	roleIds := this.GetString("role")
 	intro := this.GetString("intro")
 	user_title_name := this.GetString("user_title_name")
+	department := this.GetString("department")
+	department_id, _ := this.GetInt64("department_id")
 	sort, _ := this.GetInt64("sort")
 	_, titleExist := models.UserTitle[userTitle]
 	if adminUserId <= 0 || len(name) == 0 || (userType != 2 && userType != 3 && userType != 4) || !titleExist || len(roleIds) <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserNotExist)
 		return
 	}
-
+	appRole.Department = department
+	appRole.DepartmentId = department_id
 	appRole.UserName = name
 	appRole.UserType = int8(userType)
 	appRole.UserTitle = int8(userTitle)

models/his_models.go

 	Number                 string  `gorm:"column:number" json:"number" form:"number"`
 	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
+	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 }
 
 func (XtHisPatient) TableName() string {

service/his_project_service.go

 	return info, err
 
 }
+
+func GetPrescriptionByPatientId(patient_id int64, startime int64) (prescritpion []*models.HisPrescription, err error) {
+
+	err = XTReadDB().Model(&prescritpion).Where("patient_id = ? and record_date =?", patient_id, startime).Find(&prescritpion).Error
+	return prescritpion, err
+}