患者检验检查统计开发

controllers/inspection_api_controller.go

@@ -124,10 +124,10 @@ func (c *InspectionApiController) CreatePatientInspection() {
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
@@ -226,13 +226,11 @@ func (c *InspectionApiController) CreatePatientInspection() {
 }
 
 func (c *InspectionApiController) EditPatientInspection() {
-	fmt.Println("触发了没有---------------------------------------")
 	patient, _ := c.GetInt64("patient", 0)
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
-	dates := c.GetString("dates")
-	projectid := c.GetString("projectid")
-	fmt.Println("日期---", dates)
-	fmt.Println("projectid", projectid)
+	// dates := c.GetString("dates")
+	// projectid := c.GetString("projectid")
+
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -253,23 +251,31 @@ func (c *InspectionApiController) EditPatientInspection() {
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
 		return
 	}
 
+	oldTime, olderr := time.ParseInLocation(timeLayout, from.OldInspectDate, loc)
+	if olderr != nil {
+		utils.ErrorLog(olderr.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
+		return
+	}
+
 	if len(from.FormItem) == 0 {
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "未填写项目")
 		return
 	}
 
 	date := theTime.Unix()
-	insp, err := service.GetPatientInspectionByDate(adminUserInfo.CurrentOrgId, patient, date, from.ProjectId)
+	oldDate := oldTime.Unix()
+	insp, err := service.GetPatientInspectionByDate(adminUserInfo.CurrentOrgId, patient, oldDate, from.ProjectId)
 	if err != nil {
 		utils.ErrorLog("%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -306,10 +312,10 @@ func (c *InspectionApiController) EditPatientInspection() {
 			inspection.CreatedTime = time.Now().Unix()
 			inspection.UpdatedTime = time.Now().Unix()
 			addinsp = append(addinsp, inspection)
-		} else if _, exi := inspMap[item.ID]; exi {
-			fmt.Println("2222222222")
+		} else {
 			inspection := *inspMap[item.ID]
 			inspection.InspectValue = item.Value
+			inspection.InspectDate = date
 			inspection.UpdatedTime = time.Now().Unix()
 			editinsp = append(editinsp, inspection)
 			noMap = append(noMap, item.ID)
@@ -373,15 +379,15 @@ func (c *InspectionApiController) DeletePatientInspection() {
 	patient, _ := c.GetInt64("patient", 0)
 	ProjectId, _ := c.GetInt64("project_id", 0)
 	InspectDate := c.GetString("date")
-	if patient <= 0 || ProjectId <= 0 || len(InspectDate) != 10 {
+	if patient <= 0 || ProjectId <= 0 || len(InspectDate) < 10 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -370,3 +370,128 @@ func (this *NewCommonApiController) GetSeachPatientDetail() {
 		"PatientsInfo": PatientsInfo,
 	})
 }
+
+func (this *NewCommonApiController) GetMobileNormdata() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	//获取系统数据
+	normdata, err := service.GetNormDataByOrgId(orgid)
+	if len(normdata) == 0 {
+		normdata, err := service.GetNormData(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"normdata": normdata,
+		})
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"normdata": normdata,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileProjectlsit() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	fmt.Println("orgid", orgid)
+	lapseto, _ := this.GetInt64("lapseto")
+	fmt.Println("专柜", lapseto)
+	itemtype, _ := this.GetInt64("itemtype")
+	fmt.Println("itemtype", itemtype)
+	modetype, _ := this.GetInt64("modeltype")
+	fmt.Println(modetype)
+
+	firstQuarterStart := this.GetString("first_quarter_start")
+	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
+	firstQuarterStartUnix := firstQuarterStartStr.Unix()
+	fmt.Println("第一季度开始时间", firstQuarterStartUnix)
+	fisrtQuarterEnd := this.GetString("first_qurter_end")
+	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
+	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
+	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
+	fmt.Println("第一季度结束时间", fisrtQuarterEndStrUnix)
+
+	secondeQuarterStart := this.GetString("second_qurter_start")
+	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
+	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
+	fmt.Println("第二季度开始时间", secondeQuarterStartUnix)
+	secondQuarterEnd := this.GetString("second_qurter_end")
+	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
+	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
+	fmt.Println("第二季度结束时间", secondQuarterEndStrUnix)
+
+	threeQuarterStart := this.GetString("three_qurter_start")
+	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
+	threeQuarterStartUnix := threeQuarterStartStr.Unix()
+	fmt.Println("第三季度开始时间", threeQuarterStartUnix)
+	threeQuarterEnd := this.GetString("three_qurter_end")
+	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
+	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
+	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
+	fmt.Println("第三季度结束时间", threeQuarterEndStrUnix)
+
+	fourQuarterStart := this.GetString("four_qurter_start")
+	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
+	fourQuarterStartUnix := fourQuarterStartStr.Unix()
+	fmt.Println("第四季度开始时间", fourQuarterStartUnix)
+	fourQuarterEnd := this.GetString("four_qurter_end")
+	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
+	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
+	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
+	fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
+
+	//按季度统计
+	if itemtype == 1 {
+		//统计总共
+		list, err := service.GetProjectList(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//统计达标个数
+		standList, err := service.GetProjectStandList(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() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	lapseto, _ := this.GetInt64("lapseto")
+	fmt.Println("转归", lapseto)
+	startime := this.GetString("startime")
+	fmt.Println("startime", startime)
+	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
+	fmt.Println("parseDateErr", parseDateErr)
+	statime := startDate.Unix()
+	fmt.Println("开始时间", statime)
+	endtime := this.GetString("endtime")
+	fmt.Println("endtime", endtime)
+	endTimeYMDHmsStr := endtime + " 23:59:59"
+	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
+	entime := endDate.Unix()
+	fmt.Println("结束日期", entime)
+	//group, parseDateErr := service.GetItemNameGroup(orgid, statime, entime)
+	//quarter, err := service.GetFirstQuarter(orgid, statime, entime)
+	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"count": count,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -18,4 +18,7 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/getmobileInspectionList", &NewCommonApiController{}, "Get:GetMobileInspectionList")
 	beego.Router("/m/api/getpatientinspectiondetail", &NewCommonApiController{}, "Get:GetPatientInspectionDetail")
 	beego.Router("m/api/getseachpatientdetail", &NewCommonApiController{}, "Get:GetSeachPatientDetail")
+	beego.Router("m/api/getmobilenormdata", &NewCommonApiController{}, "Get:GetMobileNormdata")
+	beego.Router("m/api/getmobileprojectlist", &NewCommonApiController{}, "Get:GetMobileProjectlsit")
+	beego.Router("/m/api/getmobilefirstquarter", &NewCommonApiController{}, "Get:GetMobileFirstQuarter")
 }

models/common_models.go

@@ -290,11 +290,11 @@ type DialysisTotalDataStruct struct {
 	ModeID string `json:"mode_id"`
 }
 
-type UserInspectionProjectCount struct {
-	PatientId int64
-	Count     int64
-	ProjectId int64
-}
+//type UserInspectionProjectCount struct {
+//  PatientId int64
+//  Count     int64
+//  ProjectId int64
+//}
 
 type InspectionReferenceMaps struct {
 	ProjectName        string               `gorm:"-" json:"project_name" form:"project_name"`

models/inspection_models.go

@@ -77,6 +77,12 @@ type UserInspectionProjectCounts struct {
 	Sort                int64
 }
 
+type UserInspectionProjectCount struct {
+	PatientId int64
+	Count     int64
+	ProjectId int64
+}
+
 type UserDoctorAdvicesCount struct {
 	PatientId int64
 	Count     int64
@@ -91,10 +97,11 @@ type InspectionReferenceMap struct {
 }
 
 type InepectionForm struct {
-	Method      string `json:"method"`
-	ProjectId   int64  `json:"project_id"`
-	InspectDate string `json:"inspect_date"`
-	FormItem    []struct {
+	Method         string `json:"method"`
+	ProjectId      int64  `json:"project_id"`
+	InspectDate    string `json:"inspect_date"`
+	OldInspectDate string `json:"old_inspect_date"`
+	FormItem       []struct {
 		ID          int64  `json:"id"`
 		ProjectId   int64  `json:"project_id"`
 		ProjectName string `json:"project_name"`