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

@@ -42,14 +42,30 @@ func (this *CommonApiController) GetInspectionMajor() {
 
 func (this *CommonApiController) GetInspectionMinor() {
 	id, _ := this.GetInt64("id")
-	minor, err := service.GetInspectionMinor(id)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	adminInfo := this.GetAdminUserInfo()
+	orgId := adminInfo.CurrentOrgId
+	//查询该机构是否存在小项
+	major, _ := service.GetInspectionMajor(orgId)
+	if len(major) == 0 {
+		minor, err := service.GetInspectionMinor(id, 0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": minor,
+		})
+	} else {
+		minor, err := service.GetInspectionMinor(id, orgId)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"inspection": minor,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"inspection": minor,
-	})
+
 }
 
 func (this *CommonApiController) GetInspectionRange() {
@@ -389,7 +405,9 @@ func (this *CommonApiController) GetTotalLapseCount() {
 	//统计一个月内转出的病人
 	//patients, total, err := service.GetTotalRollOut(startime, endtime, orgid)
 	//统计该机构的转出人数
-	patients, total, err := service.GetTotalRollOutPatients(orgid)
+	patients, err := service.GetTotalRollOutPatients(orgid, startime, endtime)
+	//统计该机构转出病人
+	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startime, endtime)
 	//统计总共病人
 	//	_, count, _ := service.GetPatientTotalCountTwo(orgid, startime, endtime)
 	count := service.GetPatientTotalCount(orgid)
@@ -398,9 +416,9 @@ func (this *CommonApiController) GetTotalLapseCount() {
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patients": patients,
-		"total":    total,
-		"count":    count,
+		"patients":   patients,
+		"count":      count,
+		"patienttwo": patienttwo,
 	})
 }
 
@@ -436,7 +454,7 @@ func (this *CommonApiController) GetTotalInfectiouscount() {
 	//统计透析总人数
 	total := service.GetPatientTotalCount(orgid)
 	//统计透析人数传染病所占比例
-	count, err := service.GetPatientInfectiousCount(orgid)
+	count, err := service.GetPatientInfectiousCount(orgid, startime, endtime)
 	//统计其他
 	_, otherTotal, err := service.GetPatientOtherInfectious(orgid)
 	if err != nil {
@@ -1145,6 +1163,7 @@ func (this *CommonApiController) GetMonthProjectList() {
 	monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
 	//统计不合格
 	monthNolist, err := service.GetMonthProjectListTwo(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+	fmt.Println("monthnolist=====", monthNolist)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1194,3 +1213,91 @@ func (this *CommonApiController) GetPatientscontrol() {
 		"control":  control,
 	})
 }
+
+func (this *CommonApiController) GetCartogramList() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	lapstor, _ := this.GetInt64("lapstor")
+	fmt.Println("lapstor", lapstor)
+	startime := this.GetString("startime")
+	fmt.Println("开始时间", startime)
+	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
+	startimeStrUnix := startimeStr.Unix()
+	fmt.Println("时间搓", startimeStrUnix)
+	endtime := this.GetString("endtime")
+	fmt.Println("结束时间", endtime)
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	endtimeStrsUnix := endtimeStrs.Unix()
+	fmt.Println("结束时间搓", endtimeStrsUnix)
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"cartogramlist": cartogramlist,
+		"total":         total,
+	})
+}
+
+func (this *CommonApiController) GetPatientContor() {
+
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	fmt.Println(orgid)
+	lapstor, _ := this.GetInt64("lapstor")
+	fmt.Println("lapstor", lapstor)
+	keyword := this.GetString("keyword")
+	fmt.Println("keyword", keyword)
+	startime := this.GetString("startime")
+	fmt.Println("开始时间", startime)
+	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
+	startimeStrUnix := startimeStr.Unix()
+	fmt.Println("时间搓", startimeStrUnix)
+	endtime := this.GetString("endtime")
+	fmt.Println("结束时间", endtime)
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	endtimeStrsUnix := endtimeStrs.Unix()
+	fmt.Println("结束时间搓", endtimeStrsUnix)
+	patients, err := service.GetPatientNames(orgid, keyword)
+	patientcontorDetail, err := service.GetLastPatientsControlTwo(orgid, patients.ID, startimeStrUnix, endtimeStrsUnix)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientcontorDetail": patientcontorDetail,
+		"name":                patients.Name,
+	})
+}
+
+func (this *CommonApiController) GetQualityControl() {
+
+	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.GetQualityControlById(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

@@ -46,4 +46,7 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getprojectlist", &CommonApiController{}, "Get:GetProjectList")
 	beego.Router("/com/api/getmonthprojectlist", &CommonApiController{}, "Get:GetMonthProjectList")
 	beego.Router("/com/api/getpatientscontrol", &CommonApiController{}, "Get:GetPatientscontrol")
+	beego.Router("/com/api/getcartogramlist", &CommonApiController{}, "Get:GetCartogramList")
+	beego.Router("/com/api/getpatientcontor", &CommonApiController{}, "Get:GetPatientContor")
+	beego.Router("/com/api/getqualitycontrol", &CommonApiController{}, "Get:GetQualityControl")
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -50,15 +50,18 @@ func (this *NewCommonApiController) GetMobileTotalLapseCount() {
 	fmt.Println("endtime", endtime)
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
-	_, total, err := service.GetTotalRollOutPatients(orgid)
+	//统计转出的病人
+	patient, err := service.GetTotalRollOutPatients(orgid, startime, endtime)
+	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startime, endtime)
 	count := service.GetPatientTotalCount(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total": total,
-		"count": count,
+		"patient":    patient,
+		"count":      count,
+		"patienttwo": patienttwo,
 	})
 }
 
