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

controllers/dialysis_api_controller.go

@@ -56,6 +56,8 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/func_per/get", &DialysisApiController{}, "Get:GetFuncPurview")
 
+	beego.Router("/api/doctoradvice/get", &DialysisApiController{}, "Get:GetLastOrNextDoctorAdvice")
+
 }
 
 func (c *DialysisApiController) PostPrescription() {
@@ -5108,3 +5110,31 @@ func (this *DialysisApiController) GetFuncPurview() {
 		})
 	}
 }
+
+func (this *DialysisApiController) GetLastOrNextDoctorAdvice() {
+	change_type, _ := this.GetInt64("type", 0)
+	record_date := this.GetString("record_time")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
+	record_time := theAdviceRecordTime.Unix()
+	adminUserInfo := this.GetAdminUserInfo()
+	advices, sch, err := service.GetDoctorAdviceByType(change_type, record_time, adminUserInfo.CurrentOrgId, patient_id)
+	if err == nil {
+		if len(advices) == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
+			return
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"advices":  advices,
+				"schedule": sch,
+			})
+			return
+		}
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -334,6 +334,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 {
 		dewater_amount = dewater_amount * 1000
+
+		if dewater_amount < 0 {
+			dewater_amount = 0
+		}
 	}
 
 	if dialysistype == 1 {
@@ -550,17 +554,17 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 		}
 
