更新

controllers/js/jsyb_controller.go

@@ -661,6 +661,7 @@ func (c *JSybController) PostSeven() {
 	certificates, _ := c.GetInt64("certificates")
 	verify_number := c.GetString("verify_number")
 	cainfo := c.GetString("cainfo")
+	mdtrt_grp_type := c.GetString("mdtrt_grp_type")
 
 	url := c.GetString("url")
 	ak := c.GetString("ak")
@@ -668,7 +669,7 @@ func (c *JSybController) PostSeven() {
 	var result string
 	var request_log string
 
-	result, request_log = service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak, verify_number, cainfo)
+	result, request_log = service.Jsyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates, url, ak, verify_number, cainfo, mdtrt_grp_type)
 
 	saveJsLog(result, request_log, "2206", "预结算", org_name)
 	var dat map[string]interface{}
@@ -717,6 +718,7 @@ func (c *JSybController) PostEight() {
 	ak := c.GetString("ak")
 	verify_number := c.GetString("verify_number")
 	cainfo := c.GetString("cainfo")
+	mdtrt_grp_type := c.GetString("mdtrt_grp_type")
 
 	var result string
 	var request_log string
@@ -730,10 +732,10 @@ func (c *JSybController) PostEight() {
 		//}
 		//token := ele.Data.EcCardToken
 		//if len(token) > 0 {
-		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
+		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo, mdtrt_grp_type)
 		//}
 	} else {
-		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo)
+		result, request_log = service.Jsyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, certificates, acct_used_flag, url, ak, verify_number, cainfo, mdtrt_grp_type)
 
 	}
 
