更新

controllers/coordinate/coordinate_controller.go

@@ -3855,6 +3855,13 @@ func (c *CoordinateController) NMGSettleAccount() {
 								}
 								if subitem.HisProject.CostClassify == 3 {
 									var ie_cbm1 models.IEtwo
+									if subitem.TeamId > 0{
+										//ie_cbm1.BBX01 = subitem.HisProject.
+										team := service.GetBbx01ByTeamID(subitem.TeamId)
+										ie_cbm1.BBX01 = team.Bbx01
+									}else{
+										ie_cbm1.BBX01 = subitem.HisProject.ZuobiaoId
+									}
 									ie_cbm1.CBMID = strconv.FormatInt(int64(item.ID), 10)
 									ie_cbm1.VAF04 = strconv.FormatInt(int64(li.Acf01), 10)
 									ie_cbm1.VAA01 = strconv.FormatInt(int64(li.Vaa01), 10)
@@ -3864,7 +3871,6 @@ func (c *CoordinateController) NMGSettleAccount() {
 									ie_cbm1.VAF10 = "1"
 									ie_cbm1.VAF11 = "2"
 									ie_cbm1.BDA01 = "L" //诊疗类型
-									ie_cbm1.BBX01 = subitem.HisProject.ZuobiaoId
 									ie_cbm1.VAF14 =  subitem.HisProject.Vaf14                        //检验样本类型
 									ie_cbm1.VAF15 = ""                       //检验样本类型
 									ie_cbm1.BBY01 = subitem.HisProject.Bby01 //药品规格id或材料规格id
@@ -5443,6 +5449,8 @@ func (c *CoordinateController) NMGSettleAccount() {
 									ie_cbm1.VAF10 = "1"
 									ie_cbm1.VAF11 = "2"
 									ie_cbm1.BDA01 = "L" //诊疗类型
+
+
 									ie_cbm1.BBX01 = subitem.HisProject.ZuobiaoId
 									ie_cbm1.VAF14 = subitem.HisProject.Vaf14                       //检验样本类型
 									ie_cbm1.VAF15 = ""                       //检验样本类型

controllers/sg/his_api_controller.go

@@ -212,6 +212,10 @@ func (c *HisApiController) Get3508() {
 
 	var struct3508 models.Struct3508
 	struct3508.OrgName = miConfig.OrgName
+
+	struct3508.FixmedinsCode = miConfig.Code
+
+
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
 	struct3508.RequestUrl = miConfig.Url
@@ -265,6 +269,8 @@ func (c *HisApiController) Get3509() {
 
 	var struct3508 models.Struct3509
 	struct3508.OrgName = miConfig.OrgName
+	struct3508.FixmedinsCode = miConfig.Code
+
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
 	struct3508.RequestUrl = miConfig.Url
@@ -274,7 +280,7 @@ func (c *HisApiController) Get3509() {
 	struct3508.Enckey = miConfig.EncKey
 	struct3508.SignKey = miConfig.SignKey
 	struct3508.SecretKey = miConfig.SecretKey
-	struct3508.MedinsListCodg = drug.MedicalInsuranceNumber
+	struct3508.MedListCodg = drug.MedicalInsuranceNumber
 	struct3508.Begndate = start_time
 	struct3508.Enddate = end_time
 	result1, result2, _ := service.FJyb3509(struct3508)
@@ -316,6 +322,8 @@ func (c *HisApiController) Get3510() {
 	drug, _ := service.GetDrugByID(drug_id)
 
 	var struct3508 models.Struct3510
+	struct3508.FixmedinsCode = miConfig.Code
+
 	struct3508.OrgName = miConfig.OrgName
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
@@ -368,6 +376,8 @@ func (c *HisApiController) Get3511() {
 	drug, _ := service.GetDrugByID(drug_id)
 
 	var struct3508 models.Struct3511
+	struct3508.FixmedinsCode = miConfig.Code
+
 	struct3508.OrgName = miConfig.OrgName
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
@@ -420,6 +430,8 @@ func (c *HisApiController) Get3512() {
 	drug, _ := service.GetDrugByID(drug_id)
 
 	var struct3508 models.Struct3512
+	struct3508.FixmedinsCode = miConfig.Code
+
 	struct3508.OrgName = miConfig.OrgName
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
@@ -472,6 +484,8 @@ func (c *HisApiController) Get3513() {
 	drug, _ := service.GetDrugByID(drug_id)
 
 	var struct3508 models.Struct3513
+	struct3508.FixmedinsCode = miConfig.Code
+
 	struct3508.OrgName = miConfig.OrgName
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
@@ -523,6 +537,8 @@ func (c *HisApiController) Get35081() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	drug, _ := service.GetDrugByID(drug_id)
 	var struct3508 models.Struct35081
+	struct3508.FixmedinsCode = miConfig.Code
+
 	struct3508.OrgName = miConfig.OrgName
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
@@ -575,6 +591,8 @@ func (c *HisApiController) Get35082() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	drug, _ := service.GetDrugByID(drug_id)
 	var struct3508 models.Struct35082
+	struct3508.FixmedinsCode = miConfig.Code
+
 	struct3508.OrgName = miConfig.OrgName
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
@@ -633,6 +651,7 @@ func (c *HisApiController) FJ3501AND3502() {
 
 			number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3501"
 			var struct3501 models.Struct3501
+
 			struct3501.OrgName = miConfig.OrgName
 			struct3501.AccessKey = miConfig.AccessKey
 			struct3501.Opter = roles.UserName
@@ -1306,6 +1325,8 @@ func (c *HisApiController) ChangeDrug() {
 	for _, item := range flows {
 		var res3 ResultSix
 		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
+			number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3507"
+
 			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
 			if prescription.OrderStatus == 2 {
 				//已经结算
@@ -25382,7 +25403,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				bytesData, _ := json.Marshal(data)
-				req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2204", bytes.NewReader(bytesData))
+				req, _ := http.NewRequest("POST", "http://192.168.124.13:9532/"+"hbyb/2204", bytes.NewReader(bytesData))
 				resp, _ := client.Do(req)
 				defer resp.Body.Close()
 				body, ioErr := ioutil.ReadAll(resp.Body)

controllers/zh/zh_his_api_controller.go

@@ -1541,7 +1541,15 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 			result = string(result_byte)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 		} else {
-			result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 1, patient.Name,admin_user_id)
+
+			var insuplc_admdvs string
+			if len(patient.InsuplcAdmdvs) > 0 {
+				insuplc_admdvs = patient.InsuplcAdmdvs
+			} else {
+				insuplc_admdvs = miConfig.InsuplcAdmdvs
+			}
+
+			result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 1, patient.Name,admin_user_id)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 		}
 		//result := service.Gdyb1101A(id_card_no, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, patient.Name)

models/his_models.go

@@ -62,6 +62,7 @@ type XtHisProjectTeam struct {
 	CreatedTime int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	ProjectId   string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Bbx01	string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 }
 
 func (XtHisProjectTeam) TableName() string {

service/fj_service.go

@@ -3286,13 +3286,12 @@ func FJyb3508(struct3508 models.Struct3508) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3508"
 	inputData["fixmedins_code"] = struct3508.FixmedinsCode
-	inputData["medins_list_codg"] = struct3508.MedinsListCodg
+	inputData["medins_list_codg"] = struct3508.MedListCodg
 	inputData["fixmedins_bchno"] = ""
 	inputData["begndate"] = struct3508.Begndate
 	inputData["enddate"] = struct3508.Enddate
 
 	inputData["medins_prod_inv_no"] = ""
-	inputData["med_list_codg"] = ""
 	inputData["medins_list_name"] = ""
 	inputData["rx_flag"] = ""
 	inputData["list_sp_item_flag"] = ""
@@ -3339,12 +3338,13 @@ func FJyb3509(struct3509 models.Struct3509) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3509"
 	inputData["fixmedins_code"] = struct3509.FixmedinsCode
-	inputData["medins_list_codg"] = struct3509.MedinsListCodg
+	//inputData["med_list_codg"] = struct3509.MedinsListCodg
+	inputData["medins_list_codg"] = struct3509.MedListCodg
+
 	inputData["fixmedins_bchno"] = ""
 	inputData["begndate"] = struct3509.Begndate
 	inputData["enddate"] = struct3509.Enddate
 	inputData["medins_prod_inv_no"] = ""
-	inputData["med_list_codg"] = ""
 	inputData["medins_list_name"] = ""
 	inputData["rx_flag"] = ""
 	inputData["list_sp_item_flag"] = ""
@@ -3394,12 +3394,13 @@ func FJyb3510(struct3510 models.Struct3510) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3510"
 	inputData["fixmedins_code"] = struct3510.FixmedinsCode
-	inputData["medins_list_codg"] = struct3510.MedinsListCodg
+	//inputData["medins_list_codg"] = struct3510.MedinsListCodg
+	inputData["medins_list_codg"] = struct3510.MedListCodg
+
 	inputData["fixmedins_bchno"] = ""
 	inputData["begndate"] = struct3510.Begndate
 	inputData["enddate"] = struct3510.Enddate
 	inputData["medins_prod_inv_no"] = ""
-	inputData["med_list_codg"] = ""
 	inputData["medins_list_name"] = ""
 	inputData["rx_flag"] = ""
 	inputData["list_sp_item_flag"] = ""
@@ -3449,12 +3450,13 @@ func FJyb3511(struct3511 models.Struct3511) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3511"
 	inputData["fixmedins_code"] = struct3511.FixmedinsCode
-	inputData["medins_list_codg"] = struct3511.MedinsListCodg
+	//inputData["medins_list_codg"] = struct3511.MedinsListCodg
+	inputData["medins_list_codg"] = struct3511.MedListCodg
+
 	inputData["fixmedins_bchno"] = ""
 	inputData["begndate"] = struct3511.Begndate
 	inputData["enddate"] = struct3511.Enddate
 	inputData["medins_prod_inv_no"] = ""
-	inputData["med_list_codg"] = ""
 	inputData["medins_list_name"] = ""
 	inputData["rx_flag"] = ""
 	inputData["list_sp_item_flag"] = ""
@@ -3504,12 +3506,13 @@ func FJyb3512(struct3512 models.Struct3512) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3512"
 	inputData["fixmedins_code"] = struct3512.FixmedinsCode
-	inputData["medins_list_codg"] = struct3512.MedinsListCodg
+	//inputData["medins_list_codg"] = struct3512.MedinsListCodg
+	inputData["medins_list_codg"] = struct3512.MedListCodg
+
 	inputData["fixmedins_bchno"] = ""
 	inputData["begndate"] = struct3512.Begndate
 	inputData["enddate"] = struct3512.Enddate
 	inputData["medins_prod_inv_no"] = ""
-	inputData["med_list_codg"] = ""
 	inputData["medins_list_name"] = ""
 	inputData["rx_flag"] = ""
 	inputData["list_sp_item_flag"] = ""
@@ -3559,7 +3562,9 @@ func FJyb3513(struct3513 models.Struct3513) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3513"
 	inputData["fixmedins_code"] = struct3513.FixmedinsCode
-	inputData["medins_list_codg"] = struct3513.MedinsListCodg
+	//inputData["medins_list_codg"] = struct3513.MedinsListCodg
+	inputData["medins_list_codg"] = struct3513.MedListCodg
+
 	inputData["fixmedins_bchno"] = ""
 	inputData["begndate"] = struct3513.Begndate
 	inputData["enddate"] = struct3513.Enddate
@@ -3614,7 +3619,9 @@ func FJyb35081(struct35081 models.Struct35081) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "35081"
 	inputData["fixmedins_code"] = struct35081.FixmedinsCode
-	inputData["med_list_codg"] = struct35081.MedinsListCodg
+	//inputData["med_list_codg"] = struct35081.MedinsListCodg
+	inputData["medins_list_codg"] = struct35081.MedListCodg
+
 	inputData["fixmedins_bchno"] = ""
 	inputData["page_num"] = struct35081.PageNum
 	inputData["page_size "] = struct35081.PageSize
@@ -3645,7 +3652,9 @@ func FJyb35082(struct35082 models.Struct35082) (string, string, string) {
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3509"
 	inputData["fixmedins_code"] = struct35082.FixmedinsCode
-	inputData["med_list_codg"] = struct35082.MedinsListCodg
+	//inputData["med_list_codg"] = struct35082.MedinsListCodg
+	inputData["medins_list_codg"] = struct35082.MedListCodg
+
 	inputData["fixmedins_bchno"] = ""
 	inputData["page_num"] = struct35082.PageNum
 	inputData["page_size "] = struct35082.PageSize

service/his_service.go

@@ -1748,3 +1748,9 @@ func GetDrugByID(drug_id int64) (drug models.BaseDrugLib, err error) {
 	err = readDb.Model(&models.BaseDrugLib{}).Where("id = ?", drug_id).First(&drug).Error
 	return
 }
+
+
+func GetBbx01ByTeamID(team_id int64)(team models.XtHisProjectTeam){
+	err = readDb.Model(&models.XtHisProjectTeam{}).Where("id = ?", team_id).First(&team).Error
+	return
+}

service/jx_service.go

@@ -546,8 +546,8 @@ func Jxyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["bilg_dr_name"] = item.DoctorName              // 开单医师姓名
 		feedetailInfo["acord_dept_codg"] = ""                        // 受单科室编码
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
-		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
-		feedetailInfo["orders_dr_name"] = ""                         // 受单医生姓名
+		feedetailInfo["orders_dr_code"] = item.DoctorNumber                         // 受单医生编码
+		feedetailInfo["orders_dr_name"] = item.DoctorName                         // 受单医生姓名
 		if balance_accounts_type == "8" {
 			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
 		} else {