历史排班

controllers/doctors_api_controller.go

@@ -67,6 +67,9 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/deletefirstdisease", &DoctorsApiController{}, "Get:DeleteFirstDisease")
 
 	beego.Router("/api/schedule/new/long/advices", &DoctorsApiController{}, "Get:GetLongScheduleAdvicesList")
+
+	beego.Router("/api/schedule/getpatientbyname", &DoctorsApiController{}, "Get:GetPatientByName")
+	beego.Router("/api/schedule/getdocadvicebypatientid", &DoctorsApiController{}, "Get:GetDoctorAdviceByPatientId")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -825,7 +828,7 @@ func (this *DoctorsApiController) GetInitDateList() {
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	end_time := this.GetString("end_time")
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	fmt.Println("endtime2323232233223232332", endTime)
+
 	prescription_list, _ := service.GetDialysisPrescriptionDataList(patient_id, startTime.Unix(), endTime.Unix())
 	befor_list, err := service.GetDialysisBeforInitDateList(patient_id, startTime.Unix(), endTime.Unix())
 	after_list, err := service.GetDialysisAssementAfter(patient_id, startTime.Unix(), endTime.Unix())
@@ -1244,10 +1247,10 @@ func (this *DoctorsApiController) GetHospitalSummaryList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	patient_id, _ := this.GetInt64("patient_id")
 	start_time := this.GetString("start_time")
-	fmt.Println("start_tim232232323232323232323232332", start_time)
+
 	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	startime := dischargeTimes.Unix()
-	fmt.Println("startime1111111111111111111111", startime)
+
 	end_time := this.GetString("end_time")
 	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
 	endtime := endTimes.Unix()
@@ -1671,3 +1674,59 @@ func (c *DoctorsApiController) GetLongScheduleAdvicesList() {
 	}
 
 }
+
+func (c *DoctorsApiController) GetPatientByName() {
+
+	keyword := c.GetString("keyword")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	patients, _ := service.GetPatientByName(keyword, orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patients": patients,
+	})
+}
+
+func (c *DoctorsApiController) GetDoctorAdviceByPatientId() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+	start_time := c.GetString("start_time")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	end_time := c.GetString("end_time")
+
+	fmt.Println("patient_id", patient_id)
+	fmt.Println("startdateunix", start_time)
+	fmt.Println("enddateunix", end_time)
+	fmt.Println("limit", limit)
+	fmt.Println("page", page)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTimeUnix int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTimeUnix = theTime.Unix()
+	}
+
+	var endTimeUnix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTimeUnix = theTime.Unix()
+	}
+
+	list, total, _ := service.GetDoctorAdviceByPatientId(patient_id, orgId, startTimeUnix, endTimeUnix, limit, page)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}

controllers/sign_api_controller.go

@@ -510,16 +510,45 @@ func (this *SignApiController) CreateNewPersionSeal() {
 
 	admin_user_id, _ := this.GetInt64("admin_user_id")
 
+	creater := this.GetAdminUserInfo().AdminUser.Id
+
+	userName := service.GetLastAdminUserName(admin_user_id, orgId)
+	//查询医护是否完成认证
 	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
 
-	//personSeal, personSealId := service.CreateNewPersionSeal(lastPerson.UserId)
+	if lastPerson.ID > 0 {
+		this.ServeDynamicFailJsonSend("已完成认证,无需再次认证")
+		return
+	}
 
-	personSeal, personSealId := service.CreateSKDPersionSeal(lastPerson.UserId)
-	service.UpdatePerseEnterPriseById(lastPerson.ID, personSealId)
-	this.ServeSuccessJSON(map[string]interface{}{
-		"personSeal": personSeal,
-	})
-	return
+	if lastPerson.ID == 0 {
+		//去认证
+		personSeal, sealBase64 := service.CreateSKDPersionSeal(lastPerson.UserId, userName)
+
+		fmt.Println("sealBase64", sealBase64)
+		enterprise := models.XtDevicePersonEnterprise{
+			AdminUserId:  admin_user_id,
+			DisplayName:  "",
+			Phone:        "",
+			IdCardNum:    "",
+			UserOrgId:    orgId,
+			Status:       1,
+			Creater:      creater,
+			Ctime:        time.Now().Unix(),
+			Mtime:        0,
+			UserId:       "",
+			Personsealid: "",
+			Sealid:       "",
+			UserName:     userName,
+			Sealbase64:   sealBase64,
+		}
+		service.CreateEnterpriseUserName(enterprise)
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"personSeal": personSeal,
+		})
+		return
+	}
 
 }
 
