更新代码

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1496,6 +1496,26 @@ func (this *NewDialysisApiController) GetAllDoctor() {
 	})
 }
 
+func (this *NewDialysisApiController) GetAllProjectName() {
+	id := this.GetString("date")
+	fmt.Println("id是", id)
+	ids, _ := strconv.ParseInt(id, 10, 64)
+	patientid := this.GetString("patientid")
+	fmt.Println("patient", patientid)
+	paientids, _ := strconv.ParseInt(patientid, 10, 64)
+	patient, _ := service.GetNewPatient(paientids)
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	projectName, err := service.GetAllProjectName(ids, orgid, patient.BloodId)
+	fmt.Println("projectname----------------------------------", err)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"projectName": projectName,
+	})
+}
+
 func (this *NewDialysisApiController) GetAllInspection() {
 
 	//查询该机构是否存在检验检测项目
@@ -1704,9 +1724,8 @@ func (this *NewDialysisApiController) SaveMessage() {
 	orgid, _ := this.GetInt64("orgid")
 	role := models.SgjUserAdminRole{
 		Message: message,
-		OrgId:   orgid,
 	}
-	err := service.SaveMessage(id, &role)
+	err := service.SaveMessage(id, orgid, &role)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2232,11 +2251,12 @@ func (this *NewDialysisApiController) GetMyInformationFour() {
 	orgid := adminUserInfo.Org.Id
 	//跟剧机构ID获取创建者ID
 	fmt.Println("orgid", orgid)
-	OrgId, _ := service.GetCreatByOrgId(orgid)
-	fmt.Println("创建者ID", OrgId.Creator)
-
+	//OrgId, _ := service.GetCreatByOrgId(orgid)
+	//fmt.Println("创建者ID", OrgId.Creator)
+	creatId := adminUserInfo.AdminUser.Id
+	fmt.Println("creatid-----------------------------", creatId)
 	fmt.Println("当前机构ID信息---------------------", orgid)
-	Username, err := service.GetMyOrgInformationFour(OrgId.Creator, orgid)
+	Username, err := service.GetMyOrgInformationFour(creatId, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2365,11 +2385,13 @@ func (this *NewDialysisApiController) GetMyOrgInformation() {
 func (this *NewDialysisApiController) SaveNameTwo() {
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
+	orgid, _ := this.GetInt64("orgid")
 	fmt.Println("name------------------", name)
 	role := models.SgjUserAdminRole{
 		UserName: name,
 	}
-	err := service.SaveNameTwo(id, &role)
+	err := service.SaveNameTwo(id, orgid, &role)
+	fmt.Println("err----------------------------------", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -101,6 +101,7 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/deletemanagement", &NewDialysisApiController{}, "Delete:DeleteManagement")
 	beego.Router("/m/api/patient/updatedpatient", &NewDialysisApiController{}, "Post:UpdatedPatient")
 	beego.Router("/m/api/patient/getalldoctor", &NewDialysisApiController{}, "Get:GetAllDoctor")
+	beego.Router("/m/api/patient/getallprojectname", &NewDialysisApiController{}, "Get:GetAllProjectName")
 	beego.Router("/m/api/patient/getallinspection", &NewDialysisApiController{}, "Get:GetAllInspection")
 	beego.Router("/m/api/patient/getinspection", &NewDialysisApiController{}, "Get:GetInspection")
 	beego.Router("/m/api/patient/getmyinformation", &NewDialysisApiController{}, "Get:GetMyInformation")

service/patientmanage_service.go

@@ -983,6 +983,13 @@ func GetInspectionByOrgId(orgid int64) (*models.XtInspectionReference, error) {
 
 }
 
+func GetAllProjectName(date int64, orgid int64, patientid int64) (inspection []*models.XtInspection, err error) {
+
+	err = XTReadDB().Model(&inspection).Where("inspect_date = ? and org_id = ? and patient_id = ? and status = 1", date, orgid, patientid).Group("project_name").Find(&inspection).Error
+
+	return inspection, err
+}
+
 func GetAllInspection(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
 	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1", orgid).Group("project_name").Find(&inspection).Error
@@ -1053,9 +1060,9 @@ func DeleteChildInspection(name string, date int64, orgid int64) error {
 	return err
 }
 
-func SaveMessage(id int64, role *models.SgjUserAdminRole) error {
+func SaveMessage(id int64, orgid int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ? and org_id = ?", id, orgid).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1367,8 +1374,8 @@ func GetMyOrgInformation(id int64, appid int64) (models.SgjUserAdminRole, error)
 	return admin, err
 }
 
-func SaveNameTwo(id int64, role *models.SgjUserAdminRole) error {
+func SaveNameTwo(id int64, orgid int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =? and org_id = ?", id, orgid).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
 	return err
 }