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

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -7,6 +7,8 @@ import (
 	"XT_New/service"
 	"encoding/json"
 	"fmt"
+	"github.com/jinzhu/gorm"
+	"strconv"
 	"time"
 )
 
@@ -28,7 +30,6 @@ func (this *CommonApiController) GetInspectionMajor() {
 
 func (this *CommonApiController) GetInspectionMinor() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id----------------------------------------", id)
 	minor, err := service.GetInspectionMinor(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -55,8 +56,6 @@ func (this *CommonApiController) GetInspectionRange() {
 func (this *CommonApiController) SaveConfiguration() {
 	adminInfo := this.GetAdminUserInfo()
 	orgid := adminInfo.CurrentOrgId
-	fmt.Println(orgid)
-	fmt.Println("触发-------------------0")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
@@ -69,13 +68,14 @@ func (this *CommonApiController) SaveConfiguration() {
 	largerange := dataBody["large_range"].(string)
 	fmt.Println("largerange", largerange)
 	sort := dataBody["sort"].(string)
+	sorts, err := strconv.ParseInt(sort, 10, 64)
 	fmt.Println("sort", sort)
 	standard := models.XtQualityControlStandard{
 		InspectionMajor: inspectionmajor,
 		InspectionMinor: inspectionMinor,
 		MinRange:        minrange,
 		LargeRange:      largerange,
-		Sort:            sort,
+		Sort:            sorts,
 		UserOrgId:       orgid,
 		Status:          1,
 		CreatedTime:     time.Now().Unix(),
@@ -106,3 +106,217 @@ func (this *CommonApiController) GetConfigurationlist() {
 		"total":             total,
 	})
 }
+
+func (this *CommonApiController) GetConfigurationDetail() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是", id)
+	detail, err := service.GetConfigurationDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"configurationdetail": detail,
+	})
+}
+
+func (this *CommonApiController) GetAllInspectionminor() {
+
+	minor, err := service.GetAllInspectionMinor(0)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"minor": minor,
+	})
+}
+
+func (this *CommonApiController) UpdateConfiguration() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("大项", inspectionmajor)
+	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
+	fmt.Println("小项", inspectionMinor)
+	minrange := dataBody["min_range"].(string)
+	fmt.Println("minragne", minrange)
+	largerange := dataBody["large_range"].(string)
+	fmt.Println("largerange", largerange)
+	sort := int64(dataBody["sort"].(float64))
+
+	standard := models.XtQualityControlStandard{
+		InspectionMajor: inspectionmajor,
+		InspectionMinor: inspectionMinor,
+		MinRange:        minrange,
+		LargeRange:      largerange,
+		Sort:            sort,
+	}
+	err = service.UpdarteConfiguration(&standard, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"standard": standard,
+	})
+}
+
+func (this *CommonApiController) DeleteConfiguration() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteConfiguration(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *CommonApiController) GetAllInspectiondata() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+
+	//查询该机构是否有数据
+	_, errcode := service.GetAllInspectionData(orgid)
+	if errcode == gorm.ErrRecordNotFound {
+		inspection, err := service.GetAllInspectiondatatwo(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspection,
+		})
+	} else if errcode == nil {
+		inspection, err := service.GetAllInspectiondatatwo(orgid)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspection,
+		})
+	}
+
+}
+
+func (this *CommonApiController) SaveCheckConfiguration() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("大项", inspectionmajor)
+	frequency := dataBody["frequency"].(string)
+	fmt.Println("凭次", frequency)
+	sort := dataBody["sort"].(string)
+	sorts, err := strconv.ParseInt(sort, 10, 64)
+	fmt.Println("sort", sort)
+	_, errcode := service.GetInspectionMajorById(inspectionmajor)
+	if errcode == gorm.ErrRecordNotFound {
+		configuration := models.XtCheckConfiguration{
+			InspectionMajor:     inspectionmajor,
+			InspectionFrequency: frequency,
+			Sort:                sorts,
+			UserOrgId:           orgid,
+			Status:              1,
+			CreatedTime:         time.Now().Unix(),
+		}
+		err := service.CreateCheckConfiguration(&configuration)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"configuration": configuration,
+		})
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+func (this *CommonApiController) GetAllCheckList() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	fmt.Println("org", orgid)
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	checkList, total, err := service.GetAllCheckList(orgid, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"checklist": checkList,
+		"total":     total,
+	})
+}
+
+func (this *CommonApiController) GetCheckdetail() {
+
+	id, _ := this.GetInt64("id")
+	detail, err := service.GetCheckDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"checkdetail": detail,
+	})
+}
+
+func (this *CommonApiController) UpdateCheck() {
+	id, _ := this.GetInt64("id")
+	fmt.Println(id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("大项", inspectionmajor)
+	frequency := dataBody["frequency"].(string)
+	fmt.Println("凭次", frequency)
+	sort := int64(dataBody["sort"].(float64))
+	fmt.Println("sort", sort)
+
+	Inspection, err := service.GetInspectionMajorById(inspectionmajor)
+	if Inspection.ID > 0 && Inspection.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	configuration := models.XtCheckConfiguration{
+		InspectionMajor:     inspectionmajor,
+		InspectionFrequency: frequency,
+		Sort:                sort,
+	}
+
+	err = service.UpdateCheck(&configuration, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"configuration": configuration,
+	})
+}
+
+func (this *CommonApiController) DeleteCheck() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteCheck(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -11,4 +11,14 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getinspectionrange", &CommonApiController{}, "Get:GetInspectionRange")
 	beego.Router("/com/api/saveconfiguration", &CommonApiController{}, "Post:SaveConfiguration")
 	beego.Router("com/api/getconfigurationlist", &CommonApiController{}, "Get:GetConfigurationlist")
+	beego.Router("com/api/getconfigurationdetail", &CommonApiController{}, "Get:GetConfigurationDetail")
+	beego.Router("com/api/getallinspectionminor", &CommonApiController{}, "Get:GetAllInspectionminor")
+	beego.Router("com/api/updateconfiguration", &CommonApiController{}, "Post:UpdateConfiguration")
+	beego.Router("com/api/deleteconfiguration", &CommonApiController{}, "Delete:DeleteConfiguration")
+	beego.Router("com/api/getallinspectiondata", &CommonApiController{}, "Get:GetAllInspectiondata")
+	beego.Router("/com/api/savecheckconfiguration", &CommonApiController{}, "Post:SaveCheckConfiguration")
+	beego.Router("/com/api/getallchecklist", &CommonApiController{}, "Get:GetAllCheckList")
+	beego.Router("/com/api/getcheckdetail", &CommonApiController{}, "Get:GetCheckdetail")
+	beego.Router("/com/api/updatecheck", &CommonApiController{}, "Post:UpdateCheck")
+	beego.Router("/com/api/deletecheck", &CommonApiController{}, "Delete:DeleteCheck")
 }

