张保健 vor 4 Jahren
Ursprung
Commit
dca3ab1a42

+ 29 - 0
controllers/data_api_controller.go Datei anzeigen

@@ -38,6 +38,7 @@ func DataApiRegistRouters() {
38 38
 	beego.Router("/api/executionfrequency/create", &DataApiController{}, "Post:CreateExecutionFrequency")
39 39
 	beego.Router("/api/executionfrequency/update", &DataApiController{}, "Put:UpdateExecutionFrequency")
40 40
 	beego.Router("/api/executionfrequency/delete", &DataApiController{}, "Delete:DeleteExecutionFrequency")
41
+
41 42
 	beego.Router("/api/advicetemplate/create", &DataApiController{}, "Post:CreateAdviceTemplate")
42 43
 	beego.Router("/api/subadvice/create", &DataApiController{}, "Post:CreateSubAdviceTemplate")
43 44
 	beego.Router("/api/advicetemplate/update", &DataApiController{}, "Put:UpdateAdviceTemplate")
@@ -52,6 +53,14 @@ func DataApiRegistRouters() {
52 53
 
53 54
 	//beego.Router("/api/dictionary/getconfiglist", &DataApiController{}, "get,post:GetDictionaryConfigList")
54 55
 
56
+	beego.Router("/api/hisadvicetemplate/create", &DataApiController{}, "Post:CreateHisAdviceTemplate")
57
+	beego.Router("/api/hissubadvice/create", &DataApiController{}, "Post:CreateHisubAdviceTemplate")
58
+	beego.Router("/api/hisadvicetemplate/update", &DataApiController{}, "Put:UpdateHisAdviceTemplate")
59
+	beego.Router("/api/hisadvicetemplate/delete", &DataApiController{}, "Delete:DeleteHisAdviceTemplate")
60
+	//beego.Router("/api/hisadvicetemplate/add", &DataApiController{}, "Post:CreateSingleHisAdviceTemplate")
61
+	//beego.Router("/api/hisadviceparenttemplate/delete", &DataApiController{}, "Delete:DeleteHisParentAdviceTemplate")
62
+	//beego.Router("/api/histemplate/modify", &DataApiController{}, "Post:ModifyHisTemplateName")
63
+
55 64
 }
56 65
 
57 66
 //GetPatientsList 取配置信息列表
@@ -1428,3 +1437,23 @@ func (c *DataApiController) UpdateDataTwo() {
1428 1437
 		"configModel": configModel,
1429 1438
 	})
1430 1439
 }
1440
+
1441
+func (c *DataApiController) CreateHisAdviceTemplate() {
1442
+
1443
+}
1444
+
1445
+func (c *DataApiController) CreateSHisubAdviceTemplate() {
1446
+
1447
+}
1448
+
1449
+func (c *DataApiController) CreateHisubAdviceTemplate() {
1450
+
1451
+}
1452
+
1453
+func (c *DataApiController) UpdateHisAdviceTemplate() {
1454
+
1455
+}
1456
+
1457
+func (c *DataApiController) DeleteHisAdviceTemplate() {
1458
+
1459
+}

+ 1 - 0
controllers/mobile_api_controllers/dialysis_api_controller_extend.go Datei anzeigen

@@ -80,6 +80,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
80 80
 	replacementRate, _ := this.GetFloat("replacement_rate")
81 81
 	displacementQuantity, _ := this.GetFloat("displacement_quantity")
82 82
 	ktv, _ := this.GetFloat("ktv")
83
+	fmt.Println("ktv -------------------", ktv)
83 84
 	symptom := this.GetString("symptom")
84 85
 	dispose := this.GetString("dispose")
85 86
 	conductivity, _ := this.GetFloat("conductivity")

+ 2 - 0
controllers/new_mobile_api_controllers/new_dialysis_api_controller.go Datei anzeigen

@@ -841,6 +841,8 @@ func (this *NewDialysisApiController) GetlongDialysisrecord() {
841 841
 	adminInfo := this.GetMobileAdminUserInfo()
842 842
 	orgid := adminInfo.Org.Id
843 843
 	dialysisrecord, total, err := service.GetlongDialysisrecord(patient.BloodId, startime, endtime, limit, page, orgid)
844
+	//获取当日患者的透后实际超滤量
845
+	//afterRecord, err := service.GetDialysAfterRecord(patient.BloodId, startime, endtime, orgid)
844 846
 	if err != nil {
845 847
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
846 848
 		return

+ 3 - 3
models/his_models.go Datei anzeigen

@@ -294,9 +294,9 @@ type HisPrescription struct {
294 294
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
295 295
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
296 296
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
297
-	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
298
-	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
299
-	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"addition"`
297
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"advices"`
298
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"project"`
299
+	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"addition"`
300 300
 }
301 301
 
302 302
 func (HisPrescription) TableName() string {

+ 20 - 0
service/patientmanage_service.go Datei anzeigen

@@ -1445,3 +1445,23 @@ func AddPatientLapseto(lapseto *models.PatientLapseto) error {
1445 1445
 	err := XTWriteDB().Create(&lapseto).Error
1446 1446
 	return err
1447 1447
 }
1448
+
1449
+func GetDialysAfterRecord(patientid int64, startime int64, endtime int64, orgid int64) (dislysis []*models.XtAssessmentAfterDislysis, err error) {
1450
+
1451
+	db := XTReadDB().Model(&dislysis)
1452
+	if startime > 0 {
1453
+		db = db.Where("assessment_date >= ?", startime)
1454
+	}
1455
+	if endtime > 0 {
1456
+		db = db.Where("assessment_date <= ?", endtime)
1457
+	}
1458
+	if patientid > 0 {
1459
+		db = db.Where("patient_id = ?", patientid)
1460
+	}
1461
+	if orgid > 0 {
1462
+		db = db.Where("user_org_id = ?", orgid)
1463
+	}
1464
+	err = db.Find(dislysis).Error
1465
+
1466
+	return dislysis, err
1467
+}