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

main.go

@@ -15,12 +15,12 @@ import (
 )
 
 func init() {
-	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
+	//service.ConnectDB()
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }

service/jsyb_service.go

@@ -1419,11 +1419,11 @@ func Jsyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models
 		fsiOrderDtosData["hilist_type"] = fod.HilistType
 		fsiOrderDtosData["chrg_type"] = fod.ChrgType
 		fsiOrderDtosData["drord_bhvr"] = fod.DrordBhvr
-		fsiOrderDtosData["hilist_code"] = fod.DrordBhvr
-		fsiOrderDtosData["hilist_name"] = fod.DrordBhvr
-		fsiOrderDtosData["hilist_dosform"] = fod.DrordBhvr
-		fsiOrderDtosData["hilist_lv"] = fod.DrordBhvr
-		fsiOrderDtosData["hilist_pric"] = fod.DrordBhvr
+		fsiOrderDtosData["hilist_code"] = fod.HilistCode
+		fsiOrderDtosData["hilist_name"] = fod.HilistName
+		fsiOrderDtosData["hilist_dosform"] = fod.HilistDosform
+		fsiOrderDtosData["hilist_lv"] = fod.HilistLv
+		fsiOrderDtosData["hilist_pric"] = fod.HilistPric
 		fsiOrderDtosData["lv1_hosp_item_pric"] = fod.Lv1HospItemPric
 		fsiOrderDtosData["lv2_hosp_item_pric"] = fod.Lv2HospItemPric
 		fsiOrderDtosData["lv3_hosp_item_pric"] = fod.Lv3HospItemPric
@@ -1448,6 +1448,7 @@ func Jsyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models
 		fsiOrderDtosData["curr_drord_flag"] = fod.CurrDrordFlag
 		fsiOrderDtosDatas = append(fsiOrderDtosDatas, fsiOrderDtosData)
 	}
+
 	fisEncounterDtosData["fsi_order_dtos"] = fsiOrderDtosDatas
 
 	fisEncounterDtosData["matn_stas"] = fed.MatnStas