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

controllers/sg/his_api_controller.go

@@ -663,7 +663,21 @@ func (c *HisApiController) GetSettleList() {
 	}
 	last_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
 	count, _ := strconv.ParseInt(last_order.FaPiaoNumber, 10, 64)
-	new_fapiao_number := strconv.FormatInt(count+1, 10)
+	fmt.Println(count)
+	var zero string
+	number := count + 1
+	if number >= 1000 {
+		zero = "0000" + strconv.FormatInt(number, 10)
+	} else if number >= 10000 {
+		zero = "000" + strconv.FormatInt(number, 10)
+	} else if number >= 100000 {
+		zero = "00" + strconv.FormatInt(number, 10)
+	} else if number >= 1000000 {
+		zero = "0" + strconv.FormatInt(number, 10)
+	} else {
+		zero = strconv.FormatInt(number, 10)
+	}
+	fmt.Println(zero)
 
 	struct4101 := service.Struct4101{
 		PsnNo:          order.PsnNo,
@@ -686,7 +700,7 @@ func (c *HisApiController) GetSettleList() {
 		MaindiagFlag:   "1",
 		BillCode:       last_order.FaPiaoCode,
 		BillNo:         order.FaPiaoNumber,
-		BizSn:          new_fapiao_number,
+		BizSn:          zero,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,
 		AcctPay:        order.AcctPay,

service/gdyb_service.go

@@ -172,9 +172,9 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputMessage["infno"] = "1101" // 交易编码
 
 	if certificates == "3" {
-		inputData["mdtrt_cert_type"] = "HKG000000888" // 就诊凭证类型
-		inputData["certno"] = certNo                  // 证件号码
-		inputData["psn_cert_type"] = "99"             // 人员证件类型
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
 
 	} else {
 		if id_card_type == 1 {