111

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10088
+org_id = 10191
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,14 +53,14 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #test
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
-# gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
+gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
 # gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 #韶关
 #gdyb_paasid = "sg03_prd"
@@ -72,7 +72,7 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #深圳
 # gdyb_paasid = "sz_prd_yjyy"
 #肇庆
-gdyb_paasid = "zq_prd_yjyy"
+#gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"
 #广州
 #gdyb_paasid = "gdyb_inf"

controllers/hb/hbyb_controller.go

@@ -40,7 +40,7 @@ func (c *HBybController) Post3202a() {
 		return
 	}
 	userJSONBytes, _ := json.Marshal(respJSON["bps"])
-	var bps []models.BusinessParams
+	var bps []*models.BusinessParamsTwo
 	if err := json.Unmarshal(userJSONBytes, &bps); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return

controllers/sg/his_api_controller.go

@@ -10086,6 +10086,8 @@ func (c *HisApiController) GetCheckAccount() {
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
+	orders_two, _ := service.GetOrderByTimeFive(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, "", clr_type)
+
 	fixmedins_setl_cnt := int64(len(orders))
 	var medfee_sumamt float64
 	var acct_pay float64
@@ -10115,7 +10117,7 @@ func (c *HisApiController) GetCheckAccount() {
 				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
 				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
 				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
-				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt+int64(len(orders_two)*2), 10) +
 				"&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -10163,14 +10165,14 @@ func (c *HisApiController) GetCheckAccount() {
 
 			api := "http://172.16.13.254:9532/" + "nmyb/3201?" +
 				"insutype=" + insutype +
-				"&clr_type=" + clr_type +
+				"&clr_type=" + "21" +
 				"&setl_optins=" + clr_org +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +
 				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
 				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
 				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
-				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt+int64(len(orders_two)*2), 10) +
 				"&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
 				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -10236,7 +10238,7 @@ func (c *HisApiController) GetCheckAccount() {
 				MedfeeSumamt:     medfee_sumamt,
 				FundPaySumamt:    fund_pay_sumamt,
 				AcctPay:          acct_pay,
-				FixmedinsSetlCnt: fixmedins_setl_cnt,
+				FixmedinsSetlCnt: fixmedins_setl_cnt + int64(len(orders_two)*2),
 			}
 			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams)
 			fmt.Println(requestLog)
