csx 3 år sedan
förälder
incheckning
e0d3511490

+ 14 - 1
controllers/his_api_controller.go Visa fil

3120
 	end_time := this.GetString("end_time")
3120
 	end_time := this.GetString("end_time")
3121
 	p_type, _ := this.GetInt64("p_type")
3121
 	p_type, _ := this.GetInt64("p_type")
3122
 
3122
 
3123
+	order_status, _ := this.GetInt64("type")
3124
+
3123
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
3125
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
3124
 	adminUserInfo := this.GetAdminUserInfo()
3126
 	adminUserInfo := this.GetAdminUserInfo()
3125
-	dayHisPrescription, err := service.GetMonthHisPrescriptionThree(adminUserInfo.CurrentOrgId, patient_id, startime.Unix(), endtime.Unix(), p_type)
3127
+
3128
+	var dayHisPrescription []*models.HisPrescription
3129
+	var err error
3130
+	if order_status == 1 || order_status == 0 {
3131
+
3132
+		dayHisPrescription, err = service.GetUnChargeMonthHisPrescriptionSix(adminUserInfo.CurrentOrgId, patient_id, startime.Unix(), endtime.Unix(), p_type)
3133
+
3134
+	} else if order_status == 2 {
3135
+		dayHisPrescription, err = service.GetChargeMonthHisPrescriptionSix(adminUserInfo.CurrentOrgId, patient_id, startime.Unix(), endtime.Unix(), p_type)
3136
+
3137
+	}
3138
+
3126
 	if err == nil {
3139
 	if err == nil {
3127
 		this.ServeSuccessJSON(map[string]interface{}{
3140
 		this.ServeSuccessJSON(map[string]interface{}{
3128
 			"day_prescription": dayHisPrescription,
3141
 			"day_prescription": dayHisPrescription,

+ 32 - 0
service/his_service.go Visa fil

1875
 	err = writeDb.Save(&good_info).Error
1875
 	err = writeDb.Save(&good_info).Error
1876
 	return
1876
 	return
1877
 }
1877
 }
1878
+
1879
+func GetUnChargeMonthHisPrescriptionSix(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
1880
+	err = readDb.Model(&models.HisPrescription{}).
1881
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
1882
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
1883
+		}).
1884
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
1885
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
1886
+		}).
1887
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
1888
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
1889
+		}).
1890
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND p_type = ? AND order_status <> 2 ", org_id, start_date, end_date, patient_id, p_type).
1891
+		Find(&prescription).Error
1892
+	return
1893
+}
1894
+
1895
+func GetChargeMonthHisPrescriptionSix(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
1896
+	err = readDb.Model(&models.HisPrescription{}).
1897
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
1898
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
1899
+		}).
1900
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
1901
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
1902
+		}).
1903
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
1904
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
1905
+		}).
1906
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND p_type = ? AND order_status == 2 ", org_id, start_date, end_date, patient_id, p_type).
1907
+		Find(&prescription).Error
1908
+	return
1909
+}

+ 12 - 13
service/mobile_dialysis_service.go Visa fil

730
 	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
730
 	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
731
 	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
731
 	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
732
 	Status                 int64                            `gorm:"column:status" json:"status"`
732
 	Status                 int64                            `gorm:"column:status" json:"status"`
733
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
733
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
734
 	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
734
 	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
735
 	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
735
 	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
736
 	DoctorAdvices          []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
736
 	DoctorAdvices          []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
871
 		Table("xt_schedule").
871
 		Table("xt_schedule").
872
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
872
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
873
 		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
873
 		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
874
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
874
+			return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
875
 		}).
875
 		}).
876
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
876
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
877
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
877
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
896
 				Table("xt_schedule").
896
 				Table("xt_schedule").
897
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
897
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
898
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
898
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
899
-					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
899
+					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
900
 				}).
900
 				}).
901
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
901
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
902
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
902
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
914
 				Table("xt_schedule").
914
 				Table("xt_schedule").
915
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
915
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
916
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
916
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
917
-					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
917
+					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
918
 				}).
918
 				}).
919
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
919
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
920
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
920
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
934
 				Table("xt_schedule").
934
 				Table("xt_schedule").
935
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
935
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
936
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
936
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
937
-					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
937
+					return db.Where("status = 1 AND user_org_id = ? and dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
938
 				}).
938
 				}).
939
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
939
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
940
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
940
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
947
 			}
947
 			}
