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

service/zh_his_service.go

@@ -559,9 +559,9 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-	//tempTime := time.Unix(timestamp, 0)
+	tempTime := time.Unix(timestamp, 0)
 	//timeFormat := tempTime.Format("20060102150405")
-	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	//chrgBchno := rand.Intn(100000) + 10000
 
 	var customs []*models.NewCustom
@@ -580,7 +580,7 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
 		feedetailInfo["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
 		feedetailInfo["med_type"] = med_type
-		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
+		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
@@ -781,6 +781,7 @@ func ZHGdyb2303(psnNo string, mdtrtId string, chrgBchno string, certNo string, i
 	inputData["acct_used_flag"] = "1"          // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype           // 险种类型
 	inputData["invono"] = ""                   // 发票号
+	inputData["dise_codg"] = "M07803"          // 发票号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入