Browse Source

医保对接

csx 3 years ago
parent
commit
9ed6c4bce5
1 changed files with 12 additions and 5 deletions
  1. 12 5
      service/mobile_dialysis_service.go

+ 12 - 5
service/mobile_dialysis_service.go View File

@@ -984,7 +984,9 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
984 984
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
985 985
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
986 986
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
987
-			Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
987
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
988
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
989
+			}).
988 990
 			Where("status = 1 AND user_org_id = ?", orgID)
989 991
 		if scheduleDate != 0 {
990 992
 			db = db.Where("schedule_date = ?", scheduleDate)
@@ -1003,7 +1005,9 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
1003 1005
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
1004 1006
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
1005 1007
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
1006
-			Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
1008
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
1009
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
1010
+			}).
1007 1011
 			Where("status = 1 AND user_org_id = ?", orgID)
1008 1012
 		if scheduleDate != 0 {
1009 1013
 			db = db.Where("schedule_date = ?", scheduleDate)
@@ -2202,8 +2206,9 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
2202 2206
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
2203 2207
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
2204 2208
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
2205
-			Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
2206
-			Where("status = 1 AND user_org_id = ?", orgID)
2209
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
2210
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
2211
+			}).Where("status = 1 AND user_org_id = ?", orgID)
2207 2212
 		if scheduleDate != 0 {
2208 2213
 			db = db.Where("schedule_date = ?", scheduleDate)
2209 2214
 		}
@@ -2221,7 +2226,9 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
2221 2226
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
2222 2227
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
2223 2228
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
2224
-			Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
2229
+			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
2230
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
2231
+			}).
2225 2232
 			Where("status = 1 AND user_org_id = ?", orgID)
2226 2233
 		if scheduleDate != 0 {
2227 2234
 			db = db.Where("schedule_date = ?", scheduleDate)