948
 			err = db.Find(&vms).Error
948
 			err = db.Find(&vms).Error
949
 		}
949
 		}
950
-		fmt.Println("patin34te2222222222222222222", patientType)
951
 		if patientType > 0 {
950
 		if patientType > 0 {
952
 			db := readDb.
951
 			db := readDb.
953
 				Table("xt_schedule").
952
 				Table("xt_schedule").
954
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
953
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
955
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
954
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
956
-					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
955
+					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
957
 				}).
956
 				}).
958
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
957
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
959
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
958
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
979
 			Table("xt_schedule").
978
 			Table("xt_schedule").
980
 			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
979
 			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
981
 			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
980
 			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
982
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
981
+				return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
983
 			}).
982
 			}).
984
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
983
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
985
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
984
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
999
 			Table("xt_schedule").
998
 			Table("xt_schedule").
1000
 			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
999
 			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
1001
 			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
1000
 			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
1002
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
1001
+				return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
1003
 			}).
1002
 			}).
1004
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
1003
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
1005
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
1004
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
1834
 	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
1833
 	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
1835
 	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
1834
 	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
1836
 	Status                 int64                            `gorm:"column:status" json:"status"`
1835
 	Status                 int64                            `gorm:"column:status" json:"status"`
1837
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
1836
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKeyPatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
1838
 	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
1837
 	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
1839
 	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
1838
 	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
1840
 	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
1839
 	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
1856
 	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
1855
 	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
1857
 	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
1856
 	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
1858
 	Status                 int64                            `gorm:"column:status" json:"status"`
1857
 	Status                 int64                            `gorm:"column:status" json:"status"`
1859
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
1858
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
1860
 	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
1859
 	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
1861
 	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
1860
 	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
1862
 	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
1861
 	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
2090
 func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64) (order []*models.XtDialysisOrders, err error) {
2089
 func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64) (order []*models.XtDialysisOrders, err error) {
2091
 
2090
 
2092
 	db := XTReadDB().Table("xt_dialysis_order as x").Where("x.status = 1")
2091
 	db := XTReadDB().Table("xt_dialysis_order as x").Where("x.status = 1")
2093
-	table := XTReadDB().Table("xt_schedule as s")
2094
-	fmt.Println(table)
2092
+	//table := XTReadDB().Table("xt_schedule as s")
2093
+	//fmt.Println(table)
2095
 	if patientid > 0 {
2094
 	if patientid > 0 {
2096
 		db = db.Where("x.patient_id = ?", patientid)
2095
 		db = db.Where("x.patient_id = ?", patientid)
2097
 	}
2096
 	}

+ 1 - 1
service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go Visa fil

546
 	Summer                   *SummerVM                        `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
546
 	Summer                   *SummerVM                        `gorm:"ForeignKey:AssessmentDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"summer"`
547
 	LastAfterWeight          XtAssessmentAfterDislysisVM      `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
547
 	LastAfterWeight          XtAssessmentAfterDislysisVM      `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
548
 	HisAdvices               []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
548
 	HisAdvices               []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_advices"`
549
-	HisProject               []*models.HisPrescriptionProject `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_project"`
549
+	HisPrescriptionProject   []*models.HisPrescriptionProject `gorm:"ForeignKey:RecordDate,PatientID;AssociationForeignKey:ScheduleDate,PatientID" json:"his_project"`
550
 }
550
 }
551
 
551
 
552
 func (ScheduleVM) TableName() string {
552
 func (ScheduleVM) TableName() string {

+ 2 - 2
service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go Visa fil

47
 				Where("user_org_id = ? AND status = 1", orgID).
47
 				Where("user_org_id = ? AND status = 1", orgID).
48
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
48
 				Order("start_time asc, groupno desc, advice_order desc, id asc")
49
 		}).
49
 		}).
50
-		Preload("HisProject", func(db *gorm.DB) *gorm.DB {
51
-			return db.Where("user_org_id = ? AND status = 1", orgID).Preload("XtHisProject").Preload("GoodInfo", "status=1")
50
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
51
+			return db.Where("user_org_id = ? AND status = 1", orgID).Preload("HisProject").Preload("GoodInfo", "status=1")
52
 		}).
52
 		}).
53
 		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date desc").
53
 		Where("user_org_id = ? AND status = 1 AND id in (?)", orgID, schIDs).Order("schedule_date desc").
54
 		Find(&schedules).
54
 		Find(&schedules).