提交代码

controllers/his_api_controller.go

@@ -205,16 +205,35 @@ func (c *HisApiController) GetMonthHisPatient() {
 	var patients []service.NewTempPatients
 	var patients_two []service.NewTempPatients
 
-	for _, item := range tempPatients {
-		//过滤掉没挂号的和没开处方的
-		if len(item.HisPatient) > 0 && len(item.HisPrescription) > 0 {
-			patients = append(patients, item)
+	if c.GetAdminUserInfo().CurrentOrgId == 10206 {
+
+		for _, item := range tempPatients {
+			//过滤掉没挂号的和没开处方的
+			if len(item.HisPrescription) > 0 {
+				patients = append(patients, item)
+				patients_two = append(patients_two, item)
+
+			}
+			////过滤掉没挂号的
+			//if len(item.HisPatient) > 0 {
+			//}
+		}
+
+	} else {
+
+		for _, item := range tempPatients {
+			//过滤掉没挂号的和没开处方的
+			if len(item.HisPatient) > 0 && len(item.HisPrescription) > 0 {
+				patients = append(patients, item)
+			}
+			////过滤掉没挂号的
+			//if len(item.HisPatient) > 0 {
+			//	patients_two = append(patients_two, item)
+			//}
 		}
-		////过滤掉没挂号的
-		//if len(item.HisPatient) > 0 {
-		//	patients_two = append(patients_two, item)
-		//}
+
 	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":           patients,
 		"list_two":       patients_two,
@@ -7863,24 +7882,41 @@ func (c *HisApiController) GetHisChargePatientList() {
 	adminInfo := c.GetAdminUserInfo()
 	var tempPatients []*service.NewTempPatients
 	//tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	if order_status != 2 {
-		tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
+	if c.GetAdminUserInfo().CurrentOrgId == 10206 { //针对用了坐标系统的机构
+		if order_status != 2 {
+			tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
+		} else {
+			tempPatients, _ = service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
+		}
+
 	} else {
-		tempPatients, _ = service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
+
+		if order_status != 2 {
+			tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
+		} else {
+			tempPatients, _ = service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
+		}
+
 	}
 
 	var patients []*service.NewTempPatients
 	var patients_two []*service.NewTempPatients
 
 	for _, item := range tempPatients {
-		//过滤掉没挂号的和没开处方的
-		if len(item.HisPatient) > 0 || len(item.HisPrescription) > 0 {
-			patients = append(patients, item)
-		}
+		if c.GetAdminUserInfo().CurrentOrgId != 10206 {
+			//过滤掉没挂号的和没开处方的
+			if len(item.HisPatient) > 0 || len(item.HisPrescription) > 0 {
+				patients = append(patients, item)
+			}
+			//过滤掉没挂号的
+			if len(item.HisPatient) > 0 {
+				patients_two = append(patients_two, item)
+			}
 
-		//过滤掉没挂号的
-		if len(item.HisPatient) > 0 {
-			patients_two = append(patients_two, item)
+		} else {
+			if len(item.HisPrescription) > 0 {
+				patients = append(patients, item)
+			}
 		}
 	}
 	c.ServeSuccessJSON(map[string]interface{}{

service/his_service.go

@@ -2868,3 +2868,26 @@ func GetLastHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Select("max(convert(fa_piao_number,signed)) as fa_piao_number").Where("user_org_id = ? AND status = 1 AND order_status = 2 ", org_id).Find(&his).Error
 	return
 }
+
+//func GetZuoBiaoNewAllUnChargeHisPatientList(org_id int64, record_date int64) (patients []*NewTempPatients, err error) {
+//	db := readDb.Model(&NewTempPatients{})
+//
+//	db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+//	db = db.Preload("Schedule", "status = 1")
+//	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
+//		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date)
+//	})
+//	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status <> 2 AND order_status <> 3", org_id, record_date)
+//	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND prescription_status <> 3", org_id, record_date).Find(&patients).Error
+//
+//	for _, item := range patients {
+//		for _, sumItem := range item.HisPatient {
+//			if len(sumItem.VMHisOrders) > 0 {
+//				sumItem.VMHisOrder.OrderStatus = sumItem.VMHisOrders[len(sumItem.VMHisOrders)-1].OrderStatus
+//			}
+//		}
+//
+//	}
+//
+//	return
+//}