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

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -446,7 +446,7 @@ func (this *NewCommonApiController) GetMobileProjectlsit() {
 	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
 	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
 	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
-	fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
+	//fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
 
 	//按季度统计
 	if itemtype == 1 {
@@ -662,3 +662,80 @@ func (this *NewCommonApiController) GetMobileMonthProjectList() {
 		"monthNolist": monthNolist,
 	})
 }
+
+func (this *NewCommonApiController) GetAllMobileMajorInspection() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	inspection, err := service.GetMajorInspectionByOrgid(orgid)
+	if len(inspection) == 0 {
+		inspect, err := service.GetDefaultByOrgId(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspect,
+		})
+	} else {
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": inspection,
+		})
+	}
+}
+
+func (this *NewCommonApiController) GetMobilePatient() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	startime := this.GetString("startime")
+	endtime := this.GetString("endtime")
+	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
+	fmt.Println("parseDateErr", parseDateErr)
+	statime := startDate.Unix()
+	fmt.Println("开始时间", statime)
+	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	entime := endDate.Unix()
+	fmt.Println("结束日期", entime)
+	limit, _ := this.GetInt64("limit")
+	fmt.Println("limit", limit)
+	page, _ := this.GetInt64("page")
+	fmt.Println("page", page)
+	patientInfo, total, err := service.GetPatientListData(orgid, statime, entime, limit, page)
+	info, _ := service.GetPatientListInfo(orgid, statime, entime)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientInfo": patientInfo,
+		"total":       total,
+		"list":        info,
+	})
+}
+
+func (this *NewCommonApiController) GetMobilePatientDetailCheck() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	id, _ := this.GetInt64("id")
+	startime := this.GetString("startime")
+	endtime := this.GetString("endtime")
+	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
+	fmt.Println("parseDateErr", parseDateErr)
+	statime := startDate.Unix()
+	fmt.Println("开始时间", statime)
+	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	entime := endDate.Unix()
+	fmt.Println("结束日期", entime)
+	checkDetail, err := service.GetPatientDetailCheck(id, orgid, statime, entime)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"checkDetail": checkDetail,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -22,4 +22,7 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("m/api/getmobileprojectlist", &NewCommonApiController{}, "Get:GetMobileProjectlsit")
 	beego.Router("/m/api/getmobilefirstquarter", &NewCommonApiController{}, "Get:GetMobileFirstQuarter")
 	beego.Router("/m/api/getmobilemonthprojectlist", &NewCommonApiController{}, "Get:GetMobileMonthProjectList")
+	beego.Router("/m/api/getallmobilemajorinspection", &NewCommonApiController{}, "Get:GetAllMobileMajorInspection")
+	beego.Router("/m/api/getmobilepatientlist", &NewCommonApiController{}, "Get:GetMobilePatient")
+	beego.Router("/m/api/getmobilepatientdetailcheck", &NewCommonApiController{}, "Get:GetMobilePatientDetailCheck")
 }