@@ -91,7 +94,7 @@ func (this *NewCommonApiController) GetMobileTotalInfectiousCout() {
 	//统计透析总人数
 	total := service.GetPatientTotalCount(orgid)
 	//统计透析人数传染病所占比例
-	count, err := service.GetPatientInfectiousCount(orgid)
+	count, err := service.GetPatientInfectiousCount(orgid, startime, endtime)
 	//统计其他
 	_, otherTotal, err := service.GetPatientOtherInfectious(orgid)
 	if err != nil {
@@ -739,3 +742,124 @@ func (this *NewCommonApiController) GetMobilePatientDetailCheck() {
 		"checkDetail": checkDetail,
 	})
 }
+
+func (this *NewCommonApiController) GetMobilePatientControl() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	lapstor, _ := this.GetInt64("lapstor")
+	fmt.Println("lapstor", lapstor)
+	startime := this.GetString("startime")
+	fmt.Println("开始时间", startime)
+	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
+	startimeStrUnix := startimeStr.Unix()
+	fmt.Println("时间搓", startimeStrUnix)
+	endtime := this.GetString("endtime")
+	fmt.Println("结束时间", endtime)
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	endtimeStrsUnix := endtimeStrs.Unix()
+	fmt.Println("结束时间搓", endtimeStrsUnix)
+	page, _ := this.GetInt64("page")
+	fmt.Println("page", page)
+	limit, _ := this.GetInt64("limit")
+	fmt.Println("limit", limit)
+	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+
+	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	//获取最后一次数据
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patients": patients,
+		"total":    total,
+		"control":  control,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileCartogramlist() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	lapstor, _ := this.GetInt64("lapstor")
+	fmt.Println("lapstor", lapstor)
+	startime := this.GetString("startime")
+	fmt.Println("开始时间", startime)
+	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
+	startimeStrUnix := startimeStr.Unix()
+	fmt.Println("时间搓", startimeStrUnix)
+	endtime := this.GetString("endtime")
+	fmt.Println("结束时间", endtime)
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	endtimeStrsUnix := endtimeStrs.Unix()
+	fmt.Println("结束时间搓", endtimeStrsUnix)
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"cartogramlist": cartogramlist,
+		"total":         total,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileQualityControl() {
+	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.GetQualityControlById(orgid, patientid, startime, endtime, itemid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"list": list,
+	})
+}
+
+func (this *NewCommonApiController) GetSeachPatientsControl() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	fmt.Println("orgid", orgid)
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	startime := this.GetString("startime")
+	fmt.Println("开始时间", startime)
+	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
+	startimeStrUnix := startimeStr.Unix()
+	fmt.Println("时间搓", startimeStrUnix)
+	endtime := this.GetString("endtime")
+	fmt.Println("结束时间", endtime)
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	endtimeStrsUnix := endtimeStrs.Unix()
+	fmt.Println("结束时间搓", endtimeStrsUnix)
+	control, err := service.GetLastPatientsControlTwo(orgid, id, startimeStrUnix, endtimeStrsUnix)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"control": control,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -25,4 +25,8 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/getallmobilemajorinspection", &NewCommonApiController{}, "Get:GetAllMobileMajorInspection")
 	beego.Router("/m/api/getmobilepatientlist", &NewCommonApiController{}, "Get:GetMobilePatient")
 	beego.Router("/m/api/getmobilepatientdetailcheck", &NewCommonApiController{}, "Get:GetMobilePatientDetailCheck")