-		if dialysisPrescribe != nil {
-			dialysisPrescribe.UpdatedTime = time.Now().Unix()
-			dialysisPrescribe.RecordDate = theAssessmentDateTime
-			dialysisPrescribe.DewaterAmount = dewater_amount
-			dialysisPrescribe.TargetUltrafiltration = dewater_amount
-			dialysisPrescribe.Status = 1
-			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-			if updateErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
-		}
+		//if dialysisPrescribe != nil {
+		//	dialysisPrescribe.UpdatedTime = time.Now().Unix()
+		//	dialysisPrescribe.RecordDate = theAssessmentDateTime
+		//	dialysisPrescribe.DewaterAmount = dewater_amount
+		//	dialysisPrescribe.TargetUltrafiltration = dewater_amount
+		//	dialysisPrescribe.Status = 1
+		//	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+		//	if updateErr != nil {
+		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+		//	}
+		//}
 
 		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2857,7 +2857,6 @@ func (this *DialysisAPIController) StartDialysis() {
 				} else {
 
 					if prescription.Niprocart > 0 {
-
 						warehouseOutInfo := &models.WarehouseOutInfo{
 							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 							WarehouseOutId:          warehouseOut.ID,

enums/error_code.go

@@ -200,6 +200,8 @@ const ( // ErrorCode
 	ErrorCodeExportError = 20050
 
 	ErrorCodeOrgNoPatient = 20051
+
+	ErrorCodeDoctorAdviceEmpty = 20052
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -397,6 +399,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeExportError: "导入出错,请下载并查看相关日志",
 
 	ErrorCodeOrgNoPatient: "暂无病人",
+
+	ErrorCodeDoctorAdviceEmpty: "没有更多了",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -289,6 +289,7 @@ type PredialysisEvaluationList struct {
 	CreatedTime            int64   `gorm:"column:created_time" json:"created_time"`
 	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	DryWeight              float64 `gorm:"column:dry_weight" json:"dry_weight"`
 }
 
 func (PredialysisEvaluationList) TableName() string {

service/doctor_advice_service.go

@@ -270,3 +270,76 @@ func UpdateDataTwo(id int64, model models.ConfigViewModel) error {
 	err := writeDb.Model(&model).Where("id=?", id).Update(map[string]interface{}{"name": model.Name, "orders": model.Order, "remark": model.Remark, "update_time": time.Now().Unix()}).Error
 	return err
 }
+
+type AdviceDate struct {
+	RecordDate int64
+}
+
+type DoctorAdvice struct {
+	ID                    int64           `gorm:"column:id" json:"id" form:"id"`
+	GroupNo               int64           `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	UserOrgId             int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceType            int64           `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64           `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string          `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string          `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64           `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64         `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string          `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	DrugSpec              float64         `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string          `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescribingNumber     float64         `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string          `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string          `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string          `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64           `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64           `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64           `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64           `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string          `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string          `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64           `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string          `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64           `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64           `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64           `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64           `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64           `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64           `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64           `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64           `gorm:"column:record_date" json:"record_date"`
+	DialysisOrderId       int64           `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	CheckTime             int64           `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64           `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	AdviceId              int64           `gorm:"-"`
+	RemindType            int64           `gorm:"column:remind_type" json:"remind_type"`
+	FrequencyType         int64           `gorm:"column:frequency_type" json:"frequency_type"`
+	DayCount              int64           `gorm:"column:day_count" json:"day_count"`
+	WeekDay               string          `gorm:"column:week_day" json:"week_day"`
+	DoctorAdvice          []*DoctorAdvice `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"children"`
+	TemplateId            string          `gorm:"column:template_id" json:"template_id"`
+	Modifier              int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsCheck               int64           `gorm:"-" json:"is_check" form:"is_check"`
+}
+
+func (DoctorAdvice) TableName() string {
+	return "xt_doctor_advice"
+}
+
+func GetDoctorAdviceByType(change_type int64, record_time int64, org_id int64, patient_id int64) (advice []*DoctorAdvice, sch models.Schedule, err error) {
+	if change_type == 1 { //根据日期取出上一方数据
+		var Id AdviceDate
+		err = readDb.Model(&DoctorAdvice{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
+		err = readDb.Model(&models.Schedule{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND schedule_date  = ?", patient_id, org_id, Id.RecordDate).Find(&sch).Error
+		err = readDb.Model(&DoctorAdvice{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ? AND parent_id= 0", patient_id, org_id, Id.RecordDate).Preload("DoctorAdvice", "status = 1 AND user_org_id = ? AND patient_id = ?", org_id, patient_id).Find(&advice).Error
+
+	} else if change_type == 2 {
+		var Id AdviceDate
+		err = readDb.Model(&DoctorAdvice{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date > ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date desc").Scan(&Id).Error
+		err = readDb.Model(&models.Schedule{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND schedule_date  = ?", patient_id, org_id, Id.RecordDate).Find(&sch).Error
+		err = readDb.Model(&DoctorAdvice{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ? AND parent_id= 0", patient_id, org_id, Id.RecordDate).Preload("DoctorAdvice", "status = 1 AND user_org_id = ? AND patient_id = ?", org_id, patient_id).Find(&advice).Error
+	}
+	return
+}

service/mobile_dialysis_service.go

@@ -36,6 +36,8 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentSummary", "status = 1  AND user_org_id = ?", orgID).
+		Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ?", orgID).
+
 		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
 		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
 		// }).
@@ -86,6 +88,19 @@ func (VMTreatmentSummary) TableName() string {
 	return "xt_treatment_summary"
 }
 
+type AssessmentAfterDislysis struct {
+	ID             int64   `gorm:"column:id" json:"id"`
+	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId      int64   `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightAfter    float64 `gorm:"column:weight_after" json:"weight_after"`
+	Status         int64   `gorm:"column:status" json:"status"`
+}
+
+func (AssessmentAfterDislysis) TableName() string {
+	return "xt_assessment_after_dislysis"
+}
+
 type MDialysisScheduleVM struct {
 	ID           int64 `gorm:"column:id" json:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
@@ -103,8 +118,10 @@ type MDialysisScheduleVM struct {
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
-	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
-	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
+	AssessmentAfterDislysis  *AssessmentAfterDislysis          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_after_dislysis"`
+
+	Advices          []*VMDoctorAdvice   `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
+	TreatmentSummary *VMTreatmentSummary `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {