新功能

conf/app.conf

@@ -124,7 +124,7 @@ redisdb = 0
 
 
 
-                niprocart =  63
+niprocart =  63
 jms = 58
 fistula_needle_set = 65
 fistula_needle_set_16 = 64

controllers/dialysis_api_controller.go

@@ -4373,9 +4373,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-	fmt.Println(dialysis_count)
 	patientInfo.TotalDialysis = dialysis_count
-	fmt.Println(patientInfo.TotalDialysis)
 
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2134,6 +2134,9 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 		operatorIDs = append(operatorIDs, dialysisPrescription.PrescriptionDoctor)
 	}
 
+	dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.Org.Id, patientInfo.ID, xttime)
+	patientInfo.TotalDialysis = dialysis_count
+
 	//临时医嘱
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/models"
 	p_service "XT_New/service"
 	"XT_New/utils"
+	"fmt"
 	"time"
 
 	"github.com/jinzhu/gorm"
@@ -47,6 +48,13 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 	if err != nil {
 		return nil, err
 	}
+	for _, item := range schedules {
+		dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
+		fmt.Println(dialysis_count)
+		item.Patient.TotalDialysis = dialysis_count
+		fmt.Println(item.Patient.TotalDialysis)
+
+	}
 	return schedules, nil
 }
 
@@ -173,3 +181,8 @@ func GetOrgInfoTemplate(orgID int64) (models.GobalTemplate, error) {
 	err = p_service.XTReadDB().Model(&models.GobalTemplate{}).Where("org_id=? and status=1", orgID).First(&templateInfo).Error
 	return templateInfo, err
 }
+
+func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	return
+}