@@ -642,12 +671,36 @@ func (this *SignApiController) UploadPrintOrder() {
 
 func (this *SignApiController) CreateQianshuUserName() {
 
-	sign, userId := service.CreateQianshuUserName()
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	userName := service.GetLastAdminUserName(admin_user_id, orgId)
+
+	idCardNumber := service.GetLastAdminUserIdCardNumber(admin_user_id, orgId)
+
+	adminRole, _ := service.GetMobile(admin_user_id)
+
+	//查询该医护人员是否已经签署了
+	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+
+	if len(lastPerson.UserId) > 0 {
+		this.ServeDynamicFailJsonSend("已完成签署,无需再次签署")
+		return
+	}
+
+	if len(lastPerson.UserId) == 0 {
+		//去签署
+		sign, userId := service.CreateQianshuUserName(userName, adminRole.Mobile, idCardNumber)
+
+		err := service.UpdatePersionEnterPrise(lastPerson.ID, userId)
+		fmt.Println(err)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"sign":   sign,
+			"userId": userId,
+		})
+
+	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"sign":   sign,
-		"userId": userId,
-	})
 }
 
 func (this *SignApiController) CreateSdkSendInformation() {

models/sign.models.go

@@ -124,6 +124,8 @@ type XtDevicePersonEnterprise struct {
 	UserId       string `gorm:"column:user_id" json:"user_id" form:"user_id"`
 	Personsealid string `gorm:"column:person_seal_id" json:"person_seal_id" form:"person_seal_id"`
 	Sealid       string `gorm:"column:seal_id" json:"seal_id" form:"seal_id"`
+	UserName     string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Sealbase64   string `gorm:"column:sealbase64" json:"sealbase64" form:"sealbase64"`
 }
 
 func (XtDevicePersonEnterprise) TableName() string {

service/doctor_advice_service.go

@@ -491,3 +491,45 @@ func GetHisDoctorAdvice(record_time int64, org_id int64, patient_id int64) (advi
 	err = XTReadDB().Where("advice_date = ? and user_org_id = ? and patient_id = ? and status = 1", record_time, org_id, patient_id).Order("created_time asc").Find(&advice).Error
 	return advice, err
 }
+
+func GetPatientByName(keyword string, user_org_id int64) (patients []*models.XtPatients, err error) {
+
+	db := XTReadDB().Model(&patients).Where("status=1")
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("name LIKE ? OR dialysis_no LIKE ?", likeKey, likeKey)
+	}
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+
+	err = db.Find(&patients).Error
+
+	return patients, err
+}
+
+func GetDoctorAdviceByPatientId(patient_id int64, user_org_id int64, start_time int64, end_time int64, limit int64, page int64) (advice []*models.DoctorAdvice, total int64, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status=1")
+	//offset := (page - 1) * limit
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("advice_date >= ?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("advice_date <= ?", end_time)
+	}
+
+	err = db.Find(&advice).Error
+
+	return advice, total, err
+}

service/sign_service.go

@@ -1102,16 +1102,14 @@ func CreateNewPersionSeal(userId string) (string, string) {
 	return str, personSealId
 }
 
-func CreateSKDPersionSeal(userId string) (string, string) {
+func CreateSKDPersionSeal(userId string, user_name string) (string, string) {
 
 	maprequest := make(map[string]interface{})
 
-	//maprequest["userId"] = userId
-
 	//印章字体 1宋体（默认）2 黑体
 	maprequest["fontType"] = 1
 	//个人姓名（1-42位字符）
-	maprequest["personName"] = "王志文"
+	maprequest["personName"] = user_name
 	var url string
 	url = "http://localhost:8890/sdk/seal/createPersonSeal"
 	appId := beego.AppConfig.String("sign_appid")
@@ -1157,10 +1155,10 @@ func CreateSKDPersionSeal(userId string) (string, string) {
 	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 	}
-	var personSealId string
-	//personSealId = respJSON["data"].(map[string]interface{})["personSealId"].(string)
-	//fmt.Println("str", personSealId)
-	return str, personSealId
+	var sealBase64 string
+	sealBase64 = respJSON["data"].(map[string]interface{})["sealBase64"].(string)
+
+	return str, sealBase64
 }
 
 func UpdatePerseEnterPriseById(id int64, personSealId string) error {
@@ -1524,27 +1522,27 @@ func GetDataConfigDisinfectionFluid(org_id int64) (models.Dataconfig, error) {
 	return dataconfig, err
 }
 
-func CreateQianshuUserName() (string, string) {
+func CreateQianshuUserName(user_name string, phone string, id_card_number string) (string, string) {
 
 	var url string
 
 	url = "http://localhost:8890/sdk/user/create"
-	var account string
-
-	account = "13318464642"
-
-	var realName string
+	//var account string
+	//
+	//account = "13318464642"
 
-	realName = "马文强"
+	//var realName string
+	//
+	//realName = "马文强"
 
 	maprequest := make(map[string]interface{})
 
-	maprequest["account"] = account
+	maprequest["account"] = phone
 
 	//账号类型：1手机号，2邮箱
 	maprequest["accountType"] = 1
 
-	maprequest["realName"] = realName
+	maprequest["realName"] = user_name
 
 	//签署人类型 1个人 2.企业
 	maprequest["signerType"] = 1
@@ -1552,9 +1550,9 @@ func CreateQianshuUserName() (string, string) {
 	// 0表示 身份证
 	maprequest["cardType"] = 0
 
-	maprequest["cardNumber"] = "430526199408156511"
+	//maprequest["cardNumber"] = "430526199408156511"
 
-	fmt.Println("maprequestwowowowowoowow", maprequest)
+	maprequest["cardNumber"] = id_card_number
 
 	byterequest, _ := json.Marshal(maprequest)
 
@@ -1597,8 +1595,8 @@ func CreateQianshuUserName() (string, string) {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 	}
 	var UserId string
-	//UserId = respJSON["data"].(map[string]interface{})["userId"].(string)
-	//fmt.Println("str", UserId)
+	UserId = respJSON["data"].(map[string]interface{})["userId"].(string)
+	fmt.Println("str", UserId)
 	return str, UserId
 }
 
@@ -2014,3 +2012,28 @@ func ToCheckInformation(contractBase64 string) string {
 
 	return str
 }
+
+func GetLastAdminUserName(doctor, orgid int64) string {
+	var tmp models.VmUserAdminRole
+	XTReadDB().Model(&models.VmUserAdminRole{}).Where("admin_user_id = ? and org_id = ? and status = 1", doctor, orgid).Last(&tmp)
+	return tmp.UserName
+}
+
+func GetLastAdminUserIdCardNumber(doctor, orgid int64) string {
+	var tmp models.VmUserAdminRole
+	XTReadDB().Model(&models.VmUserAdminRole{}).Where("admin_user_id = ? and org_id = ? and status = 1", doctor, orgid).Last(&tmp)
+	return tmp.JobNumber
+}
+
+func CreateEnterpriseUserName(enterprise models.XtDevicePersonEnterprise) error {
+
+	err := XTWriteDB().Create(&enterprise).Error
+
+	return err
+}
+
+func UpdatePersionEnterPrise(id int64, userId string) error {
+
+	err := XTWriteDB().Model(&models.XtDevicePersonEnterprise{}).Where("id=? and status =1", id).Updates(map[string]interface{}{"user_id": userId}).Error
+	return err
+}