Преглед изворни кода

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx пре 2 година
родитељ
комит
968aa9caf4
2 измењених фајлова са 12 додато и 11 уклоњено
  1. 6 6
      main.go
  2. 6 5
      service/jsyb_service.go

+ 6 - 6
main.go Прегледај датотеку

@@ -15,12 +15,12 @@ import (
15 15
 )
16 16
 
17 17
 func init() {
18
-	service.ConnectDB()
19
-	org_id, _ := beego.AppConfig.Int64("org_id")
20
-
21
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
22
-	CreateLog(miConfig)
23
-	UploadLog(miConfig)
18
+	//service.ConnectDB()
19
+	//org_id, _ := beego.AppConfig.Int64("org_id")
20
+	//
21
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
22
+	//CreateLog(miConfig)
23
+	//UploadLog(miConfig)
24 24
 
25 25
 	//UploadSettleList(org_id)
26 26
 }

+ 6 - 5
service/jsyb_service.go Прегледај датотеку

@@ -1419,11 +1419,11 @@ func Jsyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models
1419 1419
 		fsiOrderDtosData["hilist_type"] = fod.HilistType
1420 1420
 		fsiOrderDtosData["chrg_type"] = fod.ChrgType
1421 1421
 		fsiOrderDtosData["drord_bhvr"] = fod.DrordBhvr
1422
-		fsiOrderDtosData["hilist_code"] = fod.DrordBhvr
1423
-		fsiOrderDtosData["hilist_name"] = fod.DrordBhvr
1424
-		fsiOrderDtosData["hilist_dosform"] = fod.DrordBhvr
1425
-		fsiOrderDtosData["hilist_lv"] = fod.DrordBhvr
1426
-		fsiOrderDtosData["hilist_pric"] = fod.DrordBhvr
1422
+		fsiOrderDtosData["hilist_code"] = fod.HilistCode
1423
+		fsiOrderDtosData["hilist_name"] = fod.HilistName
1424
+		fsiOrderDtosData["hilist_dosform"] = fod.HilistDosform
1425
+		fsiOrderDtosData["hilist_lv"] = fod.HilistLv
1426
+		fsiOrderDtosData["hilist_pric"] = fod.HilistPric
1427 1427
 		fsiOrderDtosData["lv1_hosp_item_pric"] = fod.Lv1HospItemPric
1428 1428
 		fsiOrderDtosData["lv2_hosp_item_pric"] = fod.Lv2HospItemPric
1429 1429
 		fsiOrderDtosData["lv3_hosp_item_pric"] = fod.Lv3HospItemPric
@@ -1448,6 +1448,7 @@ func Jsyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models
1448 1448
 		fsiOrderDtosData["curr_drord_flag"] = fod.CurrDrordFlag
1449 1449
 		fsiOrderDtosDatas = append(fsiOrderDtosDatas, fsiOrderDtosData)
1450 1450
 	}
1451
+
1451 1452
 	fisEncounterDtosData["fsi_order_dtos"] = fsiOrderDtosDatas
1452 1453
 
1453 1454
 	fisEncounterDtosData["matn_stas"] = fed.MatnStas