@@ -13114,13 +13116,10 @@ func (c *HisApiController) Post3202() {
 	var acct_pay float64
 	var fund_pay_sumamt float64
 
-	var medfee_sumamt_str string
-	var acct_pay_str string
-	var fund_pay_sumamt_str string
 	for _, item := range orders {
-		medfee_sumamt_str = fmt.Sprintf("%.4f", medfee_sumamt+item.MedfeeSumamt)
-		acct_pay_str = fmt.Sprintf("%.4f", acct_pay+item.AcctPay)
-		fund_pay_sumamt_str = fmt.Sprintf("%.4f", fund_pay_sumamt+item.FundPaySumamt)
+		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
+		acct_pay = acct_pay + item.AcctPay
+		fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
 
 	}
 
@@ -13128,13 +13127,10 @@ func (c *HisApiController) Post3202() {
 	var acct_pay_two float64
 	var fund_pay_sumamt_two float64
 
-	var medfee_sumamt_two_str string
-	var acct_pay_two_str string
-	var fund_pay_sumamt_two_str string
 	for _, item := range orders_two {
-		medfee_sumamt_two_str = fmt.Sprintf("%.4f", medfee_sumamt_two+item.MedfeeSumamt)
-		acct_pay_two_str = fmt.Sprintf("%.4f", acct_pay_two+item.AcctPay)
-		fund_pay_sumamt_two_str = fmt.Sprintf("%.4f", fund_pay_sumamt_two+item.FundPaySumamt)
+		medfee_sumamt_two = medfee_sumamt_two + item.MedfeeSumamt
+		acct_pay_two = acct_pay_two + item.AcctPay
+		fund_pay_sumamt_two = fund_pay_sumamt_two + item.FundPaySumamt
 	}
 
 	//var user_name string
@@ -13146,36 +13142,37 @@ func (c *HisApiController) Post3202() {
 	//}
 	var res ResultSix
 	if config.IsOpen == 1 {
-		var bps []models.BusinessParams
-		var bp models.BusinessParams
-		ms, _ := strconv.ParseFloat(medfee_sumamt_str, 64)
-		ap, _ := strconv.ParseFloat(acct_pay_str, 64)
-		fp, _ := strconv.ParseFloat(fund_pay_sumamt_str, 64)
-
-		bp.MedfeeSumamt = ms
-		bp.AcctPay = ap
-		bp.FundPaySumamt = fp
+		var bps []*models.BusinessParamsTwo
+		var bp models.BusinessParamsTwo
+		medfee_sumamt_str := fmt.Sprintf("%.2f", medfee_sumamt)
+		acct_pay_str := fmt.Sprintf("%.2f", acct_pay)
+		fund_pay_sumamt_str := fmt.Sprintf("%.2f", fund_pay_sumamt)
+
+		bp.MedfeeSumamt = medfee_sumamt_str
+		bp.AcctPay = acct_pay_str
+		bp.FundPaySumamt = fund_pay_sumamt_str
 		bp.Insutype = "390"
 		bp.StmtBegndate = start_time
 		bp.ClrType = clr_type
 		bp.SetlOptins = clr_org
 		bp.StmtEnddate = end_time
-		bps = append(bps, bp)
+		bps = append(bps, &bp)
 
-		mst, _ := strconv.ParseFloat(medfee_sumamt_two_str, 64)
-		apt, _ := strconv.ParseFloat(acct_pay_two_str, 64)
-		fpt, _ := strconv.ParseFloat(fund_pay_sumamt_two_str, 64)
+		medfee_sumamt_two_str := fmt.Sprintf("%.2f", medfee_sumamt_two)
+		acct_pay_two_str := fmt.Sprintf("%.2f", acct_pay_two)
+		fund_pay_sumamt_two_str := fmt.Sprintf("%.2f", fund_pay_sumamt_two)
 
-		var bp2 models.BusinessParams
-		bp2.MedfeeSumamt = mst
-		bp2.AcctPay = apt
-		bp2.FundPaySumamt = fpt
+		var bp2 models.BusinessParamsTwo
+		bp2.MedfeeSumamt = medfee_sumamt_two_str
+		bp2.AcctPay = acct_pay_two_str
+		bp2.FundPaySumamt = fund_pay_sumamt_two_str
 		bp2.Insutype = "310"
 		bp2.StmtBegndate = start_time
 		bp2.StmtEnddate = end_time
 		bp2.ClrType = clr_type
 		bp2.SetlOptins = clr_org
-		bps = append(bps, bp2)
+		bps = append(bps, &bp2)
+		fmt.Println(bps)
 
 		data := make(map[string]interface{})
 		data["bps"] = bps

controllers/zh/zh_his_api_controller.go

@@ -2029,7 +2029,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 	department, _ := service.GetDepartMentDetail(record.Departments)
 	strconv.FormatInt(record.PatientId, 10)
 
-	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, record.Doctor)
+	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.Creator)
 
 	//client := &http.Client{}
 	data["psn_no"] = record.PsnNo
@@ -2108,6 +2108,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 							MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 							HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
 							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+							DoctorId:         item.Creator,
 						}
 
 						customs = append(customs, cus)
@@ -2130,6 +2131,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								MedListCodg:      subItem.HisProject.MedicalCode,
 								HospApprFlag:     -1,
 								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+								DoctorId:         item.Creator,
 							}
 							customs = append(customs, cus)
 						}
@@ -2145,6 +2147,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
 								HospApprFlag:     -1,
 								FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
+								DoctorId:         item.Creator,
 							}
 							customs = append(customs, cus)
 						}
@@ -2225,7 +2228,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				result_byte, _ := json.Marshal(respJSON)
 				result = string(result_byte)
 			} else {
-				result, requestLog = service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string), doctor_info.DoctorNumber, doctor_info.UserName)
+				result, requestLog = service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string), doctor_info.UserName, doctor_info.DoctorNumber)
 				saveLog(result, requestLog, "2301", "上传明细")
 			}
 

main.go

