1111

controllers/gdyb_controller.go

@@ -298,8 +298,9 @@ func (c *GdybController) PostEight() {
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
+	med_type := c.GetString("med_type")
 
-	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key)
+	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/his_api_controller.go

@@ -702,7 +702,8 @@ func (c *HisApiController) GetUploadInfo() {
 
 	//if settle_accounts_type == 1 { //日结
 	//
-	//} else { //月结
+	//} else
+	//{ //月结
 	//	start_time := c.GetString("start_time")
 	//	end_time := c.GetString("end_time")
 	//	timeLayout := "2006-01-02"
@@ -754,22 +755,44 @@ func (c *HisApiController) GetUploadInfo() {
 	//		var custom models.Custom
 	//		for _,subItem := range advices{
 	//			if item == subItem.MedListCodg{
-	//
-	//
-	//
+	//				custom.Price =fmt.Sprintf("%.2f", subItem.Price)
+	//				custom.MedListCodg = subItem.MedListCodg
+	//				custom.Cut = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+	//				custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber)
+	//				custom.FeedetlSn = subItem.FeedetlSn
+	//				customs = append(customs,&custom)
 	//			}
 	//		}
 	//	}
 	//
 	//
+	//	for  _, item := range additionCodes{
+	//		var custom models.Custom
+	//		for _,subItem := range additions{
+	//			if item == subItem.XtHisAddtionConfig.Code{
+	//				custom.Price =fmt.Sprintf("%.2f", subItem.Price)
+	//				custom.MedListCodg = subItem.XtHisAddtionConfig.Code
+	//				custom.Cut = fmt.Sprintf("%.2f", subItem.Count)
+	//				custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count))
+	//				custom.FeedetlSn = subItem.FeedetlSn
+	//				customs = append(customs,&custom)
+	//			}
+	//		}
+	//	}
 	//
-	//
-	//
-	//
-	//
-	//
-	//
-	//
+	//	for  _, item := range projectCodes{
+	//		var custom models.Custom
+	//		for _,subItem := range projects{
+	//			if item == subItem.MedListCodg{
+	//				custom.Price =fmt.Sprintf("%.2f", subItem.Price)
+	//				custom.MedListCodg = subItem.MedListCodg
+	//				custom.Cut = fmt.Sprintf("%.2f", subItem.Count)
+	//				custom.DetItemFeeSumamt = fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count))
+	//				custom.FeedetlSn = subItem.FeedetlSn
+	//				customs = append(customs,&custom)
+	//			}
+	//		}
+	//	}
 	//
 	//}
 
@@ -953,7 +976,7 @@ func (c *HisApiController) GetUploadInfo() {
 				insutype := rf[0].Insutype
 				api := "http://127.0.0.1:9532/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
 					insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
-					"&total=" + allTotal + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+					"&total=" + allTotal + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10)
 				resp, requestErr := http.Get(api)
 
 				if requestErr != nil {

service/gdyb_service.go

@@ -625,7 +625,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(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) string {
+func Gdyb2207(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) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -640,7 +640,7 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-	inputData["med_type"] = "11"        // 医疗类别 11 普通门诊  12 门诊挂号
+	inputData["med_type"] = med_type    // 医疗类别 11 普通门诊  12 门诊挂号
 	inputData["medfee_sumamt"] = total  // 医疗费总额
 	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
 	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）