患者检验检查统计开发

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -471,9 +471,9 @@ func (this *NewCommonApiController) GetMobileProjectlsit() {
 	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
 	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
 	//fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
-
+	rangetype, _ := this.GetInt64("range_type")
 	//按季度统计
-	if itemtype == 1 {
+	if rangetype == 1 {
 		//统计总共
 		list, err := service.GetProjectList(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		//统计达标个数
@@ -488,6 +488,21 @@ func (this *NewCommonApiController) GetMobileProjectlsit() {
 			"standList": standList,
 		})
 	}
+
+	if rangetype == 2 {
+		list, err := service.GetProjectListOne(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//统计达标个数
+		standList, err := service.GetProjectStandListOne(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"standList": standList,
+		})
+	}
 }
 
 func (this *NewCommonApiController) GetMobileFirstQuarter() {