@@ -4,17 +4,14 @@ import (
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
-	"gdyb/service"
-
-	//"gdyb/models"
 	_ "gdyb/routers"
+	"gdyb/service"
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
 	//"github.com/qiniu/api.v7/auth/qbox"
 	//"github.com/qiniu/api.v7/storage"
 
-	//"gdyb/service"
 	"github.com/astaxie/beego"
 	//"strconv"
 	//"time"

models/his_models.go

@@ -1033,6 +1033,24 @@ type BusinessParams struct {
 	SetlId           string
 }
 
+type BusinessParamsTwo struct {
+	Insutype         string
+	ClrType          string
+	SetlOptins       string
+	MdtrtareaAdmvs   string
+	StmtBegndate     string
+	StmtEnddate      string
+	MedfeeSumamt     string
+	FundPaySumamt    string
+	AcctPay          string
+	FixmedinsSetlCnt int64
+	FileQuryNo       string
+	CashPayamt       float64
+	PsnNo            string
+	MdtrtId          string
+	SetlId           string
+}
+
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -1291,6 +1309,7 @@ type NewCustom struct {
 	LmtUsedFlag      int64
 	HospApprFlag     int64
 	FeeOcurTime      string
+	DoctorId         int64
 }
 
 type HisPsn struct {

routers/router.go

@@ -3,7 +3,10 @@ package routers
 import (
 	"gdyb/controllers/hb"
 	"gdyb/controllers/js"
+	"gdyb/controllers/nm"
 	"gdyb/controllers/sg"
+	"gdyb/controllers/zh"
+
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -25,9 +28,9 @@ func init() {
 	sg.GdybRegistRouters()
 	hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
-	//zh.ZHHisManagerApiRegistRouters()
+	zh.ZHHisManagerApiRegistRouters()
 	js.JSybRegistRouters()
-	//nm.NmybRegistRouters()
+	nm.NmybRegistRouters()
 	//coordinate.CoordinateRegistRouters()
 
 }

service/fj_service.go

@@ -780,7 +780,7 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["fund_pay_sumamt"] = businessParams.FundPaySumamt       //基金支付总额
 	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
-	inputData["refd_setl_flag"] = 0                                   // 就诊 ID（来自2201接口返回）
+	inputData["refd_setl_flag"] = "0"                                 // 就诊 ID（来自2201接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/hbyb_service.go

@@ -875,7 +875,7 @@ func Hbyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
-func Hbyb3202a(baseParams models.BaseParams, businessParams []models.BusinessParams) string {
+func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -886,12 +886,12 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []models.BusinessPar
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
 	//inputDatas := []make(map[string]interface{})
 	inputDatas := make([]map[string]interface{}, 0)
 
 	inputMessage["infno"] = "3202a" // 交易编码
 	for _, item := range businessParams {
+		inputData := make(map[string]interface{})
 		inputData["insutype"] = item.Insutype             // 险种
 		inputData["clr_type"] = item.ClrType              // 就诊 ID（来自2201接口返回）
 		inputData["setl_optins"] = item.SetlOptins        // 结算经办机构

service/his_service.go

@@ -991,6 +991,19 @@ func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype str
 	return
 }
 
+func GetOrderByTimeFive(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	db = db.Where("user_org_id = ?  AND order_status = 3 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)
+	if len(clr_org) > 0 {
+		db = db.Where("clr_optins = ?", clr_org)
+	}
+	if len(clr_type) > 0 {
+		db = db.Where("clr_type = ?", clr_type)
+	}
+	err = db.Find(&orders).Error
+	return
+}
+
 func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
 	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)

service/zh_his_service.go

@@ -38,13 +38,13 @@ func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code st
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "1"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "1"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 		}
 	}
 
@@ -575,6 +575,9 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 
 	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
 	for _, item := range customs {
+		org_id, _ := beego.AppConfig.Int64("org_id")
+		doctor_info, _ := GetAdminUserInfoByID(org_id, item.DoctorId)
+
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
 		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
@@ -588,20 +591,20 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 		feedetailInfo["pric"] = item.Price                           // 单价
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
-		feedetailInfo["bilg_dr_codg"] = doctor_number                // 开单医生编码
-		feedetailInfo["bilg_dr_name"] = doctor_name
-		feedetailInfo["acord_dept_codg"] = dept_code    // 受单科室编码
-		feedetailInfo["acord_dept_name"] = dept         // 受单科室名称
-		feedetailInfo["orders_dr_code"] = doctor_number // 受单医生编码
-		feedetailInfo["orders_dr_name"] = doctor_name   // 受单医生姓名
-		feedetailInfo["chrg_bchno"] = chrg_bchno        // 收费批次号
-		feedetailInfo["dise_codg"] = ""                 // 病种编码
-		feedetailInfo["rxno"] = ""                      // 处方号
-		feedetailInfo["rx_circ_flag"] = "0"             // 外购处方标志
-		feedetailInfo["sin_dos_dscr"] = ""              // 单次剂量描述
-		feedetailInfo["used_frqu_dscr"] = ""            // 使用频次描述
-		feedetailInfo["prd_days"] = "0"                 // 周期天数
-		feedetailInfo["medc_way_dscr"] = ""             // 用药途径描述
+		feedetailInfo["bilg_dr_codg"] = doctor_info.DoctorNumber     // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = doctor_info.UserName
+		feedetailInfo["acord_dept_codg"] = dept_code               // 受单科室编码
+		feedetailInfo["acord_dept_name"] = dept                    // 受单科室名称
+		feedetailInfo["orders_dr_code"] = doctor_info.DoctorNumber // 受单医生编码
+		feedetailInfo["orders_dr_name"] = doctor_info.UserName     // 受单医生姓名
+		feedetailInfo["chrg_bchno"] = chrg_bchno                   // 收费批次号
+		feedetailInfo["dise_codg"] = ""                            // 病种编码
+		feedetailInfo["rxno"] = ""                                 // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"                        // 外购处方标志
+		feedetailInfo["sin_dos_dscr"] = ""                         // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""                       // 使用频次描述
+		feedetailInfo["prd_days"] = "0"                            // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""                        // 用药途径描述
 		// 开单医师姓名
 
 		if item.HospApprFlag != -1 {