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

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)
@@ -4857,10 +4855,16 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 6 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+
+			if template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2747,9 +2747,14 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 || template.TemplateId == 20 { //adminUserInfo.Org.Id == 9538
+			if template.TemplateId == 6 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
+
+			if template.TemplateId == 20 { //adminUserInfo.Org.Id == 9538
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 )
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
@@ -5589,6 +5594,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	fristrecord, _ := service.FindFirstMonitorRecordToday(patientID, adminInfo.Org.Id, monitorDate)
 
 	template, _ := service.GetOrgInfoTemplate(adminInfo.Org.Id)
+	fmt.Println("1122233333")
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
@@ -5596,10 +5602,16 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 || template.TemplateId == 20 {
+			if template.TemplateId == 6 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+
+			if template.TemplateId == 20 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
@@ -5619,6 +5631,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
+			fmt.Println("11222344444444443333")
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}

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_models.go

@@ -322,6 +322,13 @@ type AssessmentAfterDislysisVM struct {
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
 	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
+	ReturnBlood                     int64   `gorm:"column:return_blood" json:"return_blood" form:"return_blood"`
+	RehydrationVolume               int64   `gorm:"column:rehydration_volume" json:"rehydration_volume" form:"rehydration_volume"`
+	DialysisDuring                  int64   `gorm:"column:dialysis_during" json:"dialysis_during" form:"dialysis_during"`
+	StrokeVolume                    int64   `gorm:"column:stroke_volume" json:"stroke_volume" form:"stroke_volume"`
+	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`
+	SealingFluidDispose             int64   `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
+	SealingFluidSpecial             string  `gorm:"column:sealing_fluid_special" json:"sealing_fluid_special" form:"sealing_fluid_special"`
 }
 
 func (AssessmentAfterDislysisVM) TableName() string {

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
+}