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

controllers/base_api_controller.go

@@ -79,7 +79,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9841
+		subscibe.OrgId = 9726
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -89,7 +89,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9841
+		adminUserInfo.CurrentOrgId = 9726
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9841
+		subscibe.OrgId = 9726
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9841
+		adminUserInfo.CurrentOrgId = 9726
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -917,7 +917,7 @@ func (this *CommonApiController) GetFirstQuarter() {
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
-	fmt.Println("开始时间", statime)
+	fmt.Println("开始时间=====================================", statime)
 	endtime := this.GetString("endtime")
 	fmt.Println("endtime", endtime)
 	endTimeYMDHmsStr := endtime + " 23:59:59"
@@ -1210,7 +1210,7 @@ func (this *CommonApiController) GetPatientscontrol() {
 	limit, _ := this.GetInt64("limit")
 	fmt.Println("limit", limit)
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
-
+	fmt.Println("============================================================")
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 	//获取最后一次数据
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1243,8 +1243,8 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 	fmt.Print("透析号", dialysis)
 	patientsoure := int64(dataBody["patientsoure"].(float64))
 	fmt.Print("患者来源", patientsoure)
-	lapseto := int64(dataBody["lapseto"].(float64))
-	fmt.Print("留置状态", lapseto)
+	//lapseto := int64(dataBody["lapseto"].(float64))
+	//fmt.Print("留置状态", lapseto)
 	contagions := dataBody["resultTwo"].([]interface{})
 	fmt.Print("传染病", contagions)
 	ids := make([]int64, 0)
@@ -1347,7 +1347,6 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Birthday:          birth,
 			Age:               ages,
 			Phone:             phone,
-			Lapseto:           lapseto,
 			AdmissionNumber:   adminssionNumber,
 			FirstDialysisDate: fisttime,
 			Diagnose:          diagonse,
@@ -1361,12 +1360,12 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			IsInfectious:      is_infectious,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
-		patientLapseto := models.PatientLapseto{
-			LapsetoType: lapseto,
-			LapsetoTime: time.Now().Unix(),
-			UpdatedTime: time.Now().Unix(),
-		}
-		err = service.UpdatePatientLapseto(patient.BloodId, patientLapseto)
+		//patientLapseto := models.PatientLapseto{
+		//	LapsetoType: lapseto,
+		//	LapsetoTime: time.Now().Unix(),
+		//	UpdatedTime: time.Now().Unix(),
+		//}
+		//err = service.UpdatePatientLapseto(patient.BloodId, patientLapseto)
 		fmt.Println("编辑转归失败", err)
 		patientsNew := models.XtPatientsNew{
 			ID:                id,
@@ -1375,7 +1374,6 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Birthday:          birth,
 			Age:               ages,
 			Phone:             phone,
-			Lapseto:           lapseto,
 			AdmissionNumber:   adminssionNumber,
 			FirstDialysisDate: fisttime,
 			Diagnose:          diagonse,
@@ -1427,7 +1425,6 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Birthday:          birth,
 			Age:               ages,
 			Phone:             phone,
-			Lapseto:           lapseto,
 			AdmissionNumber:   adminssionNumber,
 			FirstDialysisDate: fisttime,
 			Diagnose:          diagonse,
@@ -1480,7 +1477,6 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Birthday:          birth,
 			Age:               ages,
 			Phone:             phone,
-			Lapseto:           lapseto,
 			AdmissionNumber:   adminssionNumber,
 			FirstDialysisDate: fisttime,
 			Diagnose:          diagonse,
@@ -1533,7 +1529,7 @@ func (this *NewDialysisApiController) GetAllProjectName() {
 	patient, _ := service.GetNewPatient(paientids)
 	orgid := this.GetMobileAdminUserInfo().Org.Id
 	projectName, err := service.GetAllProjectName(ids, orgid, patient.BloodId)
-	fmt.Println("projectname----------------------------------", err)
+	fmt.Println("projectname", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

controllers/patient_api_controller.go

@@ -467,16 +467,14 @@ func (c *PatientApiController) EditPatient() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
 		return
 	}
-	//更新转归状态
-
-	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)
+	////更新转归状态
+	//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
@@ -489,7 +487,6 @@ func (c *PatientApiController) EditPatient() {
 		DialysisNo:                patient.DialysisNo,
 		AdmissionNumber:           patient.AdmissionNumber,
 		Source:                    patient.Source,
-		Lapseto:                   patient.Lapseto,
 		PartitionId:               patient.PartitionId,
 		BedId:                     patient.BedId,
 		Name:                      patient.Name,
@@ -560,7 +557,6 @@ func (c *PatientApiController) EditPatient() {
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
-	fmt.Println("更新病人失败---------------------------------------", err)
 
 	if len(record_date) > 0 {
 		var recordTime int64

models/common_models.go

@@ -304,6 +304,12 @@ type InspectionReferenceMaps struct {
 	CheckConfiguration []CheckConfiguration `gorm:"-" json:"inspection_reference" form:"inspection_reference"`
 }
 
+type VmPatientInspectionTwo struct {
+	ItemId int64 `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Total  int64
+	Count  int64
+}
+
 type VmPatientInspection struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`
 	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`

service/common_service.go

@@ -781,17 +781,17 @@ func GetFirstQuarter(orgid int64, startime int64, endtime int64) (inspection []*
 	return inspection, err
 }
 
-func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto int64) (inspection []*models.VmPatientInspection, err error) {
+func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto int64) (inspection []*models.VmPatientInspectionTwo, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x ").Where("x.status = 1")
 	table := XTReadDB().Table("xt_inspection_reference as r")
 	fmt.Println(table)
 	d := XTReadDB().Table("xt_patients as s")
 	fmt.Println(d)
-	d2 := XTReadDB().Table("xt_quality_control_standard as p")
-	fmt.Println(d2)
+	//d2 := XTReadDB().Table("xt_quality_control_standard as p")
+	//fmt.Println(d2)
 	if orgid > 0 {
-		db = db.Where("x.org_id = ?", orgid)
+		db = db.Where("x.org_id = ? and x.inspect_value <> 0", orgid)
 	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)
@@ -805,7 +805,7 @@ func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto in
 	if lapseto > 0 {
 		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
+	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.item_id", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_patients as  s on s.id = x.patient_id").Scan(&inspection).Error
 	return inspection, err
 }
 
@@ -1583,7 +1583,7 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no").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").Group("x.patient_id").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
+	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0 )").Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
 
 	return inspection, total, err
 }
@@ -1598,7 +1598,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	d2 := readDb.Table("xt_quality_control_standard as d")
 	fmt.Println("d2", d2)
 	if orgid > 0 {
-		db = db.Where("x.org_id = ?", orgid)
+		db = db.Where("x.org_id = ? and x.inspect_value <> 0", orgid)
 	}
 	if lapstor == 0 {
 		table = table.Where("s.lapseto = 1 or s.lapseto = 2")

service/patient_service.go

@@ -277,8 +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.PatientLapseto{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto_type": patient.Lapseto, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).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