@@ -1187,10 +1189,10 @@ func (c *JSybController) GetELeCertInfo(code string, operator_id string, operato
 	inputData := make(map[string]interface{})
 	inputData["orgId"] = code
 	inputData["businessType"] = "01101"
-	inputData["operatorId"] = "1"
-	inputData["operatorName"] = "admin"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
 	inputData["officeId"] = "001"
-	inputData["officeName"] = "admin"
+	inputData["officeName"] = "xuetou"
 	data["data"] = inputData
 	data["transType"] = "ec.query"
 	data["orgId"] = code

controllers/sg/his_api_controller.go

@@ -111,9 +111,7 @@ func (c *HisApiController) Get2505() {
 
 func (c *HisApiController) Get4201A() {
 	order_id, _ := c.GetInt64("order_id")
-	order_id = 172977
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-	admin_user_id = 3432
 	order, _ := service.GetHisOrderByIDTwo(order_id)
 	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	order_info, _ := service.GetHisOrderInfoByNumber(order.MdtrtId)
@@ -137,19 +135,20 @@ func (c *HisApiController) Get4201A() {
 		var fsiOPFLD models.FsiOwnpayPatnFeeListDDTO
 		fsiOPFLD.FixmedinsMdtrtID = items.OrderNumber
 		fsiOPFLD.MedType = "14"
-		fsiOPFLD.BkkpSn = items.OrderNumber
+		fsiOPFLD.BkkpSn = items.FeedetlSn
 		fsiOPFLD.FixmedinsCode = miConfig.Code
 		fsiOPFLD.FixmedinsName = miConfig.OrgName
 		fsiOPFLD.Cnt = fmt.Sprintf("%.2f", items.Cnt)
 		fsiOPFLD.Pric = fmt.Sprintf("%.2f", items.Pric)
 		fsiOPFLD.DetItemFeeSumamt = fmt.Sprintf("%.2f", items.DetItemFeeSumamt)
 
-		if items.AdviceId > 0 && items.ProjectId == 0 {
+		if items.AdviceId > 0 && items.ProjectId == 0 && items.HisDoctorAdviceInfo.BaseDrugLib.IsUser != 1 && len(items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber) > 0 {
 			fsiOPFLD.FeeOcurTime = time.Unix(items.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
 			fsiOPFLD.MedListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 
 			fsiOPFLD.MedinsListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 			fsiOPFLD.MedinsListName = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
+
 			fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.BaseDrugLib.DrugName
 			fsiOPFLD.BilgDeptName = department.Name
 			fsiOPFLD.BilgDeptCodg = department.Number
@@ -157,19 +156,24 @@ func (c *HisApiController) Get4201A() {
 			fsiOPFLD.BilgDrName = doctor.UserName
 			fsiOPFLD.MedChrgitmType = "09"
 
-		} else if items.AdviceId == 0 && items.ProjectId > 0 {
-			fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
-			fsiOPFLD.MedListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
+			memo["hosp_appr_flag"] = "1"
+			memo["invoice_no"] = order.MdtrtId
+			memo["memo"] = "自费"
+			bytesData, _ := json.Marshal(memo)
+			fsiOPFLD.Memo = string(bytesData)
+			fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
 
-			fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
-			fsiOPFLD.BilgDeptName = department.Name
-			fsiOPFLD.BilgDeptCodg = department.Number
-			fsiOPFLD.BilgDrCode = doctor.DoctorNumber
-			fsiOPFLD.BilgDrName = doctor.UserName
-			if items.HisPrescriptionProject.Type == 2 {
+		} else if items.AdviceId == 0 && items.ProjectId > 0 {
+			if items.HisPrescriptionProject.Type == 2 && len(items.HisPrescriptionProject.HisProject.MedicalCode) > 0 {
+				fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
+				fsiOPFLD.MedListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
+				fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
 				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.HisProject.ProjectName
 				fsiOPFLD.Prodname = items.HisPrescriptionProject.HisProject.ProjectName
-
+				fsiOPFLD.BilgDeptName = department.Name
+				fsiOPFLD.BilgDeptCodg = department.Number
+				fsiOPFLD.BilgDrCode = doctor.DoctorNumber
+				fsiOPFLD.BilgDrName = doctor.UserName
 				switch items.HisPrescriptionProject.HisProject.CostClassify {
 				case 0:
 
@@ -227,38 +231,46 @@ func (c *HisApiController) Get4201A() {
 					break
 
 				}
-			} else if items.HisPrescriptionProject.Type == 3 {
+				memo["hosp_appr_flag"] = "1"
+				memo["invoice_no"] = order.MdtrtId
+				memo["memo"] = "自费"
+				bytesData, _ := json.Marshal(memo)
+				fsiOPFLD.Memo = string(bytesData)
+				fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
+			} else if items.HisPrescriptionProject.Type == 3 && items.HisPrescriptionProject.GoodInfo.IsUser != 1 && len(items.HisPrescriptionProject.GoodInfo.MedicalInsuranceNumber) > 0 {
+				fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
+				fsiOPFLD.MedListCodg = items.HisPrescriptionProject.GoodInfo.MedicalInsuranceNumber
+				fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.GoodInfo.MedicalInsuranceNumber
+				fsiOPFLD.BilgDeptName = department.Name
+				fsiOPFLD.BilgDeptCodg = department.Number
+				fsiOPFLD.BilgDrCode = doctor.DoctorNumber
+				fsiOPFLD.BilgDrName = doctor.UserName
 				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.GoodInfo.GoodName
 				fsiOPFLD.Prodname = items.HisPrescriptionProject.GoodInfo.GoodName
-
 				fsiOPFLD.MedChrgitmType = "08"
+				memo["hosp_appr_flag"] = "1"
+				memo["invoice_no"] = order.MdtrtId
+				memo["memo"] = "自费"
+				bytesData, _ := json.Marshal(memo)
+				fsiOPFLD.Memo = string(bytesData)
+				fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
 			}
 		}
 
-		fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.AdviceName
-		fsiOPFLD.BilgDeptCodg = department.Number
-		fsiOPFLD.BilgDeptName = department.Name
-		memo["hosp_appr_flag"] = "1"
-		memo["invoice_no"] = order.MdtrtId
-		memo["memo"] = "自费"
-		bytesData, _ := json.Marshal(memo)
-		fsiOPFLD.Memo = string(bytesData)
-
-		fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
 	}
 	for _, items := range order_info_two {
 		memo := make(map[string]interface{})
 		var fsiOPFLD models.FsiOwnpayPatnFeeListDDTO
 		fsiOPFLD.FixmedinsMdtrtID = items.OrderNumber
 		fsiOPFLD.MedType = "14"
-		fsiOPFLD.BkkpSn = items.OrderNumber
+		fsiOPFLD.BkkpSn = items.FeedetlSn
 		fsiOPFLD.FixmedinsCode = miConfig.Code
 		fsiOPFLD.FixmedinsName = miConfig.OrgName
 		fsiOPFLD.Cnt = fmt.Sprintf("%.2f", items.Cnt)
 		fsiOPFLD.Pric = fmt.Sprintf("%.2f", items.Pric)
 		fsiOPFLD.DetItemFeeSumamt = fmt.Sprintf("%.2f", items.DetItemFeeSumamt)
 
-		if items.AdviceId > 0 && items.ProjectId == 0 {
+		if items.AdviceId > 0 && items.ProjectId == 0 && items.HisDoctorAdviceInfo.BaseDrugLib.IsUser != 1 && len(items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber) > 0 {
 			fsiOPFLD.FeeOcurTime = time.Unix(items.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
 			fsiOPFLD.MedListCodg = items.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 
@@ -271,19 +283,27 @@ func (c *HisApiController) Get4201A() {
 			fsiOPFLD.BilgDrName = doctor.UserName
 			fsiOPFLD.MedChrgitmType = "09"
 
+			memo["hosp_appr_flag"] = "1"
+			memo["invoice_no"] = order.MdtrtId
+			memo["memo"] = "自费"
+			bytesData, _ := json.Marshal(memo)
+			fsiOPFLD.Memo = string(bytesData)
+			fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
+
 		} else if items.AdviceId == 0 && items.ProjectId > 0 {
-			fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
-			fsiOPFLD.MedListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
 
-			fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
-			fsiOPFLD.BilgDeptName = department.Name
-			fsiOPFLD.BilgDeptCodg = department.Number
-			fsiOPFLD.BilgDrCode = doctor.DoctorNumber
-			fsiOPFLD.BilgDrName = doctor.UserName
-			if items.HisPrescriptionProject.Type == 2 {
+			if items.HisPrescriptionProject.Type == 2 && len(items.HisPrescriptionProject.HisProject.MedicalCode) > 0 {
+				fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
+				fsiOPFLD.MedListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
 				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.HisProject.ProjectName
 				fsiOPFLD.Prodname = items.HisPrescriptionProject.HisProject.ProjectName
 
+				fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.HisProject.MedicalCode
+				fsiOPFLD.BilgDeptName = department.Name
+				fsiOPFLD.BilgDeptCodg = department.Number
+				fsiOPFLD.BilgDrCode = doctor.DoctorNumber
+				fsiOPFLD.BilgDrName = doctor.UserName
+
 				switch items.HisPrescriptionProject.HisProject.CostClassify {
 				case 0:
 
@@ -341,24 +361,33 @@ func (c *HisApiController) Get4201A() {
 					break
 
 				}
-			} else if items.HisPrescriptionProject.Type == 3 {
+				memo["hosp_appr_flag"] = "1"
+				memo["invoice_no"] = order.MdtrtId
+				memo["memo"] = "自费"
+				bytesData, _ := json.Marshal(memo)
+				fsiOPFLD.Memo = string(bytesData)
+				fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
+			} else if items.HisPrescriptionProject.Type == 3 && len(items.HisPrescriptionProject.GoodInfo.MedicalInsuranceNumber) > 0 && items.HisPrescriptionProject.GoodInfo.IsUser != 1 {
+				fsiOPFLD.FeeOcurTime = time.Unix(items.HisPrescriptionProject.Ctime, 0).Format("2006-01-02 15:04:05")
+				fsiOPFLD.MedListCodg = items.HisPrescriptionProject.GoodInfo.MedicalInsuranceNumber
+				fsiOPFLD.MedinsListCodg = items.HisPrescriptionProject.GoodInfo.MedicalInsuranceNumber
+				fsiOPFLD.BilgDeptName = department.Name
+				fsiOPFLD.BilgDeptCodg = department.Number
+				fsiOPFLD.BilgDrCode = doctor.DoctorNumber
+				fsiOPFLD.BilgDrName = doctor.UserName
 				fsiOPFLD.MedinsListName = items.HisPrescriptionProject.GoodInfo.GoodName
 				fsiOPFLD.Prodname = items.HisPrescriptionProject.GoodInfo.GoodName
 
 				fsiOPFLD.MedChrgitmType = "08"
+				memo["hosp_appr_flag"] = "1"
+				memo["invoice_no"] = order.MdtrtId
+				memo["memo"] = "自费"
+				bytesData, _ := json.Marshal(memo)
+				fsiOPFLD.Memo = string(bytesData)
+				fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
 			}
 		}
 
-		fsiOPFLD.Prodname = items.HisDoctorAdviceInfo.AdviceName
-		fsiOPFLD.BilgDeptCodg = department.Number
-		fsiOPFLD.BilgDeptName = department.Name
-		memo["hosp_appr_flag"] = "1"
-		memo["invoice_no"] = order.MdtrtId
-		memo["memo"] = "自费"
-		bytesData, _ := json.Marshal(memo)
-		fsiOPFLD.Memo = string(bytesData)
-
-		fsiOPFLDs = append(fsiOPFLDs, fsiOPFLD)
 	}
 
 	fmt.Println(fsiOPFLDs)
@@ -396,11 +425,7 @@ func (c *HisApiController) Get4201A() {
 }
 func (c *HisApiController) Get4202() {
 	order_id, _ := c.GetInt64("order_id")
-	order_id = 220548
-
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-	admin_user_id = 3432
-
 	order, _ := service.GetHisOrderByIDTwo(order_id)
 	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -488,8 +513,6 @@ func (c *HisApiController) Get4203() {
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	order_id, _ := c.GetInt64("order_id")
-	order_id = 220548
-	admin_user_id = 3432
 
 	order, _ := service.GetHisOrderByIDTwo(order_id)
 	his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
@@ -7504,6 +7527,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	med_type := c.GetString("social_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrt_type := c.GetString("mdtrt_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -7888,6 +7912,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				IdCardType:             id_card_type,
 				Doctor:                 doctor,
 				Departments:            department,
+				MdtrtGrpType:           mdtrt_type,
 			}
 
 			timestamp := time.Now().Unix()
@@ -8335,6 +8360,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Mtime = time.Now().Unix()
 			his.InsuplcAdmdvs = insuplc_admdvs_temp
 			his.Status = 1
+			his.MdtrtGrpType = mdtrt_type
 			service.UpdateHisPatientStatus(&his)
 			service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
 
@@ -9267,7 +9293,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
 									} else {
 										api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 											his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
@@ -9275,7 +9301,7 @@ func (c *HisApiController) GetUploadInfo() {
 											"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 											"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 											"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+											"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
 
 									}
 
@@ -9736,7 +9762,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
 
 							//req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 
@@ -9748,7 +9774,7 @@ func (c *HisApiController) GetUploadInfo() {
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 								"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 								"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
+								"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + tempOrder.MedType + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
 
 						}
 
@@ -11313,7 +11339,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						insutype = "310"
 					}
 					if len(insutypes) == 2 {
-						insutype = strconv.FormatInt(his.SocialType, 64)
+						insutype = strconv.FormatInt(his.SocialType, 10)
 					}
 
 					//insutype = "390"
@@ -11423,7 +11449,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 										"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 										"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 										"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-										"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
+										"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
 
 									//req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 
@@ -11435,7 +11461,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 										"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
 										"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 										"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
-										"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo
+										"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&verify_number=" + psn_info.VerifyNumber + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&cainfo=" + miConfig.Cainfo + "&mdtrt_grp_type=" + his.MdtrtGrpType
 
 								}
 

models/his_models.go

@@ -126,6 +126,7 @@ type HisPatient struct {
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	MdtrtGrpType           string  `gorm:"column:mdtrt_grp_type" json:"mdtrt_grp_type" form:"mdtrt_grp_type"`
 }
 
 func (HisPatient) TableName() string {
@@ -600,6 +601,7 @@ type XtHisPatient struct {
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	MdtrtGrpType           string  `gorm:"column:mdtrt_grp_type" json:"mdtrt_grp_type" form:"mdtrt_grp_type"`
 }
 
 func (XtHisPatient) TableName() string {
@@ -811,6 +813,7 @@ type VMHisPatient struct {
 	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	MdtrtGrpType           string  `gorm:"column:mdtrt_grp_type" json:"mdtrt_grp_type" form:"mdtrt_grp_type"`
 }
 
 func (VMHisPatient) TableName() string {

service/gdyb_service.go

@@ -189,7 +189,7 @@ func Gdyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 	inputData["card_sn"] = ""           // 卡识别码
 	inputData["certno"] = certNo        // 证件号码
-	inputData["psn_cert_type"] = "1"    // 人员证件类型
+	inputData["psn_cert_type"] = "01"   // 人员证件类型
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["begntime"] = ""          // 开始时间
 	inputData["psn_name"] = name        // 人员姓名
@@ -3005,10 +3005,10 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	opspdiseinfo := make([]map[string]interface{}, 0) // 门诊慢特病诊断信息
 
 	opspdiseinfotemp := make(map[string]interface{})
-	opspdiseinfotemp["diag_name"] = struct4101.OpspdiseinfoStruct[len(struct4101.OpspdiseinfoStruct)-1].DiagName // 诊断名称  必填
-	opspdiseinfotemp["diag_code"] = struct4101.OpspdiseinfoStruct[len(struct4101.OpspdiseinfoStruct)-1].DiagCode // 诊断代码 必填
-	opspdiseinfotemp["oprn_oprt_name"] = "血液透析"                                                                  // 手术操作名称 必填
-	opspdiseinfotemp["oprn_oprt_code"] = "39.9500"                                                               // 手术操作代码 必填
+	opspdiseinfotemp["diag_name"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagName // 诊断名称  必填
+	opspdiseinfotemp["diag_code"] = struct4101.Diseinfo[len(struct4101.Diseinfo)-1].DiagCode // 诊断代码 必填
+	opspdiseinfotemp["oprn_oprt_name"] = "血液透析"                                              // 手术操作名称 必填
+	opspdiseinfotemp["oprn_oprt_code"] = "39.9500"                                           // 手术操作代码 必填
 	opspdiseinfo = append(opspdiseinfo, opspdiseinfotemp)
 
 	diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
@@ -3057,7 +3057,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 
 	input["setlinfo"] = inputData
 	input["payinfo"] = payinfo
-	input["opspdiseinfo"] = oprninfo
+	input["opspdiseinfo"] = opspdiseinfo
 	input["diseinfo"] = diseinfo
 	input["iteminfo"] = iteminfo
 	inputMessage["input"] = input //交易输入
@@ -3078,13 +3078,9 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	if fixmedins_code == "H15049901371" {
 		url = gdyb_url
 	} else {
-		if org_id == 10106 || org_id == 10215 || org_id == 10138 || org_id == 9504 {
-			url = gdyb_url + "4101A"
 
-		} else {
-			url = gdyb_url + "4101"
+		url = gdyb_url + "4101A"
 
-		}
 	}
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/4101"

service/gdyb_zifei_service.go

@@ -123,6 +123,7 @@ func Gdyb4202(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
+
 	inputMessage["infno"] = "4202" // 交易编码
 
 	feedetail := make([]map[string]interface{}, 0)
@@ -168,7 +169,7 @@ func Gdyb4202(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputData["oprn_oprt_name"] = ""
 
 	inputData["otp_diag_info"] = ""
-	inputData["inhosp_stas"] = ""
+	inputData["inhosp_stas"] = "0"
 	inputData["die_date"] = ""
 	inputData["ipt_days"] = ""
 	inputData["fpsc_no"] = ""
@@ -212,9 +213,9 @@ func Gdyb4202(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		feedetail = append(feedetail, feedetailInfo)
 	}
 
-	inputData["ownPayPatnDiagListD"] = feedetail
+	input["ownPayPatnDiagListD"] = feedetail
+	input["ownPayPatnMdtrtD"] = inputData
 
-	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
 	var inputLog string

service/hn_service.go

@@ -16,7 +16,7 @@ import (
 func Hnyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, request_url string, access_key string, cainfo string, name string, mdtrt_cert_no string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	inputMessage := SetHnInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
 
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
@@ -1076,16 +1076,10 @@ func SetHnInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	inputMessage["signtype"] = "SM3"                                                            // 签名类型
 	inputMessage["infver"] = "V1.0"                                                             // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
-	if fixmedins_code == "H32090403023" {
-
-		inputMessage["opter"] = "晁海燕"      // 经办人
-		inputMessage["opter_name"] = "晁海燕" // 经办人姓名
-	} else {
-		inputMessage["opter"] = doctor      // 经办人
-		inputMessage["opter_name"] = doctor // 经办人姓名
-	}
-	inputMessage["inf_time"] = timeFormatOne        // 交易时间
-	inputMessage["fixmedins_code"] = fixmedins_code // 定点医药机构编号
+	inputMessage["opter"] = doctor                                                              // 经办人
+	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
+	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
+	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
 	inputMessage["fixmedins_name"] = org_name
 	inputMessage["fixmedins_soft_fcty"] = "深圳市领透科技有限公司" //定点医药机构名称
 	//定点医药机构名称

service/jsyb_service.go

@@ -713,7 +713,7 @@ func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 }
 
 //  门诊预结算
-func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, request_url string, access_key string, verify_number string, cainfo string) (string, string) {
+func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, request_url string, access_key string, verify_number string, cainfo string, mdtrt_grp_type string) (string, string) {
 
 	// 生成签名
 	timestamp := time.Now().Unix() //		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
@@ -751,7 +751,6 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
 	}
-
 	inputData["medfee_sumamt"] = total  // 医疗费总额
 	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
 	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
@@ -763,7 +762,7 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData2["trum_flag"] = ""
 	inputData2["rel_ttp_flag"] = ""
 	inputData2["otp_er_refl_flag"] = ""
-	inputData2["mdtrt_grp_type"] = ""
+	inputData2["mdtrt_grp_type"] = mdtrt_grp_type
 	inputData2["need_ipt_flag"] = ""
 	inputData["exp_content"] = inputData2
 	input["data"] = inputData
@@ -787,7 +786,7 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string) (string, string) {
+func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string, mdtrt_grp_type string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -842,7 +841,7 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData2["trum_flag"] = ""
 	inputData2["rel_ttp_flag"] = ""
 	inputData2["otp_er_refl_flag"] = ""
-	inputData2["mdtrt_grp_type"] = ""
+	inputData2["mdtrt_grp_type"] = mdtrt_grp_type
 	inputData2["need_ipt_flag"] = ""
 	inputData["exp_content"] = inputData2
 
@@ -1049,7 +1048,6 @@ func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	inputMessage["infver"] = "1.0.0"                                                            // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
 	if fixmedins_code == "H32090403023" {
-
 		inputMessage["opter"] = "晁海燕"      // 经办人
 		inputMessage["opter_name"] = "晁海燕" // 经办人姓名
 	} else {