models/common_models.go

@@ -5,7 +5,7 @@ type QualityControlStandard struct {
 	InspectionMajor int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
 	InspectionMinor int64  `gorm:"column:inspection_minor" json:"inspection_minor" form:"inspection_minor"`
 	MinRange        string `gorm:"column:min_range" json:"min_range" form:"min_range"`
-	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
 	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"`
@@ -21,7 +21,7 @@ type XtQualityControlStandard struct {
 	InspectionMajor int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
 	InspectionMinor int64  `gorm:"column:inspection_minor" json:"inspection_minor" form:"inspection_minor"`
 	MinRange        string `gorm:"column:min_range" json:"min_range" form:"min_range"`
-	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	Sort            int64  `gorm:"column:sort" json:"sort" form:"sort"`
 	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"`
@@ -32,3 +32,30 @@ type XtQualityControlStandard struct {
 func (XtQualityControlStandard) TableName() string {
 	return "xt_quality_control_standard"
 }
+
+type CheckConfiguration struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	InspectionMajor     int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
+	InspectionFrequency string `gorm:"column:inspection_frequency" json:"inspection_frequency" form:"inspection_frequency"`
+	Sort                int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	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"`
+	ProjectName         string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+}
+
+type XtCheckConfiguration struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	InspectionMajor     int64  `gorm:"column:inspection_major" json:"inspection_major" form:"inspection_major"`
+	InspectionFrequency string `gorm:"column:inspection_frequency" json:"inspection_frequency" form:"inspection_frequency"`
+	Sort                int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	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"`
+}
+
+func (XtCheckConfiguration) TableName() string {
+	return "xt_check_configuration"
+}

service/common_service.go

@@ -3,6 +3,8 @@ package service
 import (
 	"XT_New/models"
 	"fmt"
+	"github.com/jinzhu/gorm"
+	"time"
 )
 
 func GetInspectionMajor(orgid int64) (inspection []*models.XtInspectionReference, err error) {
@@ -31,9 +33,6 @@ func SaveInspection(standard *models.XtQualityControlStandard) error {
 
 func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*models.QualityControlStandard, total int64, err error) {
 
-	//err = XTReadDB().Model(&standard).Where("user_org_id = ? and status =1", orgid).Order("sort asc,created_time desc").Find(&standard).Error
-	//return standard,err
-
 	db := XTReadDB().Table("xt_quality_control_standard as x").Where("x.status =1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
@@ -41,7 +40,99 @@ func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*mod
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
 	offset := (page - 1) * limit
-	err = db.Order("x.sort asc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").Count(&total).
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").Count(&total).
 		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Offset(offset).Limit(limit).Scan(&standard).Error
 	return standard, total, err
 }
+
+func GetConfigurationDetail(id int64) (models.XtQualityControlStandard, error) {
+	standard := models.XtQualityControlStandard{}
+	err := XTReadDB().Model(&standard).Where("id=? and status = 1", id).Find(&standard).Error
+	return standard, err
+}
+
+func GetAllInspectionMinor(orgid int64) (standard []*models.XtInspectionReference, err error) {
+
+	err = XTReadDB().Model(&standard).Where("org_id = ? and status = 1", orgid).Find(&standard).Error
+	return standard, err
+}
+
+func UpdarteConfiguration(st *models.XtQualityControlStandard, id int64) error {
+
+	err := XTWriteDB().Model(&st).Where("id = ?", id).Updates(map[string]interface{}{"inspection_major": st.InspectionMajor, "inspection_minor": st.InspectionMinor, "min_range": st.MinRange, "large_range": st.LargeRange, "sort": st.Sort, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteConfiguration(id int64) (err error) {
+
+	err = XTWriteDB().Model(models.XtQualityControlStandard{}).Where("id=?", id).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func GetAllInspectionData(orgid int64) (*models.XtInspectionReference, error) {
+	diseases := models.XtInspectionReference{}
+	err := XTReadDB().Model(&diseases).Where("org_id = ? and status = 1", orgid).Find(&diseases).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &diseases, nil
+}
+
+func GetAllInspectiondatatwo(orgid int64) (reference []*models.XtInspectionReference, err error) {
+
+	err = XTReadDB().Model(&reference).Where("org_id = ? and status = 1", orgid).Group("project_name").Find(&reference).Error
+	return reference, err
+}
+
+func GetInspectionMajorById(marjor int64) (*models.XtCheckConfiguration, error) {
+	configuration := models.XtCheckConfiguration{}
+	err := XTReadDB().Model(&configuration).Where("inspection_major = ? and status =1", marjor).Find(&configuration).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &configuration, nil
+}
+
+func CreateCheckConfiguration(configuration *models.XtCheckConfiguration) error {
+	err := XTWriteDB().Create(&configuration).Error
+	return err
+}
+
+func GetAllCheckList(orgid int64, page int64, limit int64) (check []*models.CheckConfiguration, total int64, err error) {
+
+	db := XTReadDB().Table("xt_check_configuration as x").Where("x.status =1")
+	table := XTReadDB().Table("xt_inspection_reference as r")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Order("x.sort asc,x.created_time desc").Select("x.id,x.inspection_major,x.inspection_frequency,x.sort,x.user_org_id,r.project_name").Count(&total).
+		Joins("left join xt_inspection_reference as r on r.project_id = x.inspection_major").Offset(offset).Limit(limit).Scan(&check).Error
+	return check, total, err
+}
+
+func GetCheckDetail(id int64) (models.XtCheckConfiguration, error) {
+
+	configuration := models.XtCheckConfiguration{}
+	err := XTReadDB().Model(&configuration).Where("id=? and status =1", id).Find(&configuration).Error
+	return configuration, err
+}
+
+func UpdateCheck(con *models.XtCheckConfiguration, id int64) error {
+
+	err := XTWriteDB().Model(&con).Where("id=?", id).Updates(map[string]interface{}{"inspection_major": con.InspectionMajor, "inspection_frequency": con.InspectionFrequency, "sort": con.Sort, "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
+func DeleteCheck(id int64) error {
+
+	err := XTWriteDB().Model(models.XtCheckConfiguration{}).Where("id=?", id).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}

service/patient_service.go

@@ -1267,6 +1267,32 @@ func CreateExportPatient(patient *models.Patients, contagions []int64, org_creat
 			return
 		}
 	}
+	patientsNew := models.XtPatientsNew{
+		Name:              patient.Name,
+		Gender:            patient.Gender,
+		Phone:             patient.Phone,
+		IdCardNo:          patient.IdCardNo,
+		FirstDialysisDate: patient.FirstDialysisDate,
+		Source:            patient.Source,
+		Lapseto:           patient.Lapseto,
+		IsInfectious:      patient.IsInfectious,
+		DialysisNo:        patient.DialysisNo,
+		Height:            patient.Height,
+		HomeAddress:       patient.HomeAddress,
+		IsExcelExport:     1,
+		BloodPatients:     1,
+		Status:            1,
+		CreatedTime:       time.Now().Unix(),
+		UserOrgId:         patient.UserOrgId,
+		BloodId:           patient.ID,
+		Avatar:            "https://images.shengws.com/201809182128111.png",
+	}
+	err = utx.Create(&patientsNew).Error
+	if err != nil {
+		utx.Rollback()
+		btx.Rollback()
+		return
+	}
 	utx.Commit()
 	btx.Commit()