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

controllers/base_api_controller.go

@@ -79,7 +79,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9726
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -89,7 +89,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9726
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9726
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9726
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/login_api_controller.go

@@ -24,6 +24,8 @@ type LoginAPIController struct {
 func (this *LoginAPIController) LoginByPwd() {
 	mobile := this.GetString("mobile")
 	pwd := this.GetString("password")
+	//var mobile = "15089497668"
+	//var pwd = "123456"
 	if len(mobile) == 0 || len(pwd) == 0 || utils.CellPhoneRegexp().MatchString(mobile) == false {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1302,7 +1302,9 @@ func (this *CommonApiController) GetQualityControl() {
 	fmt.Println("endtime", endtime)
 	itemid, _ := this.GetInt64("itemid")
 	fmt.Println("itemid", itemid)
-	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid)
+	inspectdate, _ := this.GetInt64("inspectdate")
+
+	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid, inspectdate)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1341,3 +1343,27 @@ func (this *CommonApiController) GetTreatlist() {
 		"list": list,
 	})
 }
+
+func (this *CommonApiController) GetPatientComplianceDetail() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	fmt.Println(orgid)
+	patientid, _ := this.GetInt64("patientid")
+	startime, _ := this.GetInt64("startime")
+	fmt.Println("startime", startime)
+	endtime, _ := this.GetInt64("endtime")
+	fmt.Println("endtime", endtime)
+	itemid, _ := this.GetInt64("itemid")
+	fmt.Println("itemid", itemid)
+
+	list, err := service.GetPatientComplianceDetail(orgid, patientid, startime, endtime, itemid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"list": list,
+	})
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -50,4 +50,5 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getpatientcontor", &CommonApiController{}, "Get:GetPatientContor")
 	beego.Router("/com/api/getqualitycontrol", &CommonApiController{}, "Get:GetQualityControl")
 	beego.Router("/com/api/gettreatlist", &CommonApiController{}, "Get:GetTreatlist")
+	beego.Router("/com/api/getpatientcompliancedetal", &CommonApiController{}, "Get:GetPatientComplianceDetail")
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -316,8 +316,6 @@ func (this *NewCommonApiController) GetMobileInspectionList() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	//entime := endDate.Unix()
 	endtimeStr := endtime + " 23:59:59"
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
 	entime := endtimeStrs.Unix()
@@ -491,7 +489,7 @@ func (this *NewCommonApiController) GetMobileFirstQuarter() {
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
-	fmt.Println("开始时间", statime)
+	//fmt.Println("开始时间", statime)
 	endtime := this.GetString("endtime")
 	fmt.Println("endtime", endtime)
 	endTimeYMDHmsStr := endtime + " 23:59:59"
@@ -837,7 +835,8 @@ func (this *NewCommonApiController) GetMobileQualityControl() {
 	fmt.Println("endtime", endtime)
 	itemid, _ := this.GetInt64("itemid")
 	fmt.Println("itemid", itemid)
-	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid)
+	inspectdate, _ := this.GetInt64("inspectdate")
+	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid, inspectdate)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -904,3 +903,27 @@ func (this *NewCommonApiController) GetMobileTreatlist() {
 		"list": list,
 	})
 }
+
+func (this *NewCommonApiController) GetPatientComplianceDetail() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	fmt.Println("orgd", orgid)
+	patientid, _ := this.GetInt64("patientid")
+	fmt.Println("patientid", patientid)
+	startime, _ := this.GetInt64("startime")
+	fmt.Println("startime", startime)
+	endtime, _ := this.GetInt64("endtime")
+	fmt.Println("endtime", endtime)
+	itemid, _ := this.GetInt64("itemid")
+	fmt.Println("itemid", itemid)
+	list, err := service.GetPatientComplianceDetail(orgid, patientid, startime, endtime, itemid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"list": list,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -30,4 +30,5 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/getmobilequalitycontrol", &NewCommonApiController{}, "Get:GetMobileQualityControl")
 	beego.Router("/m/api/toseachpatientscontrol", &NewCommonApiController{}, "Get:GetSeachPatientsControl")
 	beego.Router("/m/api/getmobiletreatlist", &NewCommonApiController{}, "Get:GetMobileTreatlist")
+	beego.Router("/m/api/getlistpatientdetail", &NewCommonApiController{}, "Get:GetPatientComplianceDetail")
 }

service/common_service.go

@@ -1616,7 +1616,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }
@@ -1665,7 +1665,7 @@ func GetPatientNames(orgid int64, patientid int64) (models.XtPatients, error) {
 	return patients, err
 }
 
-func GetQualityControlById(orgid int64, patientid int64, startime int64, endtime int64, itemid int64) (inspection []*models.PatientInspectionCount, err error) {
+func GetQualityControlById(orgid int64, patientid int64, startime int64, endtime int64, itemid int64, inspectdate int64) (inspection []*models.PatientInspectionCount, err error) {
 
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")
 	table := readDb.Table("xt_patients as s")
@@ -1682,6 +1682,38 @@ func GetQualityControlById(orgid int64, patientid int64, startime int64, endtime
 		db = db.Where("x.patient_id = ?", patientid)
 	}
 
+	//if startime > 0 {
+	//	db = db.Where("x.inspect_date >=?", startime)
+	//}
+	//if endtime > 0 {
+	//	db = db.Where("x.inspect_date <=?", endtime)
+	//}
+	if itemid > 0 {
+		db = db.Where("x.item_id = ?", itemid)
+	}
+	if inspectdate > 0 {
+		db = db.Where("x.inspect_date = ?", inspectdate)
+	}
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,r.unit").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+
+	return inspection, err
+}
+
+func GetPatientComplianceDetail(orgid int64, patientid int64, startime int64, endtime int64, itemid int64) (inspection []*models.PatientInspectionCount, err error) {
+	db := readDb.Table("xt_inspection as x").Where("x.status =1")
+	table := readDb.Table("xt_patients as s")
+	fmt.Println(table)
+	d := readDb.Table(" xt_inspection_reference as r")
+	fmt.Println(d)
+	d2 := readDb.Table("xt_quality_control_standard as d")
+	fmt.Println("d2", d2)
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)
 	}
@@ -1691,6 +1723,7 @@ func GetQualityControlById(orgid int64, patientid int64, startime int64, endtime
 	if itemid > 0 {
 		db = db.Where("x.item_id = ?", itemid)
 	}
+
 	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,r.unit").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err