+	beego.Router("/m/api/getmobilepatientcontrol", &NewCommonApiController{}, "Get:GetMobilePatientControl")
+	beego.Router("m/api/getmobilecartogramlist", &NewCommonApiController{}, "Get:GetMobileCartogramlist")
+	beego.Router("/m/api/getmobilequalitycontrol", &NewCommonApiController{}, "Get:GetMobileQualityControl")
+	beego.Router("/m/api/toseachpatientscontrol", &NewCommonApiController{}, "Get:GetSeachPatientsControl")
 }

controllers/patient_api_controller.go

@@ -467,7 +467,20 @@ func (c *PatientApiController) EditPatient() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
 		return
 	}
-	fmt.Println("病人--------------------------------------------------------------", patient.Name, patient.Age)
+	//更新转归状态
+
+	fmt.Println("病人id--------------------------------------------------------------", patient.ID)
+	lapseto := models.PatientLapseto{
+		LapsetoType: patient.Lapseto,
+		LapsetoTime: time.Now().Unix(),
+		UpdatedTime: time.Now().Unix(),
+	}
+	err = service.UpdatePatientLapseto(patient.ID, lapseto)
+	fmt.Println("更新转归失败", err)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
+		return
+	}
 	patientsNew := models.XtPatientsNew{
 		UserOrgId:                 patient.UserOrgId,
 		UserId:                    patient.UserId,
@@ -619,6 +632,7 @@ func (c *PatientApiController) EditPatient() {
 
 func (c *PatientApiController) EditLapseto() {
 	id, _ := c.GetInt64("id", 0)
+	fmt.Println("id===========", id)
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -691,7 +705,6 @@ func (c *PatientApiController) EditLapseto() {
 	//		return
 	//	}
 	//}
-
 	err = service.EditPatientLapseto(&patient, &lapseto)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEditLapsetoFail)

models/common_models.go

@@ -404,8 +404,10 @@ type PatientInspectionCount struct {
 	Name         string `gorm:"column:name" json:"name" form:"name"`
 	RangMax      string `gorm:"column:range_max" json:"range_max" form:"range_max"`
 	RangMin      string `gorm:"column:range_min" json:"range_min" form:"range_min"`
+	Unit         string `gorm:"column:unit" json:"unit" form:"unit"`
 	DialysisNo   string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 	RangeValue   string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	Sort         int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (PatientInspectionCount) TableName() string {

service/common_service.go

@@ -13,9 +13,9 @@ func GetInspectionMajor(orgid int64) (inspection []*models.XtInspectionReference
 	return inspection, err
 }
 
-func GetInspectionMinor(projectid int64) (inspection []*models.XtInspectionReference, err error) {
+func GetInspectionMinor(projectid int64, orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
-	err = XTReadDB().Model(&inspection).Where("project_id = ? and status = 1", projectid).Find(&inspection).Error
+	err = XTReadDB().Model(&inspection).Where("project_id = ? and status = 1 and org_id = ?", projectid, orgid).Find(&inspection).Error
 	return inspection, err
 }
 
@@ -160,14 +160,19 @@ func DeleteCheck(id int64) error {
 	return err
 }
 
-func GetDialysiTotal(startime int64, endtime int64, orgid int64) (prescription []*models.DialysisPrescription, total int64, err error) {
-	err = XTReadDB().Model(&prescription).Where("record_date >= ? and record_date<=? and user_org_id = ?", startime, endtime, orgid).Count(&total).Find(&prescription).Error
-	return prescription, total, err
+func GetDialysiTotal(startime int64, endtime int64, orgid int64) (order []*models.DialysisOrder, total int64, err error) {
+	err = XTReadDB().Model(&order).Where("dialysis_date >= ? and dialysis_date<=? and user_org_id = ?", startime, endtime, orgid).Count(&total).Find(&order).Error
+	return order, total, err
+
 }
 
 func GetDialysisCountMode(starttime int64, endtime int64, orgid int64) (counts []*models.PatientPrescriptionCountStruct, err error) {
-	err = readDb.Table("xt_dialysis_prescription as p").Where("p.record_date>= ? and p.record_date<=? and p.user_org_id=?", starttime, endtime, orgid).Select("p.mode_id,count(p.mode_id) as count").Group("p.mode_id").Scan(&counts).Error
+	//err = readDb.Table("xt_dialysis_prescription as p").Where("p.record_date>= ? and p.record_date<=? and p.user_org_id=?", starttime, endtime, orgid).Select("p.mode_id,count(p.mode_id) as count").Group("p.mode_id").Scan(&counts).Error
+	//return counts, err
+
+	err = readDb.Table("xt_dialysis_order as o left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ? and o.status = 1 and s.status = 1", starttime, endtime, orgid).Select("s.mode_id,count(s.mode_id) as count").Group("s.mode_id").Scan(&counts).Error
 	return counts, err
+
 }
 
 func GetTotalRollOut(starttime int64, endtime int64, orgid int64) (counts []*models.PatientLapseto, total int64, err error) {
@@ -179,10 +184,18 @@ func GetTotalRollOut(starttime int64, endtime int64, orgid int64) (counts []*mod
 	return counts, total, err
 }
 
-func GetTotalRollOutPatients(orgid int64) (patients []*models.XtPatients, total int64, err error) {
+func GetTotalRollOutPatients(orgid int64, startime int64, endtime int64) (patients []*models.XtPatients, err error) {
 
-	err = XTReadDB().Model(&patients).Where("user_org_id = ? and status = 1 and lapseto = 2", orgid).Count(&total).Find(&patients).Error
-	return patients, total, err
+	db := XTReadDB().Table("x.patients as x")
+	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 1 and x.status = 1 group by s.patient_id", startime, endtime, orgid).Scan(&patients).Error
+	return patients, err
+}
+
+func GetTotalRollOutPatientsTwo(orgid int64, startime int64, endtime int64) (patients []*models.XtPatients, err error) {
+
+	db := XTReadDB().Table("x.patients as x")
+	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1 group by s.patient_id", startime, endtime, orgid).Scan(&patients).Error
+	return patients, err
 }
 
 func GetPatientTotalCount(orgID int64) (total int64) {
@@ -217,9 +230,9 @@ func GetManPatientTotal(orgid int64) (patients []*models.XtPatients, total int64
 //	return counts, err
 //}
 
-func GetPatientInfectiousCount(orgid int64) (counts []*models.PatientContagionsCountStruct, err error) {
+func GetPatientInfectiousCount(orgid int64, startime int64, endtime int64) (counts []*models.PatientContagionsCountStruct, err error) {
 
-	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.is_infectious = 2", orgid).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.is_infectious = 2 and s.created_time>=? and s.created_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	return counts, err
 }
 
@@ -234,12 +247,11 @@ func GetTotalAgeCount(orgid int64) (counts []*models.PatientAgeCountStruct, err
 	readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
 	 SELECT
 	 CASE
-	  WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<=20 THEN '20'
-	  WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>20 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<=40 THEN '40'
-	  WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>40 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<=60 THEN '60'
-	  WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>60 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<=80 THEN '80'
-	  WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>80 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<=150 THEN '150'
-	  ELSE '-1'
+	  WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=20 THEN '20'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=40 THEN '40'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=60 THEN '60'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=80 THEN '80'
+    ELSE '150'
 	 END
 	 AS nnd FROM xt_patients as s  where s.user_org_id=? and s.status=1
 	 )a GROUP BY nnd`, orgid).Scan(&counts)
@@ -312,6 +324,19 @@ func GetDialysisAgeData(orgID int64) (counts []*models.DialysisAgePieDataStruct,
 	err = readDb.Raw(countSQL, countParams...).Scan(&counts).Error
 	return
 
+	//readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+	// SELECT
+	// CASE
+	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) >= 0
+	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 12 THEN '0~12' WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12
+	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '12~36' WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36
+	//  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '36~60' WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60
+	//  ELSE '150'
+	// END
+	// AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1
+	// )a GROUP BY nnd`, orgID).Scan(&counts)
+	//return
+
 }
 
 func GetCurentOrgPatients(orgid int64) (patients []*models.XtPatients, err error) {
@@ -767,8 +792,11 @@ func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto in
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
+	if lapseto == 0 {
+		db = db.Where("s.lapseto = 1 or s.lapseto = 2")
+	}
 	if lapseto > 0 {
-		d = d.Where("s.lapseto = ?", lapseto)
+		db = db.Where("s.lapseto = ?", lapseto)
 	}
 	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_value,x.inspect_date,r.range_min,r.range_max,p.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_patients as  s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as p on p.inspection_minor = x.item_id").Order("p.sort asc").Scan(&inspection).Error
 	return inspection, err
@@ -1301,7 +1329,7 @@ func GetMonthProjectList(orgid int64, lapseto int64, modetype int64, januaryStar
 }
 
 func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryStartStrUnix int64, januaryEndStrUnix int64, febStartStrStrUnix int64, febEndStrUnix int64, marchStartStrUnix int64, marchEndStrUnix int64, aprStartStrUnix int64, aprEndStrsUnix int64, mayStartStrUnix int64, mayEndStrsUnix int64, junStartStrUnix int64, junEndStrsUnix int64, julStartStrUnix int64, julEndStrsUnix int64, augStartStrUnix int64, augEndStrsUnix int64, sepStartStrUnix int64, sepEndStrsUnix int64, octStartStrUnix int64, octEndStrsUnix int64, novStartStrUnix int64, novEndStrsUnix int64, decStartStrUnix int64, decEndStrsUnix int64) (inspection []*models.ProjectCount, err error) {
-
+	fmt.Println("lapseto=======", lapseto)
 	if lapseto == 0 {
 		d := XTReadDB().Table("xt_patients as s")
 		fmt.Println("d", d)
@@ -1445,79 +1473,78 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 		}
 		countSQL += ")a GROUP BY nnd"
 		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
 
-		if lapseto == 2 {
-
-			d := XTReadDB().Table("xt_patients as s")
-			fmt.Println("d", d)
-			db := readDb.Table("xt_inspection as x ").Where("x.status=1")
-			table := XTReadDB().Table("xt_inspection_reference as r")
-			fmt.Println(table)
-			countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
-				"SELECT " +
-				"CASE " +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
-				" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十二月'" +
-				" ELSE '其他'" +
-				"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value + 0 >= r.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
-			countParams := make([]interface{}, 0)
+	if lapseto == 2 {
+		d := XTReadDB().Table("xt_patients as s")
+		fmt.Println("d", d)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+		table := XTReadDB().Table("xt_inspection_reference as r")
+		fmt.Println(table)
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十二月'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value + 0 >= r.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+		countParams := make([]interface{}, 0)
+		countParams = append(countParams, januaryStartStrUnix)
+		countParams = append(countParams, januaryEndStrUnix)
+		countParams = append(countParams, febStartStrStrUnix)
+		countParams = append(countParams, febEndStrUnix)
+		countParams = append(countParams, marchStartStrUnix)
+		countParams = append(countParams, marchEndStrUnix)
+		countParams = append(countParams, aprStartStrUnix)
+		countParams = append(countParams, aprEndStrsUnix)
+		countParams = append(countParams, mayStartStrUnix)
+		countParams = append(countParams, mayEndStrsUnix)
+		countParams = append(countParams, junStartStrUnix)
+		countParams = append(countParams, junEndStrsUnix)
+		countParams = append(countParams, julStartStrUnix)
+		countParams = append(countParams, julEndStrsUnix)
+		countParams = append(countParams, augStartStrUnix)
+		countParams = append(countParams, augEndStrsUnix)
+		countParams = append(countParams, sepStartStrUnix)
+		countParams = append(countParams, sepEndStrsUnix)
+		countParams = append(countParams, octStartStrUnix)
+		countParams = append(countParams, octEndStrsUnix)
+		countParams = append(countParams, novStartStrUnix)
+		countParams = append(countParams, novEndStrsUnix)
+		countParams = append(countParams, decStartStrUnix)
+		countParams = append(countParams, decEndStrsUnix)
+		if orgid > 0 {
+			db = db.Where("x.org_id=?", orgid)
+			countSQL += " AND x.org_id=?"
+			countParams = append(countParams, orgid)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
 			countParams = append(countParams, januaryStartStrUnix)
-			countParams = append(countParams, januaryEndStrUnix)
-			countParams = append(countParams, febStartStrStrUnix)
-			countParams = append(countParams, febEndStrUnix)
-			countParams = append(countParams, marchStartStrUnix)
-			countParams = append(countParams, marchEndStrUnix)
-			countParams = append(countParams, aprStartStrUnix)
-			countParams = append(countParams, aprEndStrsUnix)
-			countParams = append(countParams, mayStartStrUnix)
-			countParams = append(countParams, mayEndStrsUnix)
-			countParams = append(countParams, junStartStrUnix)
-			countParams = append(countParams, junEndStrsUnix)
-			countParams = append(countParams, julStartStrUnix)
-			countParams = append(countParams, julEndStrsUnix)
-			countParams = append(countParams, augStartStrUnix)
-			countParams = append(countParams, augEndStrsUnix)
-			countParams = append(countParams, sepStartStrUnix)
-			countParams = append(countParams, sepEndStrsUnix)
-			countParams = append(countParams, octStartStrUnix)
-			countParams = append(countParams, octEndStrsUnix)
-			countParams = append(countParams, novStartStrUnix)
-			countParams = append(countParams, novEndStrsUnix)
-			countParams = append(countParams, decStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
 			countParams = append(countParams, decEndStrsUnix)
-			if orgid > 0 {
-				db = db.Where("x.org_id=?", orgid)
-				countSQL += " AND x.org_id=?"
-				countParams = append(countParams, orgid)
-			}
-			if modetype > 0 {
-				db = db.Where("x.item_id = ?", modetype)
-				countSQL += " AND x.item_id=?"
-				countParams = append(countParams, modetype)
-			}
-			if januaryStartStrUnix > 0 {
-				db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
-				countSQL += " AND x.inspect_date >=?"
-				countParams = append(countParams, januaryStartStrUnix)
-			}
-			if decEndStrsUnix > 0 {
-				db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
-				countSQL += " AND x.inspect_date <=?"
-				countParams = append(countParams, decEndStrsUnix)
-			}
-			countSQL += ")a GROUP BY nnd"
-			err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
 		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
 	}
 	return
 }
@@ -1536,6 +1563,12 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 	if lapstor == 0 {
 		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
 	}
+	if lapstor == 1 {
+		db = db.Where("s.lapseto = 1")
+	}
+	if lapstor == 2 {
+		db = db.Where("s.lapseto = 2")
+	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)
 	}
@@ -1555,6 +1588,45 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	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 lapstor == 0 {
+		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
+	}
+
+	if lapstor == 1 {
+		table = table.Where("s.lapseto = 1")
+	}
+	if lapstor == 2 {
+		table = table.Where("s.lapseto = 2")
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	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
+
+	return inspection, err
+}
+
+func GetPatientContor(lapstor, orgid int64, keywords string, startime int64, endtime 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 len(keywords) > 0 {
+		db = db.Where("s.name LIKE ? OR s.dialysis_no LIKE ?", keywords, keywords)
+	}
 
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
@@ -1562,13 +1634,83 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	if lapstor == 0 {
 		table = table.Where("s.lapseto = 1 or s.lapseto = 2")
 	}
+
+	if lapstor == 1 {
+		table = table.Where("s.lapseto = 1")
+	}
+	if lapstor == 2 {
+		table = table.Where("s.lapseto = 2")
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	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
+
+	return inspection, err
+}
+
+func GetPatientNames(orgid int64, patientname string) (models.XtPatients, error) {
+	patients := models.XtPatients{}
+	err := readDb.Where("user_org_id = ? and (name=? or dialysis_no=?) and status = 1", orgid, patientname, patientname).Find(&patients).Error
+	return patients, err
+}
+
+func GetQualityControlById(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)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", 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
+}
+
+func GetLastPatientsControlTwo(orgid int64, patientid int64, startime int64, endtime 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)
 	}
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.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").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").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.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
 }

service/patient_service.go

@@ -277,7 +277,8 @@ func CreatePatientsNew(patientsNew *models.XtPatientsNew) error {
 
 func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto) (err error) {
 	utx := writeDb.Begin()
-	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"Lapseto": patient.Lapseto}).Error
+	//err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"Lapseto": patient.Lapseto}).Error
+	err = utx.Model(&models.PatientLapseto{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto_type": patient.Lapseto, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		utx.Rollback()
 		return
@@ -380,6 +381,11 @@ func UpdatePatient(patient *models.Patients, contagions []int64, diseases []int6
 	return
 }
 
+func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error {
+	err := XTWriteDB().Model(&lapseto).Where("patient_id = ?", patientid).Updates(map[string]interface{}{"lapseto_type": lapseto.LapsetoType, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
+	return err
+}
+
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,