患者检验检查统计开发

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -389,7 +389,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 +400,9 @@ func (this *CommonApiController) GetTotalLapseCount() {
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patients": patients,
-		"total":    total,
-		"count":    count,
+		"patients":   patients,
+		"count":      count,
+		"patienttwo": patienttwo,
 	})
 }
 
@@ -1145,6 +1147,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
@@ -1232,6 +1235,7 @@ func (this *CommonApiController) GetPatientContor() {
 	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")
@@ -1245,9 +1249,8 @@ func (this *CommonApiController) GetPatientContor() {
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
 	endtimeStrsUnix := endtimeStrs.Unix()
 	fmt.Println("结束时间搓", endtimeStrsUnix)
-
-	patientcontorDetail, err := service.GetPatientContor(lapstor, orgid, keyword, startimeStrUnix, endtimeStrsUnix)
 	patients, err := service.GetPatientNames(orgid, keyword)
+	patientcontorDetail, err := service.GetLastPatientsControlTwo(orgid, patients.ID, startimeStrUnix, endtimeStrsUnix)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

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,
 	})
 }
 
@@ -831,3 +834,32 @@ func (this *NewCommonApiController) GetMobileQualityControl() {
 		"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

@@ -28,4 +28,5 @@ func NewCommonApiControllersRegisterRouters() {
 	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)

service/common_service.go

@@ -179,10 +179,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) {
@@ -767,8 +775,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 +1312,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 +1456,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
 }
@@ -1661,3 +1671,29 @@ func GetQualityControlById(orgid int64, patientid int64, startime int64, endtime
 
 	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.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,