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

controllers/sg/his_api_controller.go

@@ -661,8 +661,10 @@ func (c *HisApiController) GetSettleList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
 		return
 	}
-	last_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
-	count, _ := strconv.ParseInt(last_order.FaPiaoNumber, 10, 64)
+
+	last_order, _ := service.GetLastHisOrder(c.GetAdminUserInfo().CurrentOrgId)
+	max_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
+	count, _ := strconv.ParseInt(max_order.FaPiaoNumber, 10, 64)
 	fmt.Println(count)
 	var zero string
 	number := count + 1

service/his_service.go

@@ -1288,12 +1288,12 @@ func UpdateHisPatientStatus(his *models.VMHisPatient) {
 }
 
 func GetLastHisOrder(org_id int64) (his models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2", org_id).Last(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code <> '' AND fa_piao_number <> ''", org_id).Last(&his).Error
 	return
 }
 
 func GetLastHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code <> '' AND fa_piao_number <> ''", org_id).Last(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Select("max(convert(fa_piao_number,signed)) as fa_piao_number").Where("user_org_id = ? AND status = 1 AND order_status = 2 ", org_id).Find(&his).Error
 	return
 }