患者检验检查统计开发

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() {
@@ -438,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 {

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -94,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 {

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) {
@@ -225,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
 }
 
@@ -242,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)
@